Merge pull request #354 from matrix-org/markjh/SYN-513

SYN-513: Include updates for rooms that have had all their tags deleted

2 files changed, 2 insertions, 3 deletions

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 5294d96466..ff766e3af5 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -272,7 +272,7 @@ class SyncHandler(BaseHandler):
     def private_user_data_for_room(self, room_id, tags_by_room):
         private_user_data = []
         tags = tags_by_room.get(room_id)
-        if tags:
+        if tags is not None:
             private_user_data.append({
                 "type": "m.tag",
                 "content": {"tags": tags},
diff --git a/synapse/storage/tags.py b/synapse/storage/tags.py

index 73babd53d9..bf695b7800 100644
--- a/synapse/storage/tags.py
+++ b/synapse/storage/tags.py
@@ -95,8 +95,7 @@ class TagsStore(SQLBaseStore):
         if room_ids:
             tags_by_room = yield self.get_tags_for_user(user_id)
             for room_id in room_ids:
-                if room_id in tags_by_room:
-                    results[room_id] = tags_by_room[room_id]
+                results[room_id] = tags_by_room.get(room_id, {})
 
         defer.returnValue(results)