2 files changed, 6 insertions, 5 deletions
diff --git a/changelog.d/5084.bugfix b/changelog.d/5084.bugfix
new file mode 100644
index 0000000000..9d8434460c
--- /dev/null
+++ b/changelog.d/5084.bugfix
@@ -0,0 +1 @@
+Fixes client-server API not sending "m.heroes" to lazy-load /sync requests when a rooms name or its canonical alias are empty.
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 1ee9a6e313..72997d6d04 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -583,19 +583,19 @@ class SyncHandler(object):
)
# if the room has a name or canonical_alias set, we can skip
- # calculating heroes. we assume that if the event has contents, it'll
- # be a valid name or canonical_alias - i.e. we're checking that they
- # haven't been "deleted" by blatting {} over the top.
+ # calculating heroes. Empty strings are falsey, so we check
+ # for the "name" value and default to an empty string.
if name_id:
name = yield self.store.get_event(name_id, allow_none=True)
- if name and name.content:
+ if name and name.content and name.content.get("name", ""):
defer.returnValue(summary)
if canonical_alias_id:
canonical_alias = yield self.store.get_event(
canonical_alias_id, allow_none=True,
)
- if canonical_alias and canonical_alias.content:
+ if (canonical_alias and canonical_alias.content
+ and canonical_alias.content.get("alias", "")):
defer.returnValue(summary)
joined_user_ids = [
|
