Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-09-28 14:20:46 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Custom name (#1754)

Browse Source 
* Migration and edit

* Migrate from discordName

* discordDiscriminator
This commit is contained in:
Kalle
2024-06-03 22:20:21 +03:00
committed by GitHub
parent 764fd8ba7b
commit bfce8d9646
97 changed files with 747 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/features/plus-voting/PlusVotingRepository.server.ts
View File

@@ -24,7 +24,7 @@ const resultsByMonthYearQuery = (args: MonthYear) =>
])
.where("PlusVotingResult.month", "=", args.month)
.where("PlusVotingResult.year", "=", args.year)
.orderBy(sql`"User"."discordName" collate nocase`, "asc");
.orderBy(sql`"User"."username" collate nocase`, "asc");
type ResultsByMonthYearQueryReturnType = InferResult<
ReturnType<typeof resultsByMonthYearQuery>
>;
@@ -67,7 +67,7 @@ function groupPlusVotingResults(rows: ResultsByMonthYearQueryReturnType) {
export type UsersForVoting = {
user: Pick<
Tables["User"],
"id" | "discordId" | "discordName" | "discordAvatar" | "bio"
"id" | "discordId" | "username" | "discordAvatar" | "bio"
>;
suggestion?: PlusSuggestionRepository.FindAllByMonthItem;
}[];
@@ -96,7 +96,7 @@ export async function usersForVoting(loggedInUser: {
user: {
id: member.id,
discordId: member.discordId,
discordName: member.discordName,
username: member.username,
discordAvatar: member.discordAvatar,
bio: member.bio,
},
@@ -108,7 +108,7 @@ export async function usersForVoting(loggedInUser: {
user: {
id: suggestion.suggested.id,
discordId: suggestion.suggested.discordId,
discordName: suggestion.suggested.discordName,
username: suggestion.suggested.username,
discordAvatar: suggestion.suggested.discordAvatar,
bio: suggestion.suggested.bio,
},