diff options
author | Sean Molenaar <sean@seanmolenaar.eu> | 2020-11-16 20:49:38 +0100 |
---|---|---|
committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2020-12-08 13:58:12 +0100 |
commit | 4ee3fcb78113caff9f2b890cb7d1702dc936d81e (patch) | |
tree | f8fc506f997acdb8e5315c62bb068b0b6db6cd56 /lib/Service | |
parent | 8abddeab4f541883721d912f97dec07bffdfc6b8 (diff) |
Refactor User ID fetching and fix non-specific cleanup
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
Diffstat (limited to 'lib/Service')
-rw-r--r-- | lib/Service/FeedServiceV2.php | 12 | ||||
-rw-r--r-- | lib/Service/FolderServiceV2.php | 7 | ||||
-rw-r--r-- | lib/Service/UpdaterService.php | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/lib/Service/FeedServiceV2.php b/lib/Service/FeedServiceV2.php index 94878d5fe..16402d0da 100644 --- a/lib/Service/FeedServiceV2.php +++ b/lib/Service/FeedServiceV2.php @@ -328,9 +328,17 @@ class FeedServiceV2 extends Service $this->mapper->delete($feed); } - public function purgeDeleted(): void + /** + * Remove deleted entities. + * + * @param string|null $userID The user to purge + * @param int|null $minTimestamp The timestamp to purge from + * + * @return void + */ + public function purgeDeleted(?string $userID, ?int $minTimestamp): void { - $this->mapper->purgeDeleted(); + $this->mapper->purgeDeleted($userID, $minTimestamp); } public function fetchAll(): void diff --git a/lib/Service/FolderServiceV2.php b/lib/Service/FolderServiceV2.php index 95761b530..ae04c8089 100644 --- a/lib/Service/FolderServiceV2.php +++ b/lib/Service/FolderServiceV2.php @@ -152,10 +152,13 @@ class FolderServiceV2 extends Service /** * Purge all deleted folders. + * + * @param string|null $userID The user to purge + * @param int|null $minTimestamp The timestamp to purge from */ - public function purgeDeleted() + public function purgeDeleted(?string $userID, ?int $minTimestamp) { - $this->mapper->purgeDeleted(); + $this->mapper->purgeDeleted($userID, $minTimestamp); } /** diff --git a/lib/Service/UpdaterService.php b/lib/Service/UpdaterService.php index 7f1b04ddc..bc7c9f562 100644 --- a/lib/Service/UpdaterService.php +++ b/lib/Service/UpdaterService.php @@ -45,8 +45,8 @@ class UpdaterService public function beforeUpdate() { - $this->folderService->purgeDeleted(); - $this->feedService->purgeDeleted(); + $this->folderService->purgeDeleted(null, null); + $this->feedService->purgeDeleted(null, null); } |