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

Prevent join->join membership transitions changing member count #7977

Merged
merged 10 commits into from
Aug 3, 2020
Merged

Prevent join->join membership transitions changing member count #7977

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
11c4e51
Prevent join->join membership transitions changing member count
anoadragon453 Jul 28, 2020
835085f
Changelog
anoadragon453 Jul 28, 2020
4f9a8ec
Simplify fix immensely
anoadragon453 Jul 29, 2020
94b9d4b
Test to check room user count is not affected by profile changes
anoadragon453 Jul 29, 2020
2d31ca0
Typing for of RestHelper.change_membership
anoadragon453 Jul 29, 2020
84085c9
Re-run the _populate_stats_process_rooms bg job
anoadragon453 Jul 30, 2020
716d8f6
Update tests to use the new room stats bg update
anoadragon453 Jul 30, 2020
079ca81
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/mem…
anoadragon453 Jul 30, 2020
dfa7a7b
Update changelog.d/7977.bugfix
anoadragon453 Aug 3, 2020
294be3d
Copy the new bg job explanation instead of hiding behind a link
anoadragon453 Aug 3, 2020
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
1 change: 1 addition & 0 deletions changelog.d/7977.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug that caused room membership counts to increase when changing per-room profile information. Introduced in Synapse v1.7.2.
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 9 additions & 0 deletions synapse/handlers/stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,15 @@ async def _handle_deltas(self, deltas):

membership = event_content.get("membership", Membership.LEAVE)

# Check whether this state event is a transition from join->join.
# This can happen e.g when a user changes their per-room display name.
is_join_to_join = (
prev_membership == Membership.JOIN and membership == Membership.JOIN
)
if is_join_to_join:
# This action does not currently affect any further stats
continue

if prev_membership is None:
logger.debug("No previous membership for this user.")
elif membership == prev_membership:
Expand Down