Merge pull request #11694 from nextcloud/bugfix/noid/give-remote-atte…

…ndeeid-in-room-list fix(federation): Send the remote attendeeId so it can be found in the…
nextcloud · Mar 1, 2024 · 9d0e42f · 9d0e42f
2 parents 138d585 + 65d35ae
commit 9d0e42f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/Federation/FederationManager.php b/lib/Federation/FederationManager.php
@@ -144,7 +144,7 @@ public function acceptRemoteRoomShare(IUser $user, int $shareId): Participant {
 				'actorId' => $user->getUID(),
 				'displayName' => $user->getDisplayName(),
 				'accessToken' => $invitation->getAccessToken(),
-				'remoteId' => $invitation->getRemoteAttendeeId(), // FIXME this seems unnecessary
+				'remoteId' => $invitation->getRemoteAttendeeId(),
 				'invitedCloudId' => $invitation->getLocalCloudId(),
 			]
 		];

diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php
@@ -400,6 +400,10 @@ public function formatRoomV4(
 			}
 		}
 
+		if ($room->getRemoteServer() !== '') {
+			$roomData['attendeeId'] = (int) $attendee->getRemoteId();
+		}
+
 		return $roomData;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -400,6 +400,10 @@ public function formatRoomV4( @@
     			}
     		}
+    		if ($room->getRemoteServer() !== '') {
+    			$roomData['attendeeId'] = (int) $attendee->getRemoteId();
+    		}
     		return $roomData;
     	}
@@ Expand Down @@