ランキング非参加者を匿名表示に

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.useRanking ? u.username : undefined,
-      username: u.username,
+      host: u.useRanking ? u.host : undefined,
-      host: u.host,
       rating: u.rating,
     }));
     return {

src/backend/functions/ranking.ts

@@ -8,8 +8,7 @@ import { User } from '../models/entities/user.js';
  */
 export const getRanking = async (limit?: number | null): Promise<User[]> => {
   const query = Users.createQueryBuilder('user')
-    .where('"user"."useRanking" IS TRUE')
+    .where('"user"."bannedFromRanking" IS NOT TRUE')
-    .andWhere('"user"."bannedFromRanking" IS NOT TRUE')
     .andWhere('"user"."rating" <> \'NaN\'')
     .orderBy('"user".rating', 'DESC');
 

src/frontend/components/Ranking.tsx

@@ -9,9 +9,8 @@ interface RankingResponse {
 }
 
 interface Ranking {
-	id: number;
+	username?: string;
-	username: string;
+	host?: string;
-	host: string;
 	rating: number;
 }
 
@@ -49,7 +48,7 @@ export const Ranking: React.VFC<RankingProps> = ({limit}) => {
         <p>{t('isCalculating')}</p>
       ) : (
         <div className="menu large">
-          {response.ranking.map((r, i) => (
+          {response.ranking.map((r, i) => r.username && r.host ? (
             <a href={`https://${r.host}/@${r.username}`} target="_blank" rel="noopener noreferrer nofollow" className="item flex" key={i}>
               <div className="text-bold pr-2">{i + 1}</div>
               <div>
@@ -57,6 +56,14 @@ export const Ranking: React.VFC<RankingProps> = ({limit}) => {
                 <span className="text-dimmed text-75">{t('_missHai.rating')}: {r.rating}</span>
               </div>
             </a>
+          ): (
+            <div className="item flex" key={i}>
+              <div className="text-bold pr-2">{i + 1}</div>
+              <div>
+							████@████.██<br/>
+                <span className="text-dimmed text-75">{t('_missHai.rating')}: {r.rating}</span>
+              </div>
+            </div>
           ))}
         </div>
       )