Merge pull request #863 from solaris-games/feature/no-spectator-deano…

…nymizing Feature/no spectator deanonymizing
solaris-games · Apr 26, 2024 · 88b3842 · 88b3842
2 parents 70a2ed5 + b12d31c
commit 88b3842
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/server/services/gameGalaxy.ts b/server/services/gameGalaxy.ts
@@ -680,8 +680,9 @@ export default class GameGalaxyService {
 
         // If the user is spectating then they can see from the perspectives of all
         // players who they are spectating.
+        // If they are a player themselves, the spectator perspective is ignored
         if (userId && this.spectatorService.isSpectatingEnabled(game)) {
-            let spectating = this.spectatorService.listSpectatingPlayers(game, userId);
+            const spectating = this.spectatorService.listSpectatingPlayers(game, userId);
 
             if (spectating.length) {
                 return spectating.map(p => p._id);

diff --git a/server/services/gameList.ts b/server/services/gameList.ts
@@ -180,11 +180,21 @@ export default class GameListService {
     async listSpectating(userId: DBObjectId) {
         return await this.gameRepo.find({
             'state.endDate': { $eq: null }, // Game is in progress
-            'galaxy.players.spectators': { // User is spectating at least one player.
-                $elemMatch: {
-                    $in: [userId]
+            $and: [{
+                    'galaxy.players.spectators': { // User is spectating at least one player.
+                        $elemMatch: {
+                            $in: [userId]
+                        }
+                    }
+                },
+                {
+                    'galaxy.players': {
+                        $not: {
+                            $elemMatch: { userId }
+                        }
+                    }
                 }
-            }
+            ]
         },
         {
             'settings.general.type': 1,

diff --git a/server/services/spectator.ts b/server/services/spectator.ts
@@ -1,4 +1,3 @@
-import user from "../api/controllers/user";
 import ValidationError from "../errors/validation";
 import PlayerService from "./player";
 import Repository from "./repository";
@@ -39,13 +38,6 @@ export default class SpectatorService {
             throw new ValidationError(`A player with the username ${username} does not exist.`);
         }
 
-        // Make sure the user isn't already playing in the game.
-        const existingPlayer = this.playerService.getByUserId(game, user._id);
-
-        if (existingPlayer) {
-            throw new ValidationError(`The user ${username} is already playing in this game, they cannot be invited to spectate.`);
-        }
-
         await this.gameRepo.updateOne({
             _id: game._id,
             'galaxy.players._id': player._id