summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-19 12:31:46 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-19 12:31:46 +0000
commit1e7f83b91dfdc68a9233dca5870d2511ec891bf0 (patch)
tree01c9071868ce03fdb99a52421cef796f028eb867
parentRemove unneeded federation keys from events (diff)
downloadsynapse-1e7f83b91dfdc68a9233dca5870d2511ec891bf0.tar.xz
Set display name when joining via alias
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 4b8385c955..9644cd3d34 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -390,6 +390,11 @@ class RoomMemberHandler(BaseHandler):
 
         host = hosts[0]
 
+        # If event doesn't include a display name, add one.
+        yield self.distributor.fire(
+            "collect_presencelike_data", joinee, content
+        )
+
         content.update({"membership": Membership.JOIN})
         builder = self.event_builder_factory.new({
             "type": EventTypes.Member,