mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-19 01:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't decrease left_members if the user is joining for the first time.

Browse source 
Fixes #5423

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
This commit is contained in:
Olivier Wilkinson (reivilibre) 2019-07-16 13:31:25 +01:00
parent 20ae4afe7e
commit 181c1a6072
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
synapse/handlers/stats.py
View file

@ -153,21 +153,28 @@ class StatsHandler(StateDeltasHandler):
# given we're not testing for a specific result; might as well # given we're not testing for a specific result; might as well
# just grab the prev_membership and membership strings and # just grab the prev_membership and membership strings and
# compare them. # compare them.
prev_event_content = {} # We take None rather than leave as a previous membership
# in the absence of a previous event because we do not want to
# reduce the leave count when a new-to-the-room user joins.
prev_membership = None
if prev_event_id is not None: if prev_event_id is not None:
prev_event = yield self.store.get_event( prev_event = yield self.store.get_event(
prev_event_id, allow_none=True prev_event_id, allow_none=True
) )
if prev_event: if prev_event:
prev_event_content = prev_event.content prev_event_content = prev_event.content
prev_membership = prev_event_content.get(
"membership", Membership.LEAVE
)
membership = event_content.get("membership", Membership.LEAVE) membership = event_content.get("membership", Membership.LEAVE)
prev_membership = prev_event_content.get("membership", Membership.LEAVE)
if prev_membership == membership: if prev_membership == membership:
continue continue
if prev_membership == Membership.JOIN: if prev_membership is None:
logger.debug("No previous membership for this user.")
elif prev_membership == Membership.JOIN:
yield self.store.update_stats_delta( yield self.store.update_stats_delta(
now, "room", room_id, "joined_members", -1 now, "room", room_id, "joined_members", -1
) )