Message on reload to hopefully stop the user.

.env

@@ -57,7 +57,7 @@ MERCURE_URL=http://mercure/.well-known/mercure
 # Public hub URL used by browsers
 MERCURE_PUBLIC_URL=http://localhost:8090/.well-known/mercure
 # Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
-MERCURE_JWT_SECRET=!ChangeThisMercureJWTSignedBySymfonySecretKey!
+MERCURE_JWT_SECRET=!ChangeThisMercureJWT!
 # Base URL for Mercure topics. Use .dev in development; override to .com in prod via .env.prod or real env.
 MERCURE_TOPIC_BASE=https://escapepage.dev
 ###< mercure ###

assets/game1.js

@@ -1,10 +1,7 @@
 /* Game1 entry point built with Webpack Encore */
 import './styles/game1.css';
 
-let sequenceFinished = false;
-let stillPlayingSound = true;
-
-function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
+function subscribeToMercure(mercurePublicUrl, topic) {
   try {
     const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
     const es = new EventSource(url);
@@ -13,33 +10,6 @@ function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
       try {
         const data = JSON.parse(event.data);
         console.log('[Mercure][game1] Update:', data);
-
-        // data is [sendTo, message]
-        if (Array.isArray(data) && data.length >= 2) {
-          const sendTo = parseInt(data[0]);
-          // Filter: 0 means everyone, otherwise must match myScreen
-          if (sendTo !== 0 && sendTo !== parseInt(myScreen)) {
-            console.log('[Mercure][game1] Message not for this player, skipping.');
-            return;
-          }
-
-          const messageContainer = document.getElementById('message-container');
-          if (messageContainer) {
-            const msgEl = document.createElement('div');
-            msgEl.className = 'message';
-            msgEl.textContent = data[1];
-            msgEl.style.color = '#0F0'; // Green for incoming messages
-            msgEl.style.marginBottom = '10px';
-            messageContainer.appendChild(msgEl);
-            window.scrollTo(0, document.body.scrollHeight);
-            if(stillPlayingSound)
-            playSound();
-            console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
-            if (sequenceFinished) {
-              flashRed();
-            }
-          }
-        }
       } catch (e) {
         console.log('[Mercure][game1] Raw event:', event.data);
       }
@@ -55,28 +25,6 @@ function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
   }
 }
 
