From ff339ab3c690971fb9680fba192ca25781be0411 Mon Sep 17 00:00:00 2001
From: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Date: Wed, 23 Sep 2026 15:40:39 +0200
Subject: [PATCH] fix(files): keep deleting live photo peers after a missing
 one

handleCacheEntriesRemovedEvent() returned from the loop as soon as one
peer could not be found, so every remaining peer in the same batch was
left behind. This happens whenever both halves of a live photo are in
the removed tree, since the first half is already gone when its peer id
is looked up.

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
---
 .../lib/Listener/SyncLivePhotosListener.php   |  2 +-
 .../Listener/SyncLivePhotosListenerTest.php   | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 apps/files/tests/Listener/SyncLivePhotosListenerTest.php

diff --git a/apps/files/lib/Listener/SyncLivePhotosListener.php b/apps/files/lib/Listener/SyncLivePhotosListener.php
index a3213310b486f..423924a50ad22 100644
--- a/apps/files/lib/Listener/SyncLivePhotosListener.php
+++ b/apps/files/lib/Listener/SyncLivePhotosListener.php
@@ -102,7 +102,7 @@ public function handleCacheEntriesRemovedEvent(CacheEntriesRemovedEvent $cacheEn
 			$peerFile = $this->userFolder->getFirstNodeById($peerFileId);
 
 			if ($peerFile === null) {
-				return; // Peer file not found.
+				continue; // Peer file not found.
 			}
 			$peerFile->delete();
 		}
diff --git a/apps/files/tests/Listener/SyncLivePhotosListenerTest.php b/apps/files/tests/Listener/SyncLivePhotosListenerTest.php
new file mode 100644
index 0000000000000..b57ec6cd9a512
--- /dev/null
+++ b/apps/files/tests/Listener/SyncLivePhotosListenerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Files\Tests\Listener;
+
+use OC\Files\View;
+use OCA\Files\Listener\SyncLivePhotosListener;
+use OCA\Files\Service\LivePhotosService;
+use OCP\Files\Cache\CacheEntriesRemovedEvent;
+use OCP\Files\Cache\ICacheEvent;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\IRootFolder;
+use OCP\FilesMetadata\IFilesMetadataManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+final class SyncLivePhotosListenerTest extends TestCase {
+	private Folder&MockObject $userFolder;
+	private LivePhotosService&MockObject $livePhotosService;
+	private SyncLivePhotosListener $listener;
+
+	#[\Override]
+	protected function setUp(): void {
+		parent::setUp();
+
+		$this->userFolder = $this->createMock(Folder::class);
+		$this->livePhotosService = $this->createMock(LivePhotosService::class);
+
+		$this->listener = new SyncLivePhotosListener(
+			$this->userFolder,
+			$this->createMock(IFilesMetadataManager::class),
+			$this->livePhotosService,
+			$this->createMock(IRootFolder::class),
+			$this->createMock(View::class),
+		);
+	}
+
+	public function testCacheEntriesRemovedDeletesPeersAfterMissingOne(): void {
+		$entries = array_map(function (int $fileId): ICacheEvent {
+			$entry = $this->createMock(ICacheEvent::class);
+			$entry->method('getFileId')->willReturn($fileId);
+			return $entry;
+		}, [1, 2]);
+
+		$this->livePhotosService->method('getLivePhotoPeerIds')
+			->with([1, 2])
+			->willReturn([11, 12]);
+
+		$peer = $this->createMock(File::class);
+		$peer->expects($this->once())->method('delete');
+
+		$this->userFolder->method('getFirstNodeById')
+			->willReturnMap([
+				[11, null],
+				[12, $peer],
+			]);
+
+		$this->listener->handle(new CacheEntriesRemovedEvent($entries));
+	}
+}