Fix joining as a guest and leaving a conversation as a session

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/Manager.php b/lib/Manager.php
index 6ad66c2ad..5b3bdbbd2 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -570,9 +570,14 @@ class Manager {
 			throw new RoomNotFoundException();
 		}
 
-		if ((string) $userId !== $row['actor_id']) {
-			// FIXME check the actor type too and bail out for guests
-			throw new RoomNotFoundException();
+		if ($userId !== null) {
+			if ($row['actor_type'] !== 'users' || $userId !== $row['actor_id']) {
+				throw new RoomNotFoundException();
+			}
+		} else {
+			if ($row['actor_type'] !== 'guests') {
+				throw new RoomNotFoundException();
+			}
 		}
 
 		if ($row['token'] === null) {