-function playSound() {
-  const sound = document.getElementById('message-sound');
-  if (sound) {
-    sound.currentTime = 0;
-    sound.play().catch(e => console.warn('[Audio] Playback failed:', e));
-  }
-}
-
-function flashRed() {
-  console.log('[Game1] Triggering flashRed');
-  const body = document.body;
-  body.classList.remove('flash-red');
-  void body.offsetWidth; // Trigger reflow to restart animation
-  body.classList.add('flash-red');
-
-  // Also remove it after animation finishes so it's clean for inspection
-  setTimeout(() => {
-    body.classList.remove('flash-red');
-    console.log('[Game1] Removed flash-red class');
-  }, 150);
-}
-
 async function fetchJson(url, options = {}) {
   const opts = { ...options };
   const headers = new Headers(opts.headers || {});
@@ -128,12 +76,11 @@ document.addEventListener('DOMContentLoaded', async () => {
 
   const mercurePublicUrl = cfgEl.dataset.mercurePublicUrl;
   const topic = cfgEl.dataset.topic;
-  const screen = cfgEl.dataset.screen;
   const apiPingUrl = cfgEl.dataset.apiPingUrl;
   const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
 
   if (mercurePublicUrl && topic) {
-    subscribeToMercure(mercurePublicUrl, topic, screen);
+    subscribeToMercure(mercurePublicUrl, topic);
   } else {
     console.warn('[Mercure][game1] Missing data attributes on #mercure-config');
   }
@@ -178,27 +125,16 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     const printNextMessage = () => {
       if (currentMessageIndex < messages.length) {
-
         const msg = messages[currentMessageIndex];
         const msgEl = document.createElement('div');
-
-        let extraClass = '';
-        if(msg[2])
-          extraClass = msg[2];
-
-        msgEl.className = 'message ' + extraClass;
+        msgEl.className = 'message';
         msgEl.textContent = msg[0];
+        msgEl.style.color = '#F00';
         msgEl.style.marginBottom = '10px';
         messageContainer.appendChild(msgEl);
-        window.scrollTo(0, document.body.scrollHeight);
-
-        playSound();
 
         currentMessageIndex++;
         setTimeout(printNextMessage, msg[1]);
-        if (sequenceFinished) {
-          flashRed();
-        }
       } else {
         // After it has printed a set of messages, it has to start a timer of 2 seconds
         console.log('[Game1] All messages printed. Starting 2s timer to expand message-container height...');
@@ -210,16 +146,7 @@ document.addEventListener('DOMContentLoaded', async () => {
           // Add event listener for Enter key
           inputField.addEventListener('keypress', async (e) => {
             if (e.key === 'Enter') {
-              stillPlayingSound = false;
-              sequenceFinished = false;
               const message = inputField.value.trim();
-
-              const msgEl = document.createElement('div');
-              msgEl.className = 'message';
-              msgEl.textContent = message;
-              msgEl.style.marginBottom = '10px';
-              messageContainer.appendChild(msgEl);
-
               if (message && apiEchoUrl) {
                 inputField.value = '';
                 try {
@@ -228,16 +155,6 @@ document.addEventListener('DOMContentLoaded', async () => {
                     body: { message, ts: new Date().toISOString() },
                   });
                   console.log('[API][game1] message sent →', response);
-                  if (response && response.result && Array.isArray(response.result.result)) {
-                    response.result.result.forEach(text => {
-                      const msgEl = document.createElement('div');
-                      msgEl.className = 'message';
-                      msgEl.textContent = text;
-                      msgEl.style.marginBottom = '10px';
-                      messageContainer.appendChild(msgEl);
-                    });
-                    window.scrollTo(0, document.body.scrollHeight);
-                  }
                 } catch (err) {
                   console.error('[API][game1] Failed to send message:', err);
                 }
@@ -246,8 +163,6 @@ document.addEventListener('DOMContentLoaded', async () => {
           });
 
           console.log('[Game1] message-container height changed to 400vh and input enabled');
-          sequenceFinished = true;
-          console.log('[Game1] sequenceFinished is now TRUE');
         }, 2000);
       }
     };

assets/styles/game1.css

@@ -29,11 +29,8 @@ body {
 
 div#game-timer {
     position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    padding: 20px;
-    background-color: #000;
+    top: 20px;
+    left: 20px;
     color: #F00;
     font-size: 28px;
     z-index: 100;
@@ -41,7 +38,7 @@ div#game-timer {
 
 div#message-container {
     padding: 20px;
-    padding-top: 80px; /* Space for fixed timer */
+    padding-top: 60px; /* Space for fixed timer */
     display: flex;
     flex-direction: column;
     justify-content: flex-end;
@@ -50,11 +47,6 @@ div#message-container {
     font-size: 20px;
 }
 
-div.message {
-    color: #C0C0C0;
-    white-space: pre-wrap;
-}
-
 div#input {
     padding: 20px;
 }
@@ -62,32 +54,10 @@ div#input {
 input#input-message {
     width: 100%;
     padding: 10px;
-    background: #111;
-    border: 1px solid #A00000;
-    color: #C0C0C0;
+    background: #000;
+    border: 1px solid #F00;
+    color: #F00;
     font-size: 18px;
     box-sizing: border-box;
     font-family: monospace;
 }
-
-.flash-red::after {
-    content: '';
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 100px;
-    pointer-events: none;
-    background: linear-gradient(to top, rgba(255, 0, 0, 0.8), transparent);
-    animation: flash-red-anim 0.1s linear forwards;
-    z-index: 9999;
-}
-
-@keyframes flash-red-anim {
-    0% {
-        opacity: 1;
-    }
-    100% {
-        opacity: 0;
-    }
-}

compose.yaml

@@ -7,11 +7,11 @@ services:
     environment:
       # Uncomment the following line to disable HTTPS,
       #SERVER_NAME: ':80'
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       # Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
       MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins http://localhost:8080
+        cors_origins http://127.0.0.1:8000
     # Comment the following line to disable the development mode
     command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
     healthcheck:

config/packages/mercure.yaml

@@ -3,6 +3,4 @@ mercure:
         default:
             url: '%env(MERCURE_URL)%'
             public_url: '%env(MERCURE_PUBLIC_URL)%'
-            jwt:
-                secret: '%env(MERCURE_JWT_SECRET)%'
-                publish: ['*']
+            jwt: '%env(MERCURE_JWT_SECRET)%'

docker/compose.yaml

@@ -5,7 +5,7 @@ services:
   php:
     build:
       context: ..
-      dockerfile: docker/php/Dockerfile
+      dockerfile: php/Dockerfile
     container_name: escapepage-php
     volumes:
       - ../:/var/www/html:delegated
@@ -18,23 +18,6 @@ services:
       - backend
     restart: unless-stopped
 
-  php-worker:
-    build:
-      context: ..
-      dockerfile: docker/php/Dockerfile
-    container_name: escapepage-php-worker
-    volumes:
-      - ../:/var/www/html:delegated
-    environment:
-      APP_ENV: dev
-    depends_on:
-      - database
-      - mercure
-    command: ["php", "bin/console", "messenger:consume", "async", "-vv"]
-    networks:
-      - backend
-    restart: unless-stopped
-
   nginx:
     image: nginx:1.29.4-alpine
     container_name: escapepage-nginx
@@ -63,8 +46,8 @@ services:
     container_name: escapepage-mercure
     environment:
       SERVER_NAME: ":80"
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
+      MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
+      MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
       MERCURE_CORS_ALLOWED_ORIGINS: http://localhost:8080
       MERCURE_PUBLISH_ALLOWED_ORIGINS: http://localhost:8080
       MERCURE_EXTRA_DIRECTIVES: |

docker/php/Dockerfile

@@ -1,20 +1,11 @@
-FROM php:8.3-fpm-alpine
+FROM php:8.5.1-fpm-alpine3.23
 
 # Install system deps
-RUN apk add --no-cache \
-    bash \
-    git \
-    icu-dev \
-    libzip-dev \
-    oniguruma-dev \
-    g++ \
-    make \
-    nodejs \
-    npm
+RUN apk add --no-cache bash git icu-dev libzip-dev oniguruma-dev
 
 # Install PHP extensions
 RUN docker-php-ext-configure intl \
-    && docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache zip
+    && docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache
 
 # Install composer
 ENV COMPOSER_ALLOW_SUPERUSER=1 \
@@ -22,7 +13,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 # Configure PHP
-COPY docker/php/php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
+COPY php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
 
 WORKDIR /var/www/html
 

docker/setup.sh

@@ -66,15 +66,12 @@ dc up "${BUILD_ARGS[@]}"
 # Helper to run commands in php container
 pexec() { dc exec -T php "$@"; }
 
-# Wait for database to be healthy (mariadb/mysql)
+# Wait for database to be healthy (mariadb)
 printf "Waiting for database to be healthy..."
 # Use docker inspect health status
 DB_HEALTH=""
 for i in {1..60}; do
-  DB_ID=$(dc ps -q database 2>/dev/null || true)
-  if [ -n "$DB_ID" ]; then
-    DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$DB_ID" 2>/dev/null || true)
-  fi
+  DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$(docker ps --filter name=_database_ --format '{{.ID}}' | head -n1)" 2>/dev/null || true)
   if [ "$DB_HEALTH" = "healthy" ]; then
     echo " OK"
     break
@@ -82,7 +79,7 @@ for i in {1..60}; do
   printf "."
   sleep 2
   if [ "$i" -eq 60 ]; then
-    echo -e "\nWarning: database health check not healthy yet, continuing anyway."
+    echo "\nWarning: database health check not healthy yet, continuing anyway."
   fi
 done
 
@@ -103,23 +100,11 @@ if grep -q '^APP_SECRET=$' "$ROOT_DIR/.env" 2>/dev/null; then
 fi
 
 # Prepare DB
-echo "Creating database if it doesn't exist..."
-pexec php bin/console doctrine:database:create --if-not-exists
-echo "Running migrations..."
-pexec php bin/console doctrine:migrations:migrate -n
+pexec php bin/console doctrine:database:create --if-not-exists || true
+pexec php bin/console doctrine:migrations:migrate -n || true
 
 # Import JS deps (Importmap/Asset Mapper)
-if [ -f "$ROOT_DIR/importmap.php" ]; then
-  pexec php bin/console importmap:install || true
-fi
-
-# Build assets if using Webpack Encore
-if [ -f "$ROOT_DIR/package.json" ]; then
-  echo "Installing npm dependencies..."
-  pexec npm install
-  echo "Building assets..."
-  pexec npm run build
-fi
+pexec php bin/console importmap:install || true
 
 APP_URL=http://localhost:8080
 MAILPIT_URL=http://localhost:8025
@@ -132,12 +117,10 @@ Open the app:      $APP_URL
 Mailpit (dev):     $MAILPIT_URL
 
 Common commands:
-  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f nginx)
-  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php)
-  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php-worker)
-  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php bash)
-  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php npm run watch)
-  (cd "$DOCKER_DIR" && $DOCKER_COMPOSE down)
+  (cd docker && $DOCKER_COMPOSE logs -f nginx)
+  (cd docker && $DOCKER_COMPOSE logs -f php)
+  (cd docker && $DOCKER_COMPOSE exec php bash)
+  (cd docker && $DOCKER_COMPOSE down)
 
 You can re-run this script any time. Use --no-build to skip rebuilding images.
 EOT

src/Game/Controller/GameController.php

@@ -3,100 +3,17 @@ declare(strict_types=1);
 
 namespace App\Game\Controller;
 
