summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 16:01:29 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 16:01:29 +0100
commit32347bfcc99b13454264bce3e4afe469a8f33026 (patch)
tree4a48eda1c8526052f1d0000a3518ef67b7ab4117 /synapse/handlers
parentMove the event storage into a single transaction (diff)
downloadsynapse-32347bfcc99b13454264bce3e4afe469a8f33026.tar.xz
fix a few pyflakes errors
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index 074363e80d..53ccaa0991 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -222,8 +222,7 @@ class MessageHandler(BaseHandler): if stamp_event: event.content["hsob_ts"] = int(self.clock.time_msec()) - snapshot = yield self.store.snapshot_room(event.room_id, user_id) - + snapshot = yield self.store.snapshot_room(event.room_id, event.user_id) yield self.auth.check(event, snapshot, raises=True) @@ -577,8 +576,8 @@ class RoomMemberHandler(BaseHandler): content=content, ) - snapshot = yield store.snapshot_room( - room_id, joinee, RoomMemberEvent.TYPE, event.target_user_id + snapshot = yield self.store.snapshot_room( + room_id, joinee, RoomMemberEvent.TYPE, joinee ) yield self._do_join(new_event, snapshot, room_host=host, do_auth=True)