Make sure we have a valid fileID for albums content and fix trashbin listener event

lib/AppInfo/Application.php

@@ -26,12 +26,12 @@
 namespace OCA\Photos\AppInfo;
 
 use OCA\DAV\Connector\Sabre\Principal;
+use OCA\Photos\Listener\CacheEntryRemovedListener;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\Files\Events\Node\NodeDeletedEvent;
-use OCA\Photos\Event\MoveToTrashListener;
+use OCP\Files\Cache\CacheEntryRemovedEvent;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'photos';
@@ -63,7 +63,7 @@ public function __construct() {
 	public function register(IRegistrationContext $context): void {
 		/** Register $principalBackend for the DAV collection */
 		$context->registerServiceAlias('principalBackend', Principal::class);
-		$context->registerEventListener(NodeDeletedEvent::class, MoveToTrashListener::class);
+		$context->registerEventListener(CacheEntryRemovedEvent::class, CacheEntryRemovedListener::class);
 	}
 
 	public function boot(IBootContext $context): void {

lib/Event/MoveToTrashListener.php → lib/Listener/CacheEntryRemovedListener.php

@@ -1,28 +1,28 @@
 <?php
 
-namespace OCA\Photos\Event;
+namespace OCA\Photos\Listener;
 
+use OCA\Photos\Album\AlbumMapper;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\Files\Events\Node\NodeDeletedEvent;
-use OCA\Photos\Album\AlbumMapper;
+use OCP\Files\Cache\CacheEntryRemovedEvent;
 
-class MoveToTrashListener implements IEventListener {
+class CacheEntryRemovedListener implements IEventListener {
 	private AlbumMapper $albumMapper;
 
 	public function __construct(AlbumMapper $albumMapper) {
 		$this->albumMapper = $albumMapper;
 	}
 
 	public function handle(Event $event): void {
-		if (!($event instanceof NodeDeletedEvent)) {
+		if (!($event instanceof CacheEntryRemovedEvent)) {
 			return;
 		}
 
 		// Remove node from all albums containing it.
-		$albums = $this->albumMapper->getForFile($event->getNode()->getId());
+		$albums = $this->albumMapper->getForFile($event->getFileId());
 		foreach ($albums as $album) {
-			$this->albumMapper->removeFile($album->getId(), $event->getNode()->getId());
+			$this->albumMapper->removeFile($album->getId(), $event->getFileId());
 		}
 	}
 }

src/views/AlbumContent.vue

@@ -337,12 +337,13 @@ export default {
 					}
 				)
 
+				// Gen files info and filtering invalid files
 				const fetchedFiles = response.data
 					.map(file => genFileInfo(file))
+					.filter(file => file.fileid)
 
 				const fileIds = fetchedFiles
-					.map(file => file.fileid)
-					.map((fileId) => fileId.toString())
+					.map(file => file.fileid.toString())
 
 				this.appendFiles(fetchedFiles)