-use App\Game\Entity\Session;
-use App\Game\Repository\GameRepository;
-use App\Game\Repository\SessionRepository;
-use App\Game\Service\GameDashboardService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
-use Symfony\Component\ExpressionLanguage\Expression;
 
 final class GameController extends AbstractController
 {
-    #[Route(path: '', name: 'game_dashboard', methods: ['GET', 'POST'])]
-    #[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
-    public function dashboard(
-        Request $request,
-        GameRepository $gameRepository,
-        SessionRepository $sessionRepository,
-        GameDashboardService $dashboardService,
-        Security $security
-    ): Response {
-        $user = $security->getUser();
-        $isAdmin = $this->isGranted('ROLE_ADMIN');
-
-        if ($request->isMethod('POST')) {
-            if ($request->request->has('create_session')) {
-                $gameId = $request->request->get('game_id');
-                $game = $gameRepository->find($gameId);
-
-                if ($game) {
-                    if ($dashboardService->createSession($game, $user, $isAdmin)) {
-                        $this->addFlash('success', 'New session created!');
-                    }
-                }
-            } elseif ($request->request->has('join_session')) {
-                $inviteCode = $request->request->get('invite_code');
-                if ($dashboardService->joinSession($inviteCode, $user)) {
-                    $this->addFlash('success', 'Joined session successfully!');
-                } else {
-                    $this->addFlash('error', 'Invalid invite code or session full.');
-                }
-            } elseif ($request->request->has('create_invite')) {
-                $sessionId = $request->request->get('session_id');
-                $session = $sessionRepository->find($sessionId);
-
-                if (!$session) {
-                    $this->addFlash('error', 'Session not found.');
-                    return $this->redirectToRoute('game_dashboard');
-                }
-
-                $inviteCode = $dashboardService->generateInviteCode($session, $user, $isAdmin);
-                if ($inviteCode) {
-                    $this->addFlash('success', 'Invite link created: ' . $inviteCode);
-                }
-            } elseif ($request->request->has('leave_session')) {
-                $sessionId = $request->request->get('session_id');
-                $session = $sessionRepository->find($sessionId);
-
-                if ($session) {
-                    if ($dashboardService->leaveSession($session, $user)) {
-                        $this->addFlash('success', 'Left session successfully.');
-                    } else {
-                        $this->addFlash('error', 'Could not leave session (game might have started).');
-                    }
-                }
-            }
-
-            return $this->redirectToRoute('game_dashboard');
-        }
-
-        return $this->render('game/dashboard.html.twig', [
-            'sessions' => $dashboardService->getSessionsForUser($user),
-            'availableGames' => $dashboardService->getAvailableGames($isAdmin),
-        ]);
-    }
-
-    #[Route(path: '/{session}', name: 'game')]
-    #[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
-    #[IsGranted('SESSION_VIEW', subject: 'session')]
-    public function index(
-        Session $session,
-        Security $security,
-        \App\Game\Repository\PlayerRepository $playerRepository
-    ): Response
+    #[Route(path: '', name: 'game')]
+    public function index(): Response
     {
-        $user = $security->getUser();
-        $player = $playerRepository->findOneBy(['session' => $session, 'user' => $user]);
-        $screen = $player ? $player->getScreen() : 0;
-
         return $this->render('game/index.html.twig', [
-            'session' => $session,
-            'screen' => $screen,
+            'user_id' => $this->getUser()?->getId(),
         ]);
     }
 }

src/Game/Enum/SessionSettingType.php

@@ -10,16 +10,4 @@ enum SessionSettingType: string
     case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
     case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
     case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
-    case INVITE_CODE = 'InviteCode';
-    case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
-    case CHAT_TRACKING_FOR_PLAYER1 = 'ChatTrackingForPlayer1';
-    case CHAT_TRACKING_FOR_PLAYER2 = 'ChatTrackingForPlayer2';
-    case CHAT_TRACKING_FOR_PLAYER3 = 'ChatTrackingForPlayer3';
-    case VERIFY_CODES_FOR_PLAYER1 = 'VerifyCodesForPlayer1';
-    case VERIFY_CODES_FOR_PLAYER2 = 'VerifyCodesForPlayer2';
-    case VERIFY_CODES_FOR_PLAYER3 = 'VerifyCodesForPlayer3';
-    case VERIFICATION_PROGRESS_FOR_PLAYER1 = 'VerificationProgressForPlayer1';
-    case VERIFICATION_PROGRESS_FOR_PLAYER2 = 'VerificationProgressForPlayer2';
-    case VERIFICATION_PROGRESS_FOR_PLAYER3 = 'VerificationProgressForPlayer3';
-    case EVERYONE_VERIFIED = 'EveryoneVerified';
 }

