Skip to content

Commit 858b058

Browse files
committed
fix: remove validate-user-shares-once optimization
Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent d42fe8d commit 858b058

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

apps/files_sharing/lib/AppInfo/Application.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
use OCP\Files\Events\BeforeDirectFileDownloadEvent;
4949
use OCP\Files\Events\BeforeZipCreatedEvent;
5050
use OCP\Files\Events\Node\BeforeNodeReadEvent;
51-
use OCP\Files\Events\Node\FilesystemTornDownEvent;
5251
use OCP\Group\Events\GroupChangedEvent;
5352
use OCP\Group\Events\GroupDeletedEvent;
5453
use OCP\Group\Events\UserAddedEvent;
@@ -122,7 +121,6 @@ function () use ($c) {
122121
$context->registerEventListener(UserAddedEvent::class, SharesUpdatedListener::class);
123122
$context->registerEventListener(UserRemovedEvent::class, SharesUpdatedListener::class);
124123
$context->registerEventListener(UserShareAccessUpdatedEvent::class, SharesUpdatedListener::class);
125-
$context->registerEventListener(FilesystemTornDownEvent::class, SharesUpdatedListener::class);
126124

127125
$context->registerConfigLexicon(ConfigLexicon::class);
128126
}

apps/files_sharing/lib/Listener/SharesUpdatedListener.php

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
use OCA\Files_Sharing\Event\UserShareAccessUpdatedEvent;
1212
use OCA\Files_Sharing\MountProvider;
1313
use OCA\Files_Sharing\ShareTargetValidator;
14-
use OCP\Cache\CappedMemoryCache;
1514
use OCP\EventDispatcher\Event;
1615
use OCP\EventDispatcher\IEventListener;
1716
use OCP\Files\Config\ICachedMountInfo;
1817
use OCP\Files\Config\IUserMountCache;
19-
use OCP\Files\Events\Node\FilesystemTornDownEvent;
2018
use OCP\Group\Events\UserAddedEvent;
2119
use OCP\Group\Events\UserRemovedEvent;
2220
use OCP\IUser;
@@ -28,23 +26,17 @@
2826
/**
2927
* Listen to various events that can change what shares a user has access to
3028
*
31-
* @template-implements IEventListener<UserAddedEvent|UserRemovedEvent|ShareCreatedEvent|ShareTransferredEvent|BeforeShareDeletedEvent|UserShareAccessUpdatedEvent|FilesystemTornDownEvent>
29+
* @template-implements IEventListener<UserAddedEvent|UserRemovedEvent|ShareCreatedEvent|ShareTransferredEvent|BeforeShareDeletedEvent|UserShareAccessUpdatedEvent>
3230
*/
3331
class SharesUpdatedListener implements IEventListener {
34-
private CappedMemoryCache $updatedUsers;
35-
3632
public function __construct(
3733
private readonly IManager $shareManager,
3834
private readonly IUserMountCache $userMountCache,
3935
private readonly MountProvider $shareMountProvider,
4036
private readonly ShareTargetValidator $shareTargetValidator,
4137
) {
42-
$this->updatedUsers = new CappedMemoryCache();
4338
}
4439
public function handle(Event $event): void {
45-
if ($event instanceof FilesystemTornDownEvent) {
46-
$this->updatedUsers = new CappedMemoryCache();
47-
}
4840
if ($event instanceof UserShareAccessUpdatedEvent) {
4941
foreach ($event->getUsers() as $user) {
5042
$this->updateForUser($user);
@@ -65,11 +57,6 @@ public function handle(Event $event): void {
6557
}
6658

6759
private function updateForUser(IUser $user): void {
68-
if (isset($this->updatedUsers[$user->getUID()])) {
69-
return;
70-
}
71-
$this->updatedUsers[$user->getUID()] = true;
72-
7360
$cachedMounts = $this->userMountCache->getMountsForUser($user);
7461
$mountPoints = array_map(fn (ICachedMountInfo $mount) => $mount->getMountPoint(), $cachedMounts);
7562
$mountsByPath = array_combine($mountPoints, $cachedMounts);

0 commit comments

Comments
 (0)