OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent duplicate room IDs in m.direct

pull/4412/head
Andrew Morgan 2019-01-22 12:13:46 +00:00
parent 8086a5c05e
commit c4875d8c76
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
synapse/handlers/room_member.py
View File

@ -248,16 +248,15 @@ class RoomMemberHandler(object):
# Check which key this room is under
for key, room_id_list in direct_rooms.items():
for rid in room_id_list:
if rid == old_room_id:
# Add new room_id to this key
direct_rooms[key].append(room_id)
if old_room_id in room_id_list and room_id not in room_id_list:
# Add new room_id to this key
direct_rooms[key].append(room_id)
# Save back to user's m.direct account data
yield self.store.add_account_data_for_user(
user_id, "m.direct", direct_rooms,
)
break
# Save back to user's m.direct account data
yield self.store.add_account_data_for_user(
user_id, "m.direct", direct_rooms,
)
break
# Copy room tags if applicable
if room_tags: