Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag

matrix-org · Feb 25, 2020 · 4f37881 · 4f37881
2 parents 5a1bdf2 + a2a695b
commit 4f37881
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/changelog.d/5998.bugfix b/changelog.d/5998.bugfix
@@ -0,0 +1 @@
+Fix room and user stats tracking.
diff --git a/synapse/handlers/stats.py b/synapse/handlers/stats.py
@@ -260,7 +260,9 @@ def _handle_deltas(self, deltas):
                         room_stats_delta["local_users_in_room"] += delta
 
             elif typ == EventTypes.Create:
-                room_state["is_federatable"] = event_content.get("m.federate", True)
+                room_state["is_federatable"] = (
+                    event_content.get("m.federate", True) is True
+                )
                 if sender and self.is_mine_id(sender):
                     user_to_stats_deltas.setdefault(sender, Counter())[
                         "rooms_created"

diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py
@@ -823,7 +823,9 @@ def _fetch_current_state_stats(txn):
             elif event.type == EventTypes.CanonicalAlias:
                 room_state["canonical_alias"] = event.content.get("alias")
             elif event.type == EventTypes.Create:
-                room_state["is_federatable"] = event.content.get("m.federate", True)
+                room_state["is_federatable"] = (
+                    event.content.get("m.federate", True) is True
+                )
 
         yield self.update_room_state(room_id, room_state)