fix(CI): Fix psalm and phpunit - I shall never force merge

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Feb 29, 2024 · b941660 · b941660
1 parent a91b44b
commit b941660
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
@@ -825,12 +825,18 @@ protected function getFileFromShare(?Participant $participant, string $shareId):
 	}
 
 	protected function isCurrentParticipantChangedUser(?string $currentActorType, ?string $currentActorId, array $parameter): bool {
-		if (isset($parameter['server']) && $currentActorType === Attendee::ACTOR_FEDERATED_USERS) {
+		if ($currentActorType === Attendee::ACTOR_GUESTS) {
+			return $parameter['type'] === 'guest' && $currentActorId === $parameter['id'];
+		}
+
+		if (isset($parameter['server'])
+			&& $currentActorType === Attendee::ACTOR_FEDERATED_USERS
+			&& $parameter['type'] === 'user') {
 			return $this->currentFederatedUserDetails['user'] === $parameter['id']
 				&& $this->currentFederatedUserDetails['server'] === $parameter['server'];
 		}
 
-		return $currentActorType === Attendee::ACTOR_USERS && $currentActorId === $parameter['id'];
+		return $currentActorType === Attendee::ACTOR_USERS && $parameter['type'] === 'user' && $currentActorId === $parameter['id'];
 	}
 
 	protected function getActorFromComment(Room $room, IComment $comment): array {

diff --git a/lib/Federation/Proxy/TalkV1/UserConverter.php b/lib/Federation/Proxy/TalkV1/UserConverter.php
@@ -103,10 +103,10 @@ protected function convertMessageParameters(Room $room, array $message): array {
 	 * @return TalkChatMessageWithParent
 	 */
 	public function convertMessage(Room $room, array $message): array {
+		$message['token'] = $room->getToken();
 		$message = $this->convertAttendee($room, $message, 'actorType', 'actorId', 'actorDisplayName');
 		$message = $this->convertAttendee($room, $message, 'lastEditActorType', 'lastEditActorId', 'lastEditActorDisplayName');
 		$message = $this->convertMessageParameters($room, $message);
-		$message['token'] = $room->getToken();
 
 		if (isset($message['parent'])) {
 			$message['parent'] = $this->convertMessage($room, $message['parent']);