summary refs log tree commit diff
path: root/synapse/storage/events.py
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-06-28 10:12:24 +0100
committerGitHub <noreply@github.com>2016-06-28 10:12:24 +0100
commitdb74dcda5b6e0fea3d80635283bcaea6355f3579 (patch)
tree6d97a0e7ac37e7d5f7c2337e7d4ea2b4efa79132 /synapse/storage/events.py
parentremove vector.im from default secondary DS list (diff)
parentMerge remote-tracking branch 'origin/develop' into dbkr/push_room_naming (diff)
downloadsynapse-db74dcda5b6e0fea3d80635283bcaea6355f3579.tar.xz
Merge pull request #894 from matrix-org/dbkr/push_room_naming
Use similar naming we use in email notifs for push
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r--synapse/storage/events.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 6d978ffcd5..88a6ff7310 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -355,7 +355,6 @@ class EventsStore(SQLBaseStore):
             txn.call_after(self.get_rooms_for_user.invalidate_all)
             txn.call_after(self.get_users_in_room.invalidate, (event.room_id,))
             txn.call_after(self.get_joined_hosts_for_room.invalidate, (event.room_id,))
-            txn.call_after(self.get_room_name_and_aliases.invalidate, (event.room_id,))
 
             # Add an entry to the current_state_resets table to record the point
             # where we clobbered the current state
@@ -666,12 +665,6 @@ class EventsStore(SQLBaseStore):
                 (event.room_id, event.type, event.state_key,)
             )
 
-            if event.type in [EventTypes.Name, EventTypes.Aliases]:
-                txn.call_after(
-                    self.get_room_name_and_aliases.invalidate,
-                    (event.room_id,)
-                )
-
             self._simple_upsert_txn(
                 txn,
                 "current_state_events",