tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Allow room_alias_name parameter to be handled by /createRoom calls on workers (#10757)

Browse source
This commit is contained in:
Andrew Morgan 2021-09-06 14:37:15 +01:00 committed by GitHub
parent 7bb3673f37
commit 40a1fddd1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/10757.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a bug which prevented calls to `/createRoom` that included the `room_alias_name` parameter from being handled by worker processes.

4
synapse/storage/databases/main/directory.py
View file

@ -75,8 +75,6 @@ class DirectoryWorkerStore(SQLBaseStore):
desc="get_aliases_for_room", desc="get_aliases_for_room",
) )
class DirectoryStore(DirectoryWorkerStore):
async def create_room_alias_association( async def create_room_alias_association(
self, self,
room_alias: RoomAlias, room_alias: RoomAlias,
@ -126,6 +124,8 @@ class DirectoryStore(DirectoryWorkerStore):
409, "Room alias %s already exists" % room_alias.to_string() 409, "Room alias %s already exists" % room_alias.to_string()
) )
class DirectoryStore(DirectoryWorkerStore):
async def delete_room_alias(self, room_alias: RoomAlias) -> str: async def delete_room_alias(self, room_alias: RoomAlias) -> str:
room_id = await self.db_pool.runInteraction( room_id = await self.db_pool.runInteraction(
"delete_room_alias", self._delete_room_alias_txn, room_alias "delete_room_alias", self._delete_room_alias_txn, room_alias