update FilesHooks class

Signed-off-by: Chris Fritsche <chris.fritsche@cunio.de>
nextcloud · Sep 23, 2020 · 843f830 · 843f830
1 parent 1334dc5
commit 843f830
Showing 1 changed file with 26 additions and 15 deletions.
diff --git a/lib/FilesHooks.php b/lib/FilesHooks.php
@@ -226,18 +226,7 @@ protected function addNotificationsForFileAction($filePath, $activityType, $subj
 
  $this->generateRemoteActivity($accessList['remotes'], $activityType, time(), $this->currentUser->getCloudId(), $accessList['ownerPath']);
 
- if ($this->config->getSystemValueBool('activity_use_cached_mountpoints', false)) {
- $mountsForFile = $this->userMountCache->getMountsForFileId($fileId);
- $affectedUserIds = array_map(function (ICachedMountInfo $mount) {
- return $mount->getUser()->getUID();
- }, $mountsForFile);
- $affectedPaths = array_map(function (ICachedMountFileInfo $mount) {
- return $this->getVisiblePath($mount->getPath());
- }, $mountsForFile);
- $affectedUsers = array_combine($affectedUserIds, $affectedPaths);
- } else {
- $affectedUsers = $accessList['users'];
- }
+ $affectedUsers = $this->getAffectedUsers($accessList['users'], $fileId);
 
  [$filteredEmailUsers, $filteredNotificationUsers] = $this->getFileChangeActivitySettings($fileId, array_keys($affectedUsers));
 
@@ -413,7 +402,7 @@ protected function fileRenaming($oldPath, $newPath) {
  }
  $this->generateRemoteActivity($renameRemotes, Files::TYPE_FILE_CHANGED, time(), $this->currentUser->getCloudId());
 
- $affectedUsers = $accessList['users'];
+ $affectedUsers = $this->getAffectedUsers($accessList['users'], $fileId);
  [$filteredEmailUsers, $filteredNotificationUsers] = $this->getFileChangeActivitySettings($fileId, array_keys($affectedUsers));
 
  foreach ($affectedUsers as $user => $path) {
@@ -461,8 +450,8 @@ protected function fileMoving($oldPath, $newPath) {
  return;
  }
  $accessList = $this->getUserPathsFromPath($parentPath, $parentOwner);
- $affectedUsers = $accessList['users'];
- $oldUsers = $this->oldAccessList['users'];
+ $affectedUsers = $this->getAffectedUsers($accessList['users'], $fileId);
+ $oldUsers = $this->getAffectedUsers($this->oldAccessList['users'], $fileId);
 
  $beforeUsers = array_keys($oldUsers);
  $afterUsers = array_keys($affectedUsers);
@@ -1193,4 +1182,26 @@ protected function addNotificationsForUser($user, $subject, $subjectParams, $fil
  $this->activityData->storeMail($event, $latestSend);
  }
  }
+
+ /**
+ * @param $defaultUsers
+ * @param $fileId
+ * @return array|mixed
+ */
+ protected function getAffectedUsers($defaultUsers, $fileId) {
+ if ($this->config->getSystemValueBool('activity_use_cached_mountpoints', false)) {
+ $mountsForFile = $this->userMountCache->getMountsForFileId($fileId);
+ $affectedUserIds = array_map(function (ICachedMountInfo $mount) {
+ return $mount->getUser()->getUID();
+ }, $mountsForFile);
+ $affectedPaths = array_map(function (ICachedMountFileInfo $mount) {
+ return $this->getVisiblePath($mount->getPath());
+ }, $mountsForFile);
+ $affectedUsers = array_combine($affectedUserIds, $affectedPaths);
+ } else {
+ $affectedUsers = $defaultUsers;
+ }
+
+ return $affectedUsers;
+ }
 }