Fix adding excluded users to the private room sharing tables when joining a room

synapse/handlers/user_directory.py

@@ -376,23 +376,22 @@ async def _track_user_joined_room(self, room_id: str, user_id: str) -> None:
         if is_public:
             await self.store.add_users_in_public_rooms(room_id, (user_id,))
         else:
-            other_users_in_room = await self.store.get_users_in_room(room_id)
+            users_in_room = await self.store.get_users_in_room(room_id)
+            other_users_in_room = [
+                other
+                for other in users_in_room
+                if other != user_id
+            ]
             to_insert = set()
 
             # First, if they're our user then we need to update for every user
             if self.is_mine_id(user_id):
                 if await self.store.should_include_local_user_in_dir(user_id):
                     for other_user_id in other_users_in_room:
-                        if user_id == other_user_id:
-                            continue
-
                         to_insert.add((user_id, other_user_id))
 
             # Next we need to update for every local user in the room
             for other_user_id in other_users_in_room:
-                if user_id == other_user_id:
-                    continue
-
                 include_other_user = self.is_mine_id(
                     other_user_id
                 ) and await self.store.should_include_local_user_in_dir(other_user_id)