MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-17 01:53:52 +01:00
Code Issues Projects Releases Wiki Activity

Review comments

Browse source
This commit is contained in:
Daniel Wagner-Hall 2016-02-18 11:02:14 +00:00
parent 7e90fb6a57
commit f8d21e1431
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/handlers/_base.py
View file

@ -222,7 +222,8 @@ class BaseHandler(object):
if event_type == EventTypes.Member if event_type == EventTypes.Member
] ]
if len(room_members) == 0: if len(room_members) == 0:
# has the room been created so we can join it? # Have we just created the room, and is this about to be the very
# first member event?
create_event = current_state.get(("m.room.create", "")) create_event = current_state.get(("m.room.create", ""))
if create_event: if create_event:
return True return True

2
synapse/handlers/message.py
View file

@ -229,7 +229,7 @@ class MessageHandler(BaseHandler):
if event.type == EventTypes.Member: if event.type == EventTypes.Member:
raise SynapseError( raise SynapseError(
500, 500,
"Tried to send member even through non-member codepath" "Tried to send member event through non-member codepath"
) )
user = UserID.from_string(event.sender) user = UserID.from_string(event.sender)

9
synapse/handlers/room.py
View file

@ -490,11 +490,10 @@ class RoomMemberHandler(BaseHandler):
sender = UserID.from_string(event.sender) sender = UserID.from_string(event.sender)
assert self.hs.is_mine(sender), "Sender must be our own: %s" % (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
message_handler = self.hs.get_handlers().message_handler prev_event = message_handler.deduplicate_state_event(event, context)
prev_event = message_handler.deduplicate_state_event(event, context) if prev_event is not None:
if prev_event is not None: return
return
action = "send" action = "send"