diff --git a/app/db/models/plusSuggestions.server.ts b/app/db/models/plusSuggestions.server.ts index 8c783a014..e9644e3ac 100644 --- a/app/db/models/plusSuggestions.server.ts +++ b/app/db/models/plusSuggestions.server.ts @@ -59,8 +59,7 @@ const findVisibleForUserStm = sql.prepare(` `); export interface FindVisibleForUserSuggestedUserInfo { - // xxx: rename suggestedUser or something - info: Pick< + suggestedUser: Pick< User, | "id" | "discordId" @@ -105,14 +104,14 @@ function mapFindVisibleForUserRowsToResult(rows: any[]): FindVisibleForUser { }; const existingSuggestion = result[row.tier].find( - (suggestion) => suggestion.info.id === row.suggestedId + (suggestion) => suggestion.suggestedUser.id === row.suggestedId ); if (existingSuggestion) { existingSuggestion.suggestions.push(suggestionInfo); } else { result[row.tier].push({ - info: { + suggestedUser: { id: row.suggestedId, discordId: row.suggestedDiscordId, discordName: row.suggestedDiscordName, diff --git a/app/permissions.ts b/app/permissions.ts index 112a41f49..ee79929ce 100644 --- a/app/permissions.ts +++ b/app/permissions.ts @@ -75,7 +75,7 @@ function alreadyCommentedByUser({ }: CanAddCommentToSuggestionArgs) { return Boolean( suggestions[targetPlusTier] - ?.find((u) => u.info.id === suggested.id) + ?.find((u) => u.suggestedUser.id === suggested.id) ?.suggestions.some((s) => s.author.id === user?.id) ); } @@ -89,7 +89,9 @@ export function playerAlreadySuggested({ "suggestions" | "suggested" | "targetPlusTier" >) { return Boolean( - suggestions[targetPlusTier]?.find((u) => u.info.id === suggested.id) + suggestions[targetPlusTier]?.find( + (u) => u.suggestedUser.id === suggested.id + ) ); } diff --git a/app/routes/plus/suggestions.tsx b/app/routes/plus/suggestions.tsx index 048d55b15..c10981cc8 100644 --- a/app/routes/plus/suggestions.tsx +++ b/app/routes/plus/suggestions.tsx @@ -168,7 +168,7 @@ export default function PlusSuggestionsPage() {