src/Game/Security/Voter/SessionVoter.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Game\Security\Voter;
-
-use App\Game\Entity\Session;
-use App\Tech\Entity\User;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-
-class SessionVoter extends Voter
-{
-    public const VIEW = 'SESSION_VIEW';
-
-    public function __construct(
-        private readonly Security $security,
-    ) {
-    }
-
-    protected function supports(string $attribute, mixed $subject): bool
-    {
-        return $attribute === self::VIEW && $subject instanceof Session;
-    }
-
-    protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
-    {
-        $user = $token->getUser();
-
-        if (!$user instanceof User) {
-            return false;
-        }
-
-        if ($this->security->isGranted('ROLE_ADMIN')) {
-            return true;
-        }
-
-        /** @var Session $session */
-        $session = $subject;
-
-        foreach ($session->getPlayers() as $player) {
-            if ($player->getUser() === $user) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

src/Game/Service/GameDashboardService.php

@@ -1,298 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Game\Service;
-
-use App\Game\Entity\Game;
-use App\Game\Entity\Player;
-use App\Game\Entity\Session;
-use App\Game\Entity\SessionSetting;
-use App\Game\Enum\GameStatus;
-use App\Game\Enum\SessionSettingType;
-use App\Game\Enum\SessionStatus;
-use App\Game\Repository\GameRepository;
-use App\Game\Repository\SessionRepository;
-use App\Tech\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
-
-final class GameDashboardService
-{
-    public function __construct(
-        private readonly GameRepository $gameRepository,
-        private readonly SessionRepository $sessionRepository,
-        private readonly EntityManagerInterface $entityManager,
-    ) {
-    }
-
-    /**
-     * @return Session[]
-     */
-    public function getSessionsForUser(UserInterface $user): array
-    {
-        return $this->sessionRepository->createQueryBuilder('s')
-            ->innerJoin('s.players', 'p')
-            ->where('p.user = :user')
-            ->setParameter('user', $user)
-            ->getQuery()
-            ->getResult();
-    }
-
-    /**
-     * @return Game[]
-     */
-    public function getAvailableGames(bool $isAdmin): array
-    {
-        if ($isAdmin) {
-            return $this->gameRepository->findAll();
-        }
-
-        return $this->gameRepository->findBy(['status' => GameStatus::OPEN]);
-    }
-
-    public function createSession(Game $game, UserInterface $user, bool $isAdmin): ?Session
-    {
-        if ($game->getStatus() !== GameStatus::OPEN && !$isAdmin) {
-            return null;
-        }
-
-        if(!$user instanceof User)
-            return null;
-
-        $session = new Session();
-        $session->setGame($game);
-        $session->setStatus(SessionStatus::CREATED);
-        $session->setTimer(0);
-
-        $player = new Player();
-        $player->setUser($user);
-        $player->setSession($session);
-        $player->setScreen(1);
-
-        $this->entityManager->persist($session);
-        $this->entityManager->persist($player);
-
-        $this->initializePlayerSettings($player);
-
-        $this->entityManager->flush();
-
-        return $session;
-    }
-
-    public function joinSession(string $inviteCode, UserInterface $user): bool
-    {
-        if (!$user instanceof User) {
-            return false;
-        }
-
-        $setting = $this->entityManager->getRepository(SessionSetting::class)->findOneBy([
-            'name' => SessionSettingType::INVITE_CODE,
-            'value' => $inviteCode,
-        ]);
-
-        if (!$setting) {
-            return false;
-        }
-
-        $session = $setting->getSession();
-
-        // Check if user is already in this session
-        foreach ($session->getPlayers() as $player) {
-            if ($player->getUser() === $user) {
-                return true; // Already joined
-            }
-        }
-
-        $playerCount = count($session->getPlayers());
-        if ($playerCount >= 3) {
-            return false; // Session full
-        }
-
-        $player = new Player();
-        $player->setUser($user);
-        $player->setSession($session);
-        $player->setScreen($playerCount + 1);
-
-        $this->entityManager->persist($player);
-        $this->initializePlayerSettings($player);
-
-        $this->entityManager->flush();
-
-        return true;
-    }
-
-    public function leaveSession(Session $session, UserInterface $user): bool
-    {
-        if (!$user instanceof User) {
-            return false;
-        }
-
-        if ($session->getStatus() !== SessionStatus::CREATED || $session->getTimer() > 0) {
-            return false;
-        }
-
-        $playerToDelete = null;
-        foreach ($session->getPlayers() as $player) {
-            if ($player->getUser() === $user) {
-                $playerToDelete = $player;
-                break;
-            }
-        }
-
-        if (!$playerToDelete) {
-            return false;
-        }
-
-        // Remove player specific settings (like rights)
-        foreach ($session->getSettings() as $setting) {
-            if ($setting->getPlayer() === $playerToDelete) {
-                $session->removeSetting($setting);
-                $this->entityManager->remove($setting);
-            }
-        }
-
-        $session->removePlayer($playerToDelete);
-        $this->entityManager->remove($playerToDelete);
-
-        // If no players left, we might want to delete the session and its remaining settings
-        if ($session->getPlayers()->isEmpty()) {
-            foreach ($session->getSettings() as $setting) {
-                $this->entityManager->remove($setting);
-            }
-            $this->entityManager->remove($session);
-        }
-
-        $this->entityManager->flush();
-
-        return true;
-    }
-
-    private function initializePlayerSettings(Player $player): void
-    {
-        $screen = $player->getScreen();
-        $rightsSettingName = match ($screen) {
-            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
-            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
-            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
-            default => null,
-        };
-
-        if ($rightsSettingName) {
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setPlayer($player);
-            $setting->setName($rightsSettingName);
-            $setting->setValue(json_encode(['chat', 'help', 'ls', 'pwd']));
-            $this->entityManager->persist($setting);
-        }
-
-        $pwdSettingName = match ($screen) {
-            1 => SessionSettingType::PWD_FOR_PLAYER1,
-            2 => SessionSettingType::PWD_FOR_PLAYER2,
-            3 => SessionSettingType::PWD_FOR_PLAYER3,
-            default => null,
-        };
-
-        if ($pwdSettingName) {
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setPlayer($player);
-            $setting->setName($pwdSettingName);
-            $setting->setValue('home/' . $player->getUser()->getUserIdentifier());
-            $this->entityManager->persist($setting);
-        }
-
-        $chatTrackingSettingName = match ($screen) {
-            1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
-            2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
-            3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
-            default => null,
-        };
-
-        if ($chatTrackingSettingName) {
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setPlayer($player);
-            $setting->setName($chatTrackingSettingName);
-            $setting->setValue(json_encode([]));
-            $this->entityManager->persist($setting);
-        }
-
-        $verifyCodesSettingName = match ($screen) {
-            1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
-            2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
-            3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
-            default => null,
-        };
-
-        if ($verifyCodesSettingName) {
-            $codes = [];
-            for ($i = 1; $i <= 3; $i++) {
-                if ($i !== $screen) {
-                    $codes[$i] = bin2hex(random_bytes(3)); // 6 characters code
-                }
-            }
-
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setPlayer($player);
-            $setting->setName($verifyCodesSettingName);
-            $setting->setValue(json_encode($codes));
-            $this->entityManager->persist($setting);
-        }
-
-        $verificationProgressSettingName = match ($screen) {
-            1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
-            2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
-            3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
-            default => null,
-        };
-
-        if ($verificationProgressSettingName) {
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setPlayer($player);
-            $setting->setName($verificationProgressSettingName);
-            $setting->setValue(json_encode([]));
-            $this->entityManager->persist($setting);
-        }
-    }
-
-    public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
-    {
-        // Security check: is user part of this session?
-        $isPlayer = false;
-        foreach ($session->getPlayers() as $player) {
-            if ($player->getUser() === $user) {
-                $isPlayer = true;
-                break;
-            }
-        }
-
-        if (!$isPlayer && !$isAdmin) {
-            return null;
-        }
-
-        $inviteCode = bin2hex(random_bytes(4));
-
-        $setting = null;
-        foreach ($session->getSettings() as $s) {
-            if ($s->getName() === SessionSettingType::INVITE_CODE) {
-                $setting = $s;
-                break;
-            }
-        }
-
-        if (!$setting) {
-            $setting = new SessionSetting();
-            $setting->setSession($session);
-            $setting->setName(SessionSettingType::INVITE_CODE);
-        }
-
-        $setting->setValue($inviteCode);
-        $this->entityManager->persist($setting);
-        $this->entityManager->flush();
-
-        return $inviteCode;
-    }
-}

src/Game/Service/GameResponseService.php

@@ -5,13 +5,9 @@ namespace App\Game\Service;
 use App\Game\Enum\DecodeMessage;
 use App\Game\Enum\SessionSettingType;
 use App\Game\Entity\Player;
-use App\Game\Entity\SessionSetting;
 use App\Game\Repository\SessionSettingRepository;
 use App\Tech\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 
 class GameResponseService
 {
@@ -19,12 +15,10 @@ class GameResponseService
         private Security $security,
         private PlayerService $playerService,
         private SessionSettingRepository $sessionSettingRepository,
-        private HubInterface $hub,
-        private EntityManagerInterface $entityManager,
     ) {
     }
 
-    public function getGameResponse(string $raw) : array
+    public function getGameResponse(string $raw)
     {
         $info = json_decode($raw, true);
 
@@ -89,10 +83,8 @@ class GameResponseService
                 if(!in_array('chat', $rechten))
                     return ['result' => ['Unknown command']];
 
-                if($this->handleChatMessage($message, $player))
-                    return ['result' => ['succesfully send']];
-                else
-                    return ['result' => ['Error sending']];
+                $this->handleChatMessage($message);
+                break;
             case '/help':
                 return ['result' => $this->getHelpCommand($rechten)];
             case '/decode':
@@ -104,11 +96,12 @@ class GameResponseService
                 if(!in_array('verify', $rechten))
                     return ['result' => ['Unknown command']];
 
-                $result = $this->handleVerifyMessage($message, $player);
+                $result = $this->handleVerifyMessage($message);
                 return ['result' => [$result]];
             default:
                 return ['result' => ['Unknown command']];
         }
+        return [];
     }
 
     private function checkConsoleCommando(string $message, Player $player, bool $sudo = false) : array
@@ -119,15 +112,8 @@ class GameResponseService
             case 'help':
                 return ['result' => $this->getHelpCommand($rechten)];
             case 'ls':
-                if(!in_array('ls', $rechten))
-                    return ['result' => ['Unknown command']];
-
-                $files = $this->getAllCurrentFilesInDirectory($player);
-                return ['result' => $files];
+                break;
             case 'cd':
-                if(!in_array('cd', $rechten))
-                    return ['result' => ['Unknown command']];
-
                 $pwd = $this->playerService->getCurrentPwdOfPlayer($player);
                 if(!$pwd)
                     return ['result' => ['Unknown command']];
@@ -138,43 +124,14 @@ class GameResponseService
 
                 $this->playerService->saveCurrentPwdOfPlayer($player, $newLocation);
                 return ['result' => ['Path: ' . $newLocation]];
-            case 'pwd':
-                if(!in_array('pwd', $rechten))
-                    return ['result' => ['Unknown command']];
-
-                $pwd = $this->playerService->getCurrentPwdOfPlayer($player);
-                return ['result' => ['Path: ' . $pwd]];
             case 'rm':
-                if(!in_array('rm', $rechten))
-                    return ['result' => ['Unknown command']];
-
-                $pwd = $this->playerService->getCurrentPwdOfPlayer($player);
-                if(!$pwd)
-                    return ['result' => ['Unknown command']];
-
-                if (!isset($messagePart[1])) {
-                    return ['result' => ['Usage: rm {filename}']];
-                }
-
-                $filename = $messagePart[1];
-                $fullPath = ($pwd === '/' ? '' : $pwd) . '/' . $filename;
-
-                if(!$this->isAllowedToRemove($fullPath, $player, $sudo))
-                    return ['result' => ['You are not allowed to remove this file.']];
-
-                $this->playerService->addDeletedFileToSession($player, $fullPath);
-                return ['result' => ['File removed: ' . $filename]];
+                break;
             case 'sudo':
-                if(!in_array('sudo', $rechten))
-                    return ['result' => ['Unknown command']];
-
-                $sudo = array_shift($messagePart);
-                $message = implode(' ', $messagePart);
-
-                return $this->checkConsoleCommando($message, $player, true);
+                break;
             default:
                 return ['result' => ['Unknown command']];
         }
+        return [];
     }
 
     private function getHelpCommand(mixed $rechten) : array
