Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-06 02:54:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Mutual rooms: Remove dependency on user directory (#12836)

Browse source
This commit is contained in:
Jonathan de Jong 2022-05-30 11:05:31 +02:00 • committed by GitHub
parent bda4600399
commit 6be4953b99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

15
synapse/rest/client/mutual_rooms.py
View file

@ -42,21 +42,10 @@ class UserMutualRoomsServlet(RestServlet):
super().__init__()
self.auth = hs.get_auth()
self.store = hs.get_datastores().main
self.user_directory_search_enabled = (
hs.config.userdirectory.user_directory_search_enabled
)
async def on_GET(
self, request: SynapseRequest, user_id: str
) -> Tuple[int, JsonDict]:
if not self.user_directory_search_enabled:
raise SynapseError(
code=400,
msg="User directory searching is disabled. Cannot determine shared rooms.",
errcode=Codes.UNKNOWN,
)
UserID.from_string(user_id)
requester = await self.auth.get_user_by_req(request)
@ -67,8 +56,8 @@ class UserMutualRoomsServlet(RestServlet):
errcode=Codes.FORBIDDEN,
)
rooms = await self.store.get_mutual_rooms_for_users(
requester.user.to_string(), user_id
rooms = await self.store.get_mutual_rooms_between_users(
frozenset((requester.user.to_string(), user_id))
)
return 200, {"joined": list(rooms)}