Skip to content

Commit acf1a6a

Browse files
committed
Use new discord username system
1 parent e9c5cc5 commit acf1a6a

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

backend/functions/src/schema/helpers/discord.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ export async function getGuildMemberId(guildId: string, username: string) {
8787

8888
return data.find((guildMember) => {
8989
if (!guildMember.user) return false;
90-
91-
return (
92-
`${guildMember.user.username}#${guildMember.user.discriminator}`.toLowerCase() ===
93-
username.toLowerCase()
94-
);
90+
return guildMember.user.username.toLowerCase() === username.toLowerCase();
9591
})?.user.id;
9692
}
9793

backend/functions/src/schema/models/admin/service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
ExternalLinkBackup,
1010
Submission,
1111
} from "../../services";
12-
import { sendDiscordRequest } from "../../helpers/discord";
12+
import { getGuildMemberId, sendDiscordRequest } from "../../helpers/discord";
1313
import { submissionStatusKenum } from "../../enums";
1414
import { Request } from "express";
1515
import { SqlWhereFieldObject } from "../../core/helpers/sql";

frontend/models/base/submission.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ export const Submission = <RecordInfo<'submission'>>{
113113
inputType: 'text',
114114
text: 'Discord ID',
115115
optional: true,
116-
hint: 'Example: username#1234',
117116
inputOptions: {
118117
cols: 6,
119118
},
@@ -289,7 +288,7 @@ export const Submission = <RecordInfo<'submission'>>{
289288
},
290289
discordId: {
291290
text: 'Discord ID',
292-
hint: 'We will use this to contact you if there are any issues with the submission. Example: username#1234',
291+
hint: 'We will use this to contact you if there are any issues with the submission',
293292
},
294293
isCurrent: {
295294
text: 'Is Current',

0 commit comments

Comments
 (0)