@@ -189,7 +146,6 @@ class GameResponseService
                     $messages[] = '   If you want to send a message specifically to one other agent, use the id of the agent after /chat, like /chat 6 {message}';
                     $messages[] = '   This will send the message only to agent with id 6.';
                     $messages[] = '   USAGE: /chat {message}';
-                    $messages[] = '   USAGE: /chat 6 {message}';
                     $messages[] = '';
                     break;
                 case 'help':
@@ -205,13 +161,6 @@ class GameResponseService
                     $messages[] = '   USAGE: /decode {message}';
                     $messages[] = '';
                     break;
-                case 'pwd':
-                    $messages[] = 'pwd';
-                    $messages[] = '   This message will let you know what your current location is.';
-                    $messages[] = '   It will show you the folder you are in so you can continue navigating the server.';
-                    $messages[] = '   USAGE: pwd';
-                    $messages[] = '';
-                    break;
                 case 'cat':
                     $messages[] = 'cat';
                     $messages[] = '   To read a file, use cat {filename}.';
@@ -261,180 +210,9 @@ class GameResponseService
         return $messages;
     }
 
-    private function handleChatMessage(string $message, Player $player) : bool
+    private function handleChatMessage(string $message)
     {
-        $messageParts = explode(' ', $message);
-        $toSingle = false;
 
-        if (isset($messageParts[1]) &&
-                is_numeric($messageParts[1]) &&
-                $messageParts[1] >= 1 &&
-                $messageParts[1] <= 3) {
-
-            $toSingle = true;
-        }
-
-        $chatMessage = array_shift($messageParts);
-        $sendTo = 0;
-
-        if ($toSingle) {
-            $sendTo = array_shift($messageParts);
-            $chatMessage = array_shift($messageParts);
-        }
-
-        $message = $player->getUser()->getUsername() . ': ' . $chatMessage . ' ';
-        foreach($messageParts as $messagePart) {
-            $message .= $messagePart . ' ';
-        }
-
-        $message = trim($message);
-
-        $activeGame = $player->getSession()?->getId();
-
-        if(is_null($activeGame))
-            return false;
-
-        $topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $activeGame;
-        $this->hub->publish(new Update($topic, json_encode([$sendTo, $message])));
-
-        $this->updateChatTracking($player, (int)$sendTo);
-
-        $this->checkAndRegenerateVerifyCodes($player, $chatMessage . ' ' . implode(' ', $messageParts));
-
-        return true;
-    }
-
-    private function checkAndRegenerateVerifyCodes(Player $player, string $messageContent): void
-    {
-        $screen = $player->getScreen();
-        $session = $player->getSession();
-
-        $verifyCodesSettingName = match ($screen) {
-            1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
-            2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
-            3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
-            default => null,
-        };
-
-        if (!$verifyCodesSettingName) {
-            return;
-        }
-
-        $setting = $this->sessionSettingRepository->getSetting($session, $verifyCodesSettingName, $player);
-        if (!$setting) {
-            return;
-        }
-
-        $codes = json_decode($setting->getValue() ?? '[]', true) ?? [];
-        $regenerated = false;
-
-        foreach ($codes as $targetPlayerScreen => $code) {
-            if (str_contains($messageContent, (string)$code)) {
-                $codes[$targetPlayerScreen] = bin2hex(random_bytes(3));
-                $regenerated = true;
-            }
-        }
-
-        if ($regenerated) {
-            $setting->setValue(json_encode($codes));
-            $this->entityManager->persist($setting);
-            $this->entityManager->flush();
-
-            // Notify the player that their codes have changed
-            $topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $session->getId();
-            $notification = "Security Alert: One of your verify codes was shared and has been regenerated.";
-            // We send it only to this player (screen)
-            $this->hub->publish(new Update($topic, json_encode([$screen, $notification])));
-        }
-    }
-
-    private function updateChatTracking(Player $player, int $sendTo): void
-    {
-        $rights = $this->getRechten($player);
-        if(in_array('verify', $rights))
-            return;
-
-        $trackingSettingName = match ($player->getScreen()) {
-            1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
-            2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
-            3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
-            default => null,
-        };
-
-        if (!$trackingSettingName) {
-            return;
-        }
-
-        $setting = $this->sessionSettingRepository->getSetting($player->getSession(), $trackingSettingName, $player);
-        if (!$setting) {
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setPlayer($player);
-            $setting->setName($trackingSettingName);
-            $setting->setValue(json_encode([]));
-        }
-
-        $tracking = json_decode($setting->getValue() ?? '[]', true) ?? [];
-        if (!in_array($sendTo, $tracking)) {
-            $tracking[] = $sendTo;
-            $setting->setValue(json_encode($tracking));
-            $this->entityManager->persist($setting);
-            $this->entityManager->flush();
-
-            $this->checkAndGrantVerifyRight($player, $tracking);
-        }
-    }
-
-    private function checkAndGrantVerifyRight(Player $player, array $tracking): void
-    {
-        $screen = $player->getScreen();
-        $requiredTargets = [0]; // Everyone
-        for ($i = 1; $i <= 3; $i++) {
-            if ($i !== $screen) {
-                $requiredTargets[] = $i;
-            }
-        }
-
-        // Check if all required targets are in tracking
-        foreach ($requiredTargets as $target) {
-            if (!in_array($target, $tracking)) {
-                return;
-            }
-        }
-
-        // Grant verify right
-        $rightsSettingName = match ($screen) {
-            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
-            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
-            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
-            default => null,
-        };
-
-        if (!$rightsSettingName) {
-            return;
-        }
-
-        $setting = $this->sessionSettingRepository->getSetting($player->getSession(), $rightsSettingName, $player);
-        if (!$setting) {
-            return; // Should have been initialized
-        }
-
-        $rights = json_decode($setting->getValue() ?? '[]', true) ?? [];
-        $newRights = ['verify', 'cat'];
-
-        $updated = false;
-        foreach ($newRights as $newRight) {
-            if (!in_array($newRight, $rights)) {
-                $rights[] = $newRight;
-                $updated = true;
-            }
-        }
-
-        if ($updated) {
-            $setting->setValue(json_encode($rights));
-            $this->entityManager->persist($setting);
-            $this->entityManager->flush();
-        }
     }
 
     private function handleDecodeMessage(string $message, Player $player)
@@ -469,169 +247,9 @@ class GameResponseService
         return $randomString;
     }
 
