Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release-v0.8.0

This commit is contained in:
Erik Johnston 2015-03-06 16:25:19 +00:00
parent be9dafcd37 9ccccd4874
commit 5d43eaed61
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
synapse/handlers/profile.py
View File

@ -212,10 +212,16 @@ class ProfileHandler(BaseHandler):
) )
msg_handler = self.hs.get_handlers().message_handler msg_handler = self.hs.get_handlers().message_handler
yield msg_handler.create_and_send_event({ try:
"type": EventTypes.Member, yield msg_handler.create_and_send_event({
"room_id": j.room_id, "type": EventTypes.Member,
"state_key": user.to_string(), "room_id": j.room_id,
"content": content, "state_key": user.to_string(),
"sender": user.to_string() "content": content,
}, ratelimit=False) "sender": user.to_string()
}, ratelimit=False)
except Exception as e:
logger.warn(
"Failed to update join event for room %s - %s",
j.room_id, str(e.message)
)