Merge pull request #1745 from nextcloud/fix/activity-upload-public

nextcloud · Aug 7, 2024 · 3b40547 · 3b40547
2 parents 4d8ae09 + 7d045b8
commit 3b40547
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/lib/Extension/Files_Sharing.php b/lib/Extension/Files_Sharing.php
@@ -8,4 +8,5 @@
 
 class Files_Sharing {
 	public const TYPE_SHARED = 'shared';
+	public const TYPE_PUBLIC_UPLOAD = 'public_links_upload';
 }
diff --git a/lib/FilesHooks.php b/lib/FilesHooks.php
@@ -77,7 +77,7 @@ public function fileCreate($path) {
 		if ($this->currentUser->getUserIdentifier() !== '') {
 			$this->addNotificationsForFileAction($path, Files::TYPE_SHARE_CREATED, 'created_self', 'created_by');
 		} else {
-			$this->addNotificationsForFileAction($path, Files::TYPE_SHARE_CREATED, '', 'created_public');
+			$this->addNotificationsForFileAction($path, Files_Sharing::TYPE_PUBLIC_UPLOAD, '', 'created_public');
 		}
 	}
 
@@ -108,9 +108,9 @@ public function fileRestore($path) {
 		$this->addNotificationsForFileAction($path, Files::TYPE_SHARE_RESTORED, 'restored_self', 'restored_by');
 	}
 
-	private function getFileChangeActivitySettings(int $fileId, array $users): array {
-		$filteredEmailUsers = $this->userSettings->filterUsersBySetting($users, 'email', Files::TYPE_FILE_CHANGED);
-		$filteredNotificationUsers = $this->userSettings->filterUsersBySetting($users, 'notification', Files::TYPE_FILE_CHANGED);
+	private function getFileChangeActivitySettings(int $fileId, array $users, $type = Files::TYPE_FILE_CHANGED): array {
+		$filteredEmailUsers = $this->userSettings->filterUsersBySetting($users, 'email', $type);
+		$filteredNotificationUsers = $this->userSettings->filterUsersBySetting($users, 'notification', $type);
 
 		/** @psalm-suppress UndefinedMethod */
 		$favoriteUsers = $this->tagManager->getUsersFavoritingObject('files', $fileId);
@@ -159,7 +159,7 @@ protected function addNotificationsForFileAction($filePath, $activityType, $subj
 		}
 
 		[$filteredEmailUsers, $filteredNotificationUsers] =
-			$this->getFileChangeActivitySettings($fileId, array_keys($affectedUsers));
+			$this->getFileChangeActivitySettings($fileId, array_keys($affectedUsers), $activityType);
 
 		foreach ($affectedUsers as $user => $path) {
 			$user = (string)$user;

diff --git a/tests/FilesHooksTest.php b/tests/FilesHooksTest.php
@@ -178,8 +178,8 @@ protected function getUserMock(string $uid): IUser {
 
 	public function dataFileCreate(): array {
 		return [
-			['user', 'created_self', 'created_by'],
-			['', '', 'created_public'],
+			['user', 'created_self', 'created_by', Files::TYPE_SHARE_CREATED],
+			['', '', 'created_public', Files_Sharing::TYPE_PUBLIC_UPLOAD],
 		];
 	}
 
@@ -190,14 +190,14 @@ public function dataFileCreate(): array {
 	 * @param string $selfSubject
 	 * @param string $othersSubject
 	 */
-	public function testFileCreate(string $currentUser, string $selfSubject, string $othersSubject): void {
+	public function testFileCreate(string $currentUser, string $selfSubject, string $othersSubject, string $type): void {
 		$filesHooks = $this->getFilesHooks([
 			'addNotificationsForFileAction',
 		], $currentUser);
 
 		$filesHooks->expects($this->once())
 			->method('addNotificationsForFileAction')
-			->with('path', Files::TYPE_SHARE_CREATED, $selfSubject, $othersSubject);
+			->with('path', $type, $selfSubject, $othersSubject);
 
 		$filesHooks->fileCreate('path');
 	}