summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-18 11:02:14 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2016-02-18 11:02:14 +0000
commitf8d21e1431ce08b267f7b63a0a0772beb2588f25 (patch)
treefee32bfdc6f723fd465c20e4842a19bdaca6e0af /synapse/handlers/room.py
parentMerge branch 'develop' into daniel/roomcleanupincremental (diff)
downloadsynapse-f8d21e1431ce08b267f7b63a0a0772beb2588f25.tar.xz
Review comments
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py

index cd04ac09fa..b00cac4bd4 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -490,11 +490,10 @@ class RoomMemberHandler(BaseHandler): sender = UserID.from_string(event.sender) assert self.hs.is_mine(sender), "Sender must be our own: %s" % (sender,) - if event.is_state(): - message_handler = self.hs.get_handlers().message_handler - prev_event = message_handler.deduplicate_state_event(event, context) - if prev_event is not None: - return + message_handler = self.hs.get_handlers().message_handler + prev_event = message_handler.deduplicate_state_event(event, context) + if prev_event is not None: + return action = "send"