Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move member event processing and changelog fix

Browse Source
This commit is contained in:
Andrew Morgan 2019-02-18 16:56:34 +00:00
parent 915421065b
commit f8b9ca53ce
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
changelog.d/4642.bugfix → changelog.d/4642.feature
View File

16
synapse/handlers/room.py
View File

@ -285,7 +285,6 @@ class RoomCreationHandler(BaseHandler):
(EventTypes.RoomAvatar, ""),
(EventTypes.Encryption, ""),
(EventTypes.ServerACL, ""),
(EventTypes.Member, None),
)
old_room_state_ids = yield self.store.get_filtered_current_state_ids(
@ -294,15 +293,9 @@ class RoomCreationHandler(BaseHandler):
# map from event_id to BaseEvent
old_room_state_events = yield self.store.get_events(old_room_state_ids.values())
member_events = []
for k, old_event_id in iteritems(old_room_state_ids):
old_event = old_room_state_events.get(old_event_id)
if old_event:
# Do membership events later
if ("membership" in old_event.content):
member_events.append(old_event)
continue
initial_state[k] = old_event.content
yield self._send_events_for_new_room(
@ -319,9 +312,14 @@ class RoomCreationHandler(BaseHandler):
)
# Transfer membership events
for old_event in member_events:
old_room_member_state_ids = yield self.store.get_filtered_current_state_ids(
old_room_id, StateFilter.from_types([(EventTypes.Member, None)]),
)
# map from event_id to BaseEvent
old_room_member_state_events = yield self.store.get_events(old_room_member_state_ids.values())
for k, old_event in iteritems(old_room_member_state_events):
# Only transfer ban events
logger.info("Event type: " + str(old_event.content))
if ("membership" in old_event.content and
old_event.content["membership"] == "ban"):
yield self.room_member_handler.update_membership(