Hidden players only see their own results

grumd · Dec 30, 2023 · b4398fc · b4398fc
1 parent 4945c06
commit b4398fc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/packages/api/src/services/charts/chartsSearch.ts b/packages/api/src/services/charts/chartsSearch.ts
@@ -108,15 +108,15 @@ export const searchCharts = async (params: ChartsSearchParams) => {
 
   const songNameParts = songName?.split(' ').filter((part) => part.length > 0);
 
-  const preferences = currentPlayerId
-    ? (
-        await db
-          .selectFrom('players')
-          .select('preferences')
-          .where('id', '=', currentPlayerId)
-          .executeTakeFirstOrThrow()
-      ).preferences
+  const currentPlayer = currentPlayerId
+    ? await db
+        .selectFrom('players')
+        .select(['preferences', 'hidden'])
+        .where('id', '=', currentPlayerId)
+        .executeTakeFirstOrThrow()
     : null;
+  const preferences = currentPlayer?.preferences;
+  const isCurrentPlayerHidden = currentPlayer?.hidden === 1;
 
   const hiddenRegions =
     preferences?.hiddenRegions &&
@@ -167,13 +167,19 @@ export const searchCharts = async (params: ChartsSearchParams) => {
             : fn.max('ci.interpolated_difficulty').as('difficulty'),
           fn.max('r.pp').as('best_pp'),
         ])
-        .where('players.hidden', '=', 0)
         .where(scoreField, 'is not', null);
 
       /**
        * Below are filters that filter CHARTS, not results
        */
 
+      if (!isCurrentPlayerHidden) {
+        subQuery = subQuery.where('players.hidden', '=', 0);
+      }
+      if (isCurrentPlayerHidden && currentPlayerId) {
+        subQuery = subQuery.where('r.player_id', '=', currentPlayerId);
+      }
+
       if (sharedChartId) {
         subQuery = subQuery.where('r.shared_chart', '=', sharedChartId);
       }
@@ -342,14 +348,20 @@ export const searchCharts = async (params: ChartsSearchParams) => {
             scoreField
           )} desc)`.as('score_rank'),
         ])
-        .where('players.hidden', '=', 0)
         .where(scoreField, 'is not', null)
         .where('r.mix', 'in', mixes);
 
       /**
        * Below are filters that filter RESULTS after the list of charts is already decided
        */
 
+      if (!isCurrentPlayerHidden) {
+        subQuery = subQuery.where('players.hidden', '=', 0);
+      }
+      if (isCurrentPlayerHidden && currentPlayerId) {
+        subQuery = subQuery.where('r.player_id', '=', currentPlayerId);
+      }
+
       if (hiddenPlayerIds && hiddenPlayerIds.length > 0) {
         subQuery = subQuery.where('r.player_id', 'not in', hiddenPlayerIds);
       }

diff --git a/packages/api/src/trpc/context.ts b/packages/api/src/trpc/context.ts
@@ -1,9 +1,8 @@
 import { inferAsyncReturnType } from '@trpc/server';
 import { CreateExpressContextOptions } from '@trpc/server/adapters/express';
-
 import { db } from 'db';
-
 import createDebug from 'debug';
+
 const debug = createDebug('trpc:context');
 
 export async function createContext({ req }: CreateExpressContextOptions) {