diff options
| author | Erik Johnston <erikj@jki.re> | 2017-03-16 13:05:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 13:05:16 +0000 |
| commit | 248eb4638d45b10e22820d5d03ab504e927a8422 (patch) | |
| tree | c66ca7b4f6ad2bdcc22d017d72bbdf1145d1147d /synapse/handlers/profile.py | |
| parent | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presence (diff) | |
| parent | Comments (diff) | |
| download | synapse-248eb4638d45b10e22820d5d03ab504e927a8422.tar.xz | |
Merge pull request #2022 from matrix-org/erikj/no_op_sync
Implement no op for room stream in sync
Diffstat (limited to 'synapse/handlers/profile.py')
| -rw-r--r-- | synapse/handlers/profile.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 87f74dfb8e..abd1fb28cb 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -156,11 +156,11 @@ class ProfileHandler(BaseHandler): self.ratelimit(requester) - joins = yield self.store.get_rooms_for_user( + room_ids = yield self.store.get_rooms_for_user( user.to_string(), ) - for j in joins: + for room_id in room_ids: handler = self.hs.get_handlers().room_member_handler try: # Assume the user isn't a guest because we don't let guests set @@ -171,12 +171,12 @@ class ProfileHandler(BaseHandler): yield handler.update_membership( requester, user, - j.room_id, + room_id, "join", # We treat a profile update like a join. ratelimit=False, # Try to hide that these events aren't atomic. ) except Exception as e: logger.warn( "Failed to update join event for room %s - %s", - j.room_id, str(e.message) + room_id, str(e.message) ) |