Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 18:34:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into babolivier/message_retention

Browse source
This commit is contained in:
Brendan Abolivier 2019-11-26 17:53:57 +00:00
commit 9e937c28ee
138 changed files with 2594 additions and 1268 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/handlers/pagination.py
View file

@ -233,7 +233,9 @@ class PaginationHandler(object):
self._purges_in_progress_by_room.add(room_id)
try:
with (yield self.pagination_lock.write(room_id)):
yield self.store.purge_history(room_id, token, delete_local_events)
yield self.storage.purge_events.purge_history(
room_id, token, delete_local_events
)
logger.info("[purge] complete")
self._purges_by_id[purge_id].status = PurgeStatus.STATUS_COMPLETE
except Exception:
@ -276,7 +278,7 @@ class PaginationHandler(object):
if joined:
raise SynapseError(400, "Users are still joined to this room")
await self.store.purge_room(room_id)
await self.storage.purge_events.purge_room(room_id)
@defer.inlineCallbacks
def get_messages(