diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-03-04 14:44:34 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-03-04 14:44:34 +0000 |
| commit | ec7460b4f2da70ae3ea4ddaa4a198d9dd193a045 (patch) | |
| tree | 2dddf9f52591a392295bbace7a9494ab423c7cfd /synapse/storage/directory.py | |
| parent | Hook up the push rules stream to account_data in /sync (diff) | |
| parent | Merge pull request #598 from Rugvip/invite-state (diff) | |
| download | synapse-ec7460b4f2da70ae3ea4ddaa4a198d9dd193a045.tar.xz | |
Merge branch 'develop' into markjh/pushrule_stream
Diffstat (limited to 'synapse/storage/directory.py')
| -rw-r--r-- | synapse/storage/directory.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py index 1556619d5e..012a0b414a 100644 --- a/synapse/storage/directory.py +++ b/synapse/storage/directory.py @@ -70,13 +70,14 @@ class DirectoryStore(SQLBaseStore): ) @defer.inlineCallbacks - def create_room_alias_association(self, room_alias, room_id, servers): + def create_room_alias_association(self, room_alias, room_id, servers, creator=None): """ Creates an associatin between a room alias and room_id/servers Args: room_alias (RoomAlias) room_id (str) servers (list) + creator (str): Optional user_id of creator. Returns: Deferred @@ -87,6 +88,7 @@ class DirectoryStore(SQLBaseStore): { "room_alias": room_alias.to_string(), "room_id": room_id, + "creator": creator, }, desc="create_room_alias_association", ) @@ -107,6 +109,17 @@ class DirectoryStore(SQLBaseStore): ) self.get_aliases_for_room.invalidate((room_id,)) + def get_room_alias_creator(self, room_alias): + return self._simple_select_one_onecol( + table="room_aliases", + keyvalues={ + "room_alias": room_alias, + }, + retcol="creator", + desc="get_room_alias_creator", + allow_none=True + ) + @defer.inlineCallbacks def delete_room_alias(self, room_alias): room_id = yield self.runInteraction( |