tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name

Browse source 
Don't include name of room for invites in push
This commit is contained in:
Erik Johnston 2016-07-28 10:36:41 +01:00 committed by GitHub
commit b557b682d9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/util/presentable_names.py
View file

@ -83,7 +83,10 @@ def calculate_room_name(room_state, user_id, fallback_to_members=True,
): ):
if ("m.room.member", my_member_event.sender) in room_state: if ("m.room.member", my_member_event.sender) in room_state:
inviter_member_event = room_state[("m.room.member", my_member_event.sender)] inviter_member_event = room_state[("m.room.member", my_member_event.sender)]
if fallback_to_single_member:
return "Invite from %s" % (name_from_member_event(inviter_member_event),) return "Invite from %s" % (name_from_member_event(inviter_member_event),)
else:
return None
else: else:
return "Room Invite" return "Room Invite"