-    private function handleVerifyMessage(string $message, Player $player) : string
+    private function handleVerifyMessage(string $message) : string
     {
-        $messageParts = explode(' ', $message);
-        if (count($messageParts) < 2) {
-            return 'Usage: /verify {code}';
-        }
-
-        $code = $messageParts[1];
-        $screen = $player->getScreen();
-        $session = $player->getSession();
-
-        $progressSettingName = match ($screen) {
-            1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
-            2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
-            3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
-            default => null,
-        };
-
-        if (!$progressSettingName) {
-            return 'Error: Invalid player screen.';
-        }
-
-        $progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $player);
-        if (!$progressSetting) {
-            return 'Error: Verification progress setting not found.';
-        }
-
-        $progress = json_decode($progressSetting->getValue() ?? '[]', true) ?? [];
-
-        $verifiedBy = null;
-        foreach ($session->getPlayers() as $otherPlayer) {
-            if ($otherPlayer->getId() === $player->getId()) {
-                continue;
-            }
-
-            $otherScreen = $otherPlayer->getScreen();
-            $codesSettingName = match ($otherScreen) {
-                1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
-                2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
-                3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
-                default => null,
-            };
-
-            if (!$codesSettingName) {
-                continue;
-            }
-
-            $codesSetting = $this->sessionSettingRepository->getSetting($session, $codesSettingName, $otherPlayer);
-            if (!$codesSetting) {
-                continue;
-            }
-
-            $codes = json_decode($codesSetting->getValue() ?? '[]', true) ?? [];
-            if (isset($codes[$screen]) && $codes[$screen] === $code) {
-                $verifiedBy = $otherScreen;
-                break;
-            }
-        }
-
-        if ($verifiedBy !== null) {
-            if (!in_array($verifiedBy, $progress)) {
-                $progress[] = $verifiedBy;
-                $progressSetting->setValue(json_encode($progress));
-                $this->entityManager->persist($progressSetting);
-                $this->entityManager->flush();
-
-                $response = 'You have been successfully verified by Agent ' . $verifiedBy . '.';
-
-                if (count($progress) >= 2) {
-                    $this->grantVerificationRights($player);
-                    $response .= ' You have received additional rights!';
-                }
-
-                return $response;
-            } else {
-                return 'You were already verified by Agent ' . $verifiedBy . '.';
-            }
-        }
-
-        return 'Invalid verification code.';
-    }
-
-    private function grantVerificationRights(Player $player): void
-    {
-        $screen = $player->getScreen();
-        $rightsSettingName = match ($screen) {
-            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
-            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
-            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
-            default => null,
-        };
-
-        if (!$rightsSettingName) {
-            return;
-        }
-
-        $setting = $this->sessionSettingRepository->getSetting($player->getSession(), $rightsSettingName, $player);
-        if (!$setting) {
-            return;
-        }
-
-        $rights = json_decode($setting->getValue() ?? '[]', true) ?? [];
-        $newRights = ['cd', 'decode'];
-
-        $updated = false;
-        foreach ($newRights as $newRight) {
-            if (!in_array($newRight, $rights)) {
-                $rights[] = $newRight;
-                $updated = true;
-            }
-        }
-
-        if ($updated) {
-            $setting->setValue(json_encode($rights));
-            $this->entityManager->persist($setting);
-            $this->entityManager->flush();
-
-            $this->checkIfAllPlayersVerified($player);
-        }
-    }
-
-    private function checkIfAllPlayersVerified(Player $player): void
-    {
-        $session = $player->getSession();
-        $everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($session, SessionSettingType::EVERYONE_VERIFIED, $player);
-
-        if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
-            return;
-        }
-
-        $allVerified = true;
-        foreach ([1, 2, 3] as $screen) {
-            $progressSettingName = match ($screen) {
-                1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
-                2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
-                3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
-                default => null,
-            };
-
-            $progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $player);
-            $progress = json_decode($progressSetting?->getValue() ?? '[]', true) ?? [];
-
-            if (count($progress) < 2) {
-                $allVerified = false;
-                break;
-            }
-        }
-
-        if ($allVerified) {
-            if (!$everyoneVerifiedSetting) {
-                $everyoneVerifiedSetting = new SessionSetting();
-                $everyoneVerifiedSetting->setSession($session);
-                $everyoneVerifiedSetting->setPlayer($player);
-                $everyoneVerifiedSetting->setName(SessionSettingType::EVERYONE_VERIFIED);
-            }
-            $everyoneVerifiedSetting->setValue('true');
-            $this->entityManager->persist($everyoneVerifiedSetting);
-            $this->entityManager->flush();
-
-            $topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $session->getId();
-            $message = "Mainframe Help Modus: Agents Doyle, Vega and Lennox rapports have been updated with coded messages.";
-            $this->hub->publish(new Update($topic, json_encode([0, $message])));
-        }
+        return '';
     }
 
     private function goToNewDir(string $pwd, string $newPwd, Player $player) : string|bool
@@ -711,119 +329,4 @@ class GameResponseService
 
         return $paths;
     }
-
-    private function isAllowedToRemove(string $file, Player $player, bool $sudo) : bool
-    {
-        if(!$this->fileExists($file, $player))
-            return false;
-
-        if(str_starts_with($file, '/var/rapports/'))
-            return false;
-
-        $rights = $this->getRechten($player);
-
-        if(in_array('sudo', $rights) || $sudo)
-            return true;
-
-        $sudoFiles = [
-            '/var/arrest/handle.sh',
-            '/var/arrest/cell.sh',
-            '/var/marriage/divorce.sh',
-        ];
-
-        return !in_array($file, $sudoFiles);
-    }
-
-    private function fileExists(string $file, Player $player) : bool
-    {
-        $files = $this->getAllPossibleFiles($player);
-
-        if(in_array($file, $files))
-            return true;
-
-        return false;
-    }
-
-    private function getAllPossibleFiles(Player $player = null) : array
-    {
-        $files = [];
-
-        $files[] = '/var/arrest/handle.sh';
-        $files[] = '/var/arrest/bars.sh';
-        $files[] = '/var/arrest/cell.sh';
-        $files[] = '/var/marriage/share.sh';
-        $files[] = '/var/marriage/divorce.sh';
-        $files[] = '/var/rapports/095_07-14.txt';
-        $files[] = '/var/rapports/007_19-52.txt';
-        $files[] = '/var/rapports/083_25-39.txt';
-        $files[] = '/var/rapports/019_31-11.txt';
-        $files[] = '/var/rapports/075_46-77.txt';
-        $files[] = '/var/rapports/031_53-28.txt';
-        $files[] = '/var/rapports/072_61-05.txt';
-        $files[] = '/var/rapports/064_72-90.txt';
-        $files[] = '/var/rapports/091_81-33.txt';
-        $files[] = '/var/rapports/079_89-47.txt';
-        $files[] = '/var/rapports/098_92-14.txt';
-        $files[] = '/var/rapports/012_94-31.txt';
-        $files[] = '/var/rapports/016_98-07.txt';
-        $files[] = '/var/rapports/087_102-45.txt';
-        $files[] = '/var/rapports/094_110-19.txt';
-        $files[] = '/var/rapports/063_117-56.txt';
-        $files[] = '/var/rapports/017_123-88.txt';
-        $files[] = '/var/rapports/093_138-24.txt';
-        $files[] = '/var/rapports/001_145-93.txt';
-        $files[] = '/var/rapports/index.txt';
-
-        $players = $player->getSession()->getPlayers();
-
-        foreach($players as $player) {
-            $files[] = '/var/home/' . $player->getUser()->getUsername() . '/verifyCodes.txt';
-        }
-
-        return $files;
-    }
-
-    private function getAllCurrentFilesInDirectory(Player $player) : array
-    {
-        $pwd = $this->playerService->getCurrentPwdOfPlayer($player);
-        if (!$pwd) {
-            return [];
-        }
-
-        $allPaths = $this->getAllPossiblePaths($player);
-        $allFiles = $this->getAllPossibleFiles();
-        $deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
-
-        $entries = [];
-
-        // Find directories in current pwd
-        foreach ($allPaths as $path) {
-            if ($path === $pwd) {
-                continue;
-            }
-
-            // Check if $path is a direct child of $pwd
-            $parent = $this->getPrevPath($path);
-            if ($parent === $pwd) {
-                $parts = explode('/', $path);
-                $entries[] = [end($parts) . '/', 'dir'];
-            }
-        }
-
-        // Find files in current pwd
-        foreach ($allFiles as $file) {
-            if (in_array($file, $deletedFiles)) {
-                continue;
-            }
-
-            $parent = $this->getPrevPath($file);
-            if ($parent === $pwd) {
-                $parts = explode('/', $file);
-                $entries[] = [end($parts), 'file'];
-            }
-        }
-
-        sort($entries);
-        return $entries;
-    }
 }

