diff --git a/src/backend/controllers/ranking.ts b/src/backend/controllers/ranking.ts index 43df048..f6fd6d0 100644 --- a/src/backend/controllers/ranking.ts +++ b/src/backend/controllers/ranking.ts @@ -23,9 +23,8 @@ export class RankingController { */ private async getResponse(isCalculating: boolean, limit?: number) { const ranking = isCalculating ? [] : (await getRanking(limit)).map((u) => ({ - id: u.id, - username: u.username, - host: u.host, + username: u.useRanking ? u.username : undefined, + host: u.useRanking ? u.host : undefined, rating: u.rating, })); return { diff --git a/src/backend/functions/ranking.ts b/src/backend/functions/ranking.ts index 2f37847..5e2465e 100644 --- a/src/backend/functions/ranking.ts +++ b/src/backend/functions/ranking.ts @@ -8,8 +8,7 @@ import { User } from '../models/entities/user.js'; */ export const getRanking = async (limit?: number | null): Promise => { const query = Users.createQueryBuilder('user') - .where('"user"."useRanking" IS TRUE') - .andWhere('"user"."bannedFromRanking" IS NOT TRUE') + .where('"user"."bannedFromRanking" IS NOT TRUE') .andWhere('"user"."rating" <> \'NaN\'') .orderBy('"user".rating', 'DESC'); diff --git a/src/frontend/components/Ranking.tsx b/src/frontend/components/Ranking.tsx index bd8d217..2e99426 100644 --- a/src/frontend/components/Ranking.tsx +++ b/src/frontend/components/Ranking.tsx @@ -9,9 +9,8 @@ interface RankingResponse { } interface Ranking { - id: number; - username: string; - host: string; + username?: string; + host?: string; rating: number; } @@ -49,7 +48,7 @@ export const Ranking: React.VFC = ({limit}) => {

{t('isCalculating')}

) : (
- {response.ranking.map((r, i) => ( + {response.ranking.map((r, i) => r.username && r.host ? (
{i + 1}
@@ -57,6 +56,14 @@ export const Ranking: React.VFC = ({limit}) => { {t('_missHai.rating')}: {r.rating}
+ ): ( +
+
{i + 1}
+
+ ████@████.██
+ {t('_missHai.rating')}: {r.rating} +
+
))}
)