diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-08 10:19:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 10:19:15 +0000 |
| commit | f713c01e2b6b8dd79174376dd30387fcf83151e9 (patch) | |
| tree | 0343cc53bda262d99bd3359febe52f05d15d6823 /synapse/handlers/pagination.py | |
| parent | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update (diff) | |
| parent | Move type annotation into docstring (diff) | |
| download | synapse-f713c01e2b6b8dd79174376dd30387fcf83151e9.tar.xz | |
Merge pull request #6295 from matrix-org/erikj/split_purge_history
Split purge API into events vs state and add PurgeEventsStorage
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 97f15a1c32..260a4351ca 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -127,7 +127,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: @@ -170,7 +172,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( |