fix(participants): Don't try to load the CLI guest

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Sep 18, 2023 · 321bbab · 321bbab
1 parent 3d78849
commit 321bbab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/lib/Chat/MessageParser.php b/lib/Chat/MessageParser.php
@@ -84,6 +84,9 @@ protected function setActor(Message $message): void {
 		} elseif ($comment->getActorType() === Attendee::ACTOR_BRIDGED) {
 			$displayName = $comment->getActorId();
 			$actorId = MatterbridgeManager::BRIDGE_BOT_USERID;
+		} elseif ($comment->getActorType() === Attendee::ACTOR_GUESTS
+			&& $comment->getActorId() === Attendee::ACTOR_CLI) {
+			$actorId = Attendee::ACTOR_CLI;
 		} elseif ($comment->getActorType() === Attendee::ACTOR_GUESTS) {
 			if (isset($guestNames[$comment->getActorId()])) {
 				$displayName = $this->guestNames[$comment->getActorId()];

diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
@@ -823,6 +823,10 @@ protected function getGuest(Room $room, string $actorType, string $actorId): arr
 	}
 
 	protected function getGuestName(Room $room, string $actorType, string $actorId): string {
+		if ($actorId === Attendee::ACTOR_CLI) {
+			return $this->l->t('Guest');
+		}
+
 		try {
 			$participant = $this->participantService->getParticipantByActor($room, $actorType, $actorId);
 			$name = $participant->getAttendee()->getDisplayName();

diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
@@ -427,7 +427,7 @@ protected function sendSystemMessage(Room $room, string $message, array $paramet
 				$actorId = $user->getUID();
 			} elseif (\OC::$CLI || $this->session->exists('talk-overwrite-actor-cli')) {
 				$actorType = Attendee::ACTOR_GUESTS;
-				$actorId = 'cli';
+				$actorId = Attendee::ACTOR_CLI;
 			} elseif ($this->session->exists('talk-overwrite-actor-type')) {
 				$actorType = $this->session->get('talk-overwrite-actor-type');
 				$actorId = $this->session->get('talk-overwrite-actor-id');

diff --git a/lib/Model/Attendee.php b/lib/Model/Attendee.php
@@ -71,6 +71,7 @@ class Attendee extends Entity {
 	public const ACTOR_BOTS = 'bots';
 	public const ACTOR_FEDERATED_USERS = 'federated_users';
 	public const ACTOR_BOT_PREFIX = 'bot-';
+	public const ACTOR_CLI = 'cli';
 
 	public const PERMISSIONS_DEFAULT = 0;
 	public const PERMISSIONS_CUSTOM = 1;