Merge pull request #88 from H2-invent/bugfix/emptyRoomUser

if there is now RoomsUser then an empty will be created
H2-invent · Mar 13, 2021 · 1017c67 · 1017c67
2 parents d9dd4dd + 201aeff
commit 1017c67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Service/RoomService.php b/src/Service/RoomService.php
@@ -51,7 +51,9 @@ public function __construct(TranslatorInterface $translator, EntityManagerInterf
     function join(Rooms $room, User $user, $t, $userName)
     {
         $roomUser = $this->em->getRepository(RoomsUser::class)->findOneBy(array('user' => $user, 'room' => $room));
-
+        if(!$roomUser){
+            $roomUser = new RoomsUser();
+        }
         if ($t === 'a') {
             $type = 'jitsi-meet://';
         } else {

diff --git a/src/Twig/CheckRoomPermissions.php b/src/Twig/CheckRoomPermissions.php
@@ -36,9 +36,12 @@ public function getFunctions(): array
             new TwigFunction('roomPermissions', [$this, 'roomPermissions']),
         ];
     }
-    public function roomPermissions(User $user, Rooms $rooms):RoomsUser
+    public function roomPermissions(User $user, Rooms $rooms):?RoomsUser
     {
       $permissions = $this->em->getRepository(RoomsUser::class)->findOneBy(array('user'=>$user, 'room'=>$rooms));
+     if(!$permissions){
+         $permissions = new RoomsUser();
+     }
       return $permissions;
     }