Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix rejecting invites over federation #12409

Merged
merged 3 commits into from
Apr 7, 2022
Merged

Fix rejecting invites over federation #12409

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07e1af1
Fix rejecting invites over federation
erikjohnston Apr 7, 2022
c7492b4
Newsfile
erikjohnston Apr 7, 2022
234a74a
Also do recalculate a summary
erikjohnston Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Also do recalculate a summary
  • Loading branch information
@erikjohnston
erikjohnston committed Apr 7, 2022
commit 234a74a1c51a17dea81c4f734c05131c0749f4ac
28 changes: 16 additions & 12 deletions synapse/handlers/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,19 +2135,23 @@ async def _generate_room_entry(
# we include a summary in room responses when we're lazy loading
# members (as the client otherwise doesn't have enough info to form
# the name itself).
if sync_config.filter_collection.lazy_load_members() and (
# we recalculate the summary:
# if there are membership changes in the timeline, or
# if membership has changed during a gappy sync, or
# if this is an initial sync.
any(ev.type == EventTypes.Member for ev in batch.events)
or (
# XXX: this may include false positives in the form of LL
# members which have snuck into state
batch.limited
and any(t == EventTypes.Member for (t, k) in state)
if (
not room_builder.out_of_band
and sync_config.filter_collection.lazy_load_members()
and (
# we recalculate the summary:
# if there are membership changes in the timeline, or
# if membership has changed during a gappy sync, or
# if this is an initial sync.
any(ev.type == EventTypes.Member for ev in batch.events)
or (
# XXX: this may include false positives in the form of LL
# members which have snuck into state
batch.limited
and any(t == EventTypes.Member for (t, k) in state)
)
or since_token is None
)
or since_token is None
):
summary = await self.compute_summary(
room_id, sync_config, batch, state, now_token
Expand Down