summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-19 16:37:08 +0000
committerErik Johnston <erik@matrix.org>2014-12-19 16:37:08 +0000
commitd61109f5781fecfdc8b3ea1f1ae74a72f8a2a913 (patch)
treedff914dc74740d36be1da73be66a8b06c6c4feea /synapse/storage/room.py
parentMerge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff)
parentSet a state_key for the topic and room name, otherwise they won't be treated ... (diff)
downloadsynapse-d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913.tar.xz
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/storage/room.py')
-rw-r--r--synapse/storage/room.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 2378d65943..c20abbfe4d 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -135,26 +135,26 @@ class RoomStore(SQLBaseStore):
         defer.returnValue(ret)
 
     def _store_room_topic_txn(self, txn, event):
-        if hasattr(event, "topic"):
+        if hasattr(event, "content") and "topic" in event.content:
             self._simple_insert_txn(
                 txn,
                 "topics",
                 {
                     "event_id": event.event_id,
                     "room_id": event.room_id,
-                    "topic": event.topic,
+                    "topic": event.content["topic"],
                 }
             )
 
     def _store_room_name_txn(self, txn, event):
-        if hasattr(event, "name"):
+        if hasattr(event, "content") and "name" in event.content:
             self._simple_insert_txn(
                 txn,
                 "room_names",
                 {
                     "event_id": event.event_id,
                     "room_id": event.room_id,
-                    "name": event.name,
+                    "name": event.content["name"],
                 }
             )