Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name
Browse files Browse the repository at this point in the history
Don't include name of room for invites in push
  • Loading branch information
erikjohnston authored Jul 28, 2016
2 parents cd8738a + 389c890 commit b557b68
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion synapse/util/presentable_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
inviter_member_event = room_state[("m.room.member", my_member_event.sender)]
return "Invite from %s" % (name_from_member_event(inviter_member_event),)
if fallback_to_single_member:
return "Invite from %s" % (name_from_member_event(inviter_member_event),)
else:
return None
else:
return "Room Invite"

Expand Down

0 comments on commit b557b68

Please sign in to comment.