src/Game/Service/PlayerService.php

@@ -4,7 +4,6 @@ namespace App\Game\Service;
 
 use App\Game\Entity\Game;
 use App\Game\Entity\Player;
-use App\Game\Entity\SessionSetting;
 use App\Game\Enum\SessionSettingType;
 use App\Game\Enum\SessionStatus;
 use App\Game\Repository\PlayerRepository;
@@ -74,33 +73,4 @@ class PlayerService
         $this->entityManager->persist($setting);
         $this->entityManager->flush();
     }
-
-    public function getDeletedFilesOfSession(Player $player): array
-    {
-        $setting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::SET_OF_DELETED_FILES);
-        if (!$setting || !$setting->getValue()) {
-            return [];
-        }
-
-        return json_decode($setting->getValue(), true) ?? [];
-    }
-
-    public function addDeletedFileToSession(Player $player, string $filename): void
-    {
-        $setting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::SET_OF_DELETED_FILES);
-        if (!$setting) {
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setName(SessionSettingType::SET_OF_DELETED_FILES);
-        }
-
-        $deletedFiles = json_decode($setting->getValue() ?? '[]', true) ?? [];
-        if (!in_array($filename, $deletedFiles)) {
-            $deletedFiles[] = $filename;
-            $setting->setValue(json_encode($deletedFiles));
-
-            $this->entityManager->persist($setting);
-            $this->entityManager->flush();
-        }
-    }
 }

src/Tech/Controller/RegistrationController.php

@@ -31,8 +31,6 @@ class RegistrationController extends AbstractController
                 )
             );
 
-            $user->setRoles(['ROLE_USER', 'ROLE_PLAYER']);
-
             $entityManager->persist($user);
             $entityManager->flush();
 

templates/base.html.twig

@@ -14,7 +14,7 @@
     <nav>
         {% set pathinfo = app.request.pathinfo %}
         <a href="/">{{ 'nav.home'|trans }}</a> |
-        <a href="{{ path('game_dashboard') }}">{{ 'nav.game'|trans }}</a> |
+        <a href="/game">{{ 'nav.game'|trans }}</a> |
         {% if app.user %}
             <a href="{{ path('app_logout') }}">Logout</a>
         {% else %}

templates/game/dashboard.html.twig

@@ -1,86 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block title %}Game Dashboard{% endblock %}
-
-{% block body %}
-    <h1>Game Dashboard</h1>
-
-    <h2>Create New Session</h2>
-    {% if availableGames is not empty %}
-        <form method="post">
-            <select name="game_id">
-                {% for game in availableGames %}
-                    <option value="{{ game.id }}">
-                        {{ game.name }} ({{ game.numberOfPlayers }} players)
-                        {% if is_granted('ROLE_ADMIN') %}
-                            [{{ game.status.value }}]
-                        {% endif %}
-                    </option>
-                {% endfor %}
-            </select>
-            <button type="submit" name="create_session">Create Session</button>
-        </form>
-    {% else %}
-        <p>No games available to start.</p>
-    {% endif %}
-
-    <h2>Join Session</h2>
-    <form method="post">
-        <input type="text" name="invite_code" placeholder="Enter Invite Code" required>
-        <button type="submit" name="join_session">Join Session</button>
-    </form>
-
-    <h2>Your Sessions</h2>
-    {% if sessions is not empty %}
-        <table>
-            <thead>
-                <tr>
-                    <th>ID</th>
-                    <th>Game</th>
-                    <th>Status</th>
-                    <th>Created At</th>
-                    <th>Invite Code</th>
-                    <th>Actions</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for session in sessions %}
-                    <tr>
-                        <td>{{ session.id }}</td>
-                        <td>{{ session.game.name }}</td>
-                        <td>{{ session.status.value }}</td>
-                        <td>{{ session.created|date('Y-m-d H:i') }}</td>
-                        <td>
-                            {% set inviteCode = '' %}
-                            {% for setting in session.settings %}
-                                {% if setting.name.value == 'InviteCode' %}
-                                    {% set inviteCode = setting.value %}
-                                {% endif %}
-                            {% endfor %}
-
-                            {% if inviteCode %}
-                                <code>{{ inviteCode }}</code>
-                            {% else %}
-                                <form method="post" style="display:inline;">
-                                    <input type="hidden" name="session_id" value="{{ session.id }}">
-                                    <button type="submit" name="create_invite">Generate Invite</button>
-                                </form>
-                            {% endif %}
-                        </td>
-                        <td>
-                            <a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
-                            {% if session.status.value == 'created' and session.timer == 0 %}
-                                <form method="post" style="display:inline;">
-                                    <input type="hidden" name="session_id" value="{{ session.id }}">
-                                    <button type="submit" name="leave_session" onclick="return confirm('Are you sure you want to leave this session?')">Leave Session</button>
-                                </form>
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p>You are not part of any sessions.</p>
-    {% endif %}
-{% endblock %}

templates/game/index.html.twig

@@ -15,10 +15,10 @@
     <div id="game-container">
         <div id="mercure-config"
              data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
-             data-topic="{{ (mercure_topic_base ~ '/game/hub-' ~ session.id)|e('html_attr') }}"
+             data-topic="{{ (mercure_topic_base ~ '/game/hub')|e('html_attr') }}"
              data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
              data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
-             data-screen="{{ screen|e('html_attr') }}"
+             data-user-id="{{ user_id|e('html_attr') }}"
              style="display:none">
         </div>
 
@@ -28,9 +28,6 @@
         <div id="message-container">
 
         </div>
-        <audio id="message-sound" style="display:none">
-            <source src="{{ asset('audio/message.mp3') }}" type="audio/mpeg">
-        </audio>
         <div id="input">
             <input type="text" disabled id="input-message">
         </div>

templates/website/home/index.html.twig

@@ -5,5 +5,5 @@
 {% block body %}
 <h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1>
 <p>{{ 'home.description'|trans }}</p>
-<p><a href="{{ path('game_dashboard') }}">{{ 'link.enter_game'|trans }}</a></p>
+<p><a href="{{ path('game') }}">{{ 'link.enter_game'|trans }}</a></p>
 {% endblock %}

tests/Game/GameDashboardServiceTest.php

@@ -1,135 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Tests\Game;
-
-use App\Game\Entity\Game;
-use App\Game\Entity\Player;
-use App\Game\Entity\Session;
-use App\Game\Entity\SessionSetting;
-use App\Game\Enum\GameStatus;
-use App\Game\Enum\SessionSettingType;
-use App\Game\Service\GameDashboardService;
-use App\Tech\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
-use App\Game\Repository\GameRepository;
-use App\Game\Repository\SessionRepository;
-use PHPUnit\Framework\TestCase;
-
-class GameDashboardServiceTest extends TestCase
-{
-    private $entityManager;
-    private $gameRepository;
-    private $sessionRepository;
-    private $service;
-
-    protected function setUp(): void
-    {
-        $this->entityManager = $this->createMock(EntityManagerInterface::class);
-        $this->gameRepository = $this->createMock(GameRepository::class);
-        $this->sessionRepository = $this->createMock(SessionRepository::class);
-
-        $this->service = new GameDashboardService(
-            $this->gameRepository,
-            $this->sessionRepository,
-            $this->entityManager
-        );
-    }
-
-    public function testCreateSessionInitializesRightsAndPwd(): void
-    {
-        $game = new Game();
-        $game->setStatus(GameStatus::OPEN);
-
-        $user = new User();
-        $user->setUsername('testuser');
-
-        $this->entityManager->expects($this->exactly(7))
-            ->method('persist');
-            // 1. Session, 2. Player, 3. SessionSetting (rights), 4. SessionSetting (pwd), 5. SessionSetting (chat tracking), 6. SessionSetting (verify codes), 7. SessionSetting (verification progress)
-
-        $session = $this->service->createSession($game, $user, false);
-
-        $this->assertInstanceOf(Session::class, $session);
-    }
-
-    public function testJoinSessionInitializesRightsAndPwd(): void
-    {
-        $user = new User();
-        $user->setUsername('testuser');
-        $session = new Session();
-
-        $setting = new SessionSetting();
-        $setting->setSession($session);
-        $setting->setName(SessionSettingType::INVITE_CODE);
-        $setting->setValue('abc-123');
-
-        $repo = $this->createMock(\Doctrine\ORM\EntityRepository::class);
-        $this->entityManager->method('getRepository')
-            ->willReturn($repo);
-
-        $repo->method('findOneBy')
-            ->willReturn($setting);
-
-        $this->entityManager->expects($this->exactly(6))
-            ->method('persist');
-            // 1. Player, 2. SessionSetting (rights), 3. SessionSetting (pwd), 4. SessionSetting (chat tracking), 5. SessionSetting (verify codes), 6. SessionSetting (verification progress)
-
-        $result = $this->service->joinSession('abc-123', $user);
-
-        $this->assertTrue($result);
-    }
-
-    public function testLeaveSession(): void
-    {
-        $user = new User();
-        $session = new Session();
-        $session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
-        $session->setTimer(0);
-
-        $player1 = new Player();
-        $player1->setUser($user);
-        $player1->setSession($session);
-        $session->addPlayer($player1);
-
-        $player2 = new Player();
-        $player2->setUser(new User());
-        $player2->setSession($session);
-        $session->addPlayer($player2);
-
-        $setting = new SessionSetting();
-        $setting->setPlayer($player1);
-        $setting->setSession($session);
-        $session->addSetting($setting);
-
-        $this->entityManager->expects($this->exactly(2))
-            ->method('remove');
-            // 1. SessionSetting, 2. Player
-
-        $result = $this->service->leaveSession($session, $user);
-
-        $this->assertTrue($result);
-        $this->assertCount(1, $session->getPlayers());
-    }
-
-    public function testLeaveSessionDeletesSessionIfLastPlayer(): void
-    {
-        $user = new User();
-        $session = new Session();
-        $session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
-        $session->setTimer(0);
-
-        $player = new Player();
-        $player->setUser($user);
-        $player->setSession($session);
-        $session->addPlayer($player);
-
-        $this->entityManager->expects($this->exactly(2))
-            ->method('remove');
-            // 1. Player, 2. Session
-
-        $result = $this->service->leaveSession($session, $user);
-
-        $this->assertTrue($result);
-    }
-}

tests/Game/GameResponseServiceChatVerifyCodeTest.php

@@ -1,101 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Tests\Game;
-
-use App\Game\Entity\Player;
-use App\Game\Entity\Session;
-use App\Game\Entity\SessionSetting;
-use App\Game\Enum\SessionSettingType;
-use App\Game\Repository\SessionSettingRepository;
-use App\Game\Service\GameResponseService;
-use App\Game\Service\PlayerService;
-use App\Tech\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
-
-class GameResponseServiceChatVerifyCodeTest extends TestCase
-{
-    private $security;
-    private $playerService;
-    private $sessionSettingRepository;
-    private $hub;
-    private $entityManager;
-    private $service;
-
-    protected function setUp(): void
-    {
-        $this->security = $this->createMock(Security::class);
-        $this->playerService = $this->createMock(PlayerService::class);
-        $this->sessionSettingRepository = $this->createMock(SessionSettingRepository::class);
-        $this->hub = $this->createMock(HubInterface::class);
-        $this->entityManager = $this->createMock(EntityManagerInterface::class);
-
-        $this->service = new GameResponseService(
-            $this->security,
-            $this->playerService,
-            $this->sessionSettingRepository,
-            $this->hub,
-            $this->entityManager
-        );
-
-        $_ENV['MERCURE_TOPIC_BASE'] = 'http://test';
-    }
-
-    public function testChatRegeneratesVerifyCodesIfShared(): void
-    {
-        $user = new User();
-        $user->setUsername('testuser');
-
-        $session = $this->createMock(Session::class);
-        $session->method('getId')->willReturn(123);
-
-        $player = $this->createMock(Player::class);
-        $player->method('getUser')->willReturn($user);
-        $player->method('getScreen')->willReturn(1);
-        $player->method('getSession')->willReturn($session);
-
-        $this->security->method('getUser')->willReturn($user);
-        $this->playerService->method('GetCurrentlyActiveAsPlayer')->willReturn($player);
-
-        // Mock rights
-        $rightsSetting = new SessionSetting();
-        $rightsSetting->setValue(json_encode(['chat']));
-        $this->sessionSettingRepository->method('getSetting')
-            ->willReturnMap([
-                [$session, SessionSettingType::RIGHTS_FOR_PLAYER1, $player, $rightsSetting],
-            ]);
-
-        // Mock verify codes
-        $verifyCodesSetting = new SessionSetting();
-        $initialCodes = ['2' => 'secret123', '3' => 'secret456'];
-        $verifyCodesSetting->setValue(json_encode($initialCodes));
-
-        // Setting repository map for multiple calls
-        $this->sessionSettingRepository->method('getSetting')
-            ->willReturnCallback(function($s, $t, $p = null) use ($rightsSetting, $verifyCodesSetting) {
-                if ($t === SessionSettingType::RIGHTS_FOR_PLAYER1) return $rightsSetting;
-                if ($t === SessionSettingType::VERIFY_CODES_FOR_PLAYER1) return $verifyCodesSetting;
-                return null;
-            });
-
-        // Expect Mercure updates: 1 for chat, 1 for notification
-        $this->hub->expects($this->exactly(2))
-            ->method('publish');
-
-        $this->entityManager->expects($this->once())
-            ->method('flush');
-
-        $raw = json_encode(['message' => '/chat Hello look at my code secret123', 'ts' => '123']);
-        $result = $this->service->getGameResponse($raw);
-
-        $this->assertEquals(['result' => ['succesfully send']], $result);
-
-        $newCodes = json_decode($verifyCodesSetting->getValue(), true);
-        $this->assertNotEquals('secret123', $newCodes['2']);
-        $this->assertEquals('secret456', $newCodes['3']);
-    }
-}