2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 809e9fece9..fa730ca760 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -471,13 +471,13 @@ class SyncHandler(object):
if filter_members:
# We only request state for the members needed to display the
# timeline:
- types = (
+ types = [
(EventTypes.Member, state_key)
for state_key in set(
event.sender # FIXME: we also care about targets etc.
for event in batch.events
)
- )
+ ]
types.append((None, None)) # don't just filter to room members
# TODO: we should opportunistically deduplicate these members too
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index da6bb685fa..0238200286 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -301,6 +301,8 @@ class StateGroupWorkerStore(SQLBaseStore):
args = [next_group]
if types:
args.extend(i for typ in types for i in typ)
+ if include_other_types:
+ args.extend(typ for (typ, _) in types)
txn.execute(
"SELECT type, state_key, event_id FROM state_groups_state"
|
