Merge pull request #82 from nextcloud/enh/rename-listener

enh: add node rename listener

lib/AppInfo/Application.php

@@ -21,6 +21,7 @@
 use OCP\Files\Cache\CacheEntryInsertedEvent;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
+use OCP\Files\Events\Node\NodeRenamedEvent;
 use OCP\Files\Events\Node\NodeWrittenEvent;
 use OCP\Files\Events\NodeRemovedFromCache;
 use OCP\IConfig;
@@ -72,6 +73,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforeNodeDeletedEvent::class, FileListener::class);
 		$context->registerEventListener(NodeCreatedEvent::class, FileListener::class);
 		$context->registerEventListener(CacheEntryInsertedEvent::class, FileListener::class);
+		$context->registerEventListener(NodeRenamedEvent::class, FileListener::class);
 		$context->registerEventListener(NodeRemovedFromCache::class, FileListener::class);
 		$context->registerEventListener(NodeWrittenEvent::class, FileListener::class);
 		$context->registerEventListener(AppDisableEvent::class, AppDisableListener::class);

lib/Listener/FileListener.php

@@ -15,12 +15,14 @@
 use OCA\ContextChat\Service\ActionService;
 use OCA\ContextChat\Service\ProviderConfigService;
 use OCA\ContextChat\Service\QueueService;
+use OCA\ContextChat\Service\StorageService;
 use OCP\DB\Exception;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Cache\CacheEntryInsertedEvent;
 use OCP\Files\Events\Node\BeforeNodeDeletedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
+use OCP\Files\Events\Node\NodeRenamedEvent;
 use OCP\Files\Events\Node\NodeWrittenEvent;
 use OCP\Files\Events\NodeRemovedFromCache;
 use OCP\Files\File;
@@ -30,6 +32,7 @@
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
+use OCP\Share\IManager;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -42,6 +45,8 @@ public function __construct(
 		private QueueService $queue,
 		private IRootFolder $rootFolder,
 		private ActionService $actionService,
+		private StorageService $storageService,
+		private IManager $shareManager,
 	) {
 	}
 
@@ -76,6 +81,33 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		if ($event instanceof NodeRenamedEvent) {
+			$targetNode = $event->getTarget();
+
+			if ($targetNode instanceof Folder) {
+				$files = $this->storageService->getAllFilesInFolder($targetNode);
+			} else {
+				$files = [$targetNode];
+			}
+
+			foreach ($files as $file) {
+				if (!$file instanceof File) {
+					continue;
+				}
+				$shareAccessList = $this->shareManager->getAccessList($file, true, true);
+				/**
+				 * @var string[] $shareUserIds
+				 */
+				$shareUserIds = array_keys($shareAccessList['users']);
+				$fileUserIds = $this->storageService->getUsersForFileId($file->getId());
+
+				$userIds = array_unique(array_merge($shareUserIds, $fileUserIds));
+				$fileRef = ProviderConfigService::getSourceId($file->getId());
+				$this->actionService->updateAccessDeclSource($userIds, $fileRef);
+			}
+			return;
+		}
+
 		if ($event instanceof NodeRemovedFromCache) {
 			$cacheEntry = $event->getStorage()->getCache()->get($event->getPath());
 			if ($cacheEntry === false) {

lib/Listener/ShareListener.php

@@ -64,13 +64,8 @@ public function handle(Event $event): void {
 			}
 
 			if ($node->getType() === FileInfo::TYPE_FOLDER) {
-				$mount = $node->getMountPoint();
-				if ($mount->getNumericStorageId() === null) {
-					return;
-				}
-				$files = $this->storageService->getFilesInMount($mount->getNumericStorageId(), $node->getId(), 0, 0);
-				foreach ($files as $fileId) {
-					$file = current($this->rootFolder->getById($fileId));
+				$files = $this->storageService->getAllFilesInFolder($node);
+				foreach ($files as $file) {
 					if (!$file instanceof File) {
 						continue;
 					}
@@ -133,21 +128,7 @@ public function handle(Event $event): void {
 			$userIds = array_unique(array_merge($realFileUserIds, $shareUserIds));
 
 			if ($node instanceof Folder) {
-				$mount = $node->getMountPoint();
-				if ($mount->getNumericStorageId() === null) {
-					return;
-				}
-				$files = $this->storageService->getFilesInMount($mount->getNumericStorageId(), $node->getId(), 0, 0);
-				$files = [];
-
-				foreach ($files as $fileId) {
-					$node = current($this->rootFolder->getById($fileId));
-					if (!$node instanceof File) {
-						continue;
-					}
-					$files[] = $node;
-				}
-
+				$files = $this->storageService->getAllFilesInFolder($node);
 				foreach ($files as $file) {
 					$this->actionService->updateAccessDeclSource(
 						$userIds,

lib/Service/StorageService.php

@@ -17,7 +17,11 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\Config\ICachedMountInfo;
 use OCP\Files\Config\IUserMountCache;
+use OCP\Files\File;
+use OCP\Files\Folder;
 use OCP\Files\IMimeTypeLoader;
+use OCP\Files\IRootFolder;
+use OCP\Files\Node;
 use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
@@ -42,6 +46,7 @@ public function __construct(
 		private IMimeTypeLoader $mimeTypes,
 		private IUserMountCache $userMountCache,
 		private IFilesMetadataManager $metadataManager,
+		private IRootFolder $rootFolder,
 	) {
 	}
 
@@ -162,6 +167,32 @@ public function getUsersForFileId(int $fileId): array {
 		}, $mountInfos);
 	}
 
+	/**
+	 * @param Node $node
+	 * @return array<File>
+	 */
+	public function getAllFilesInFolder(Node $node): array {
+		if (!$node instanceof Folder) {
+			return [];
+		}
+		$mount = $node->getMountPoint();
+		if ($mount->getNumericStorageId() === null) {
+			return [];
+		}
+		$filesGen = $this->getFilesInMount($mount->getNumericStorageId(), $node->getId(), 0, 0);
+		$files = [];
+
+		foreach ($filesGen as $fileId) {
+			$node = current($this->rootFolder->getById($fileId));
+			if (!$node instanceof File) {
+				continue;
+			}
+			$files[] = $node;
+		}
+
+		return $files;
+	}
+
 	private function getCacheQueryBuilder(): CacheQueryBuilder {
 		return new CacheQueryBuilder($this->db->getQueryBuilder(), $this->metadataManager);
 	}