Skip to content

Notify groupmates also when renaming and moving files (by using Group folders app) #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 1 commit into from
Closed

Notify groupmates also when renaming and moving files (by using Group folders app) #500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
update FilesHooks class 
Signed-off-by: Chris Fritsche <[email protected]>

adjusts from PR review

adjust notifications by moving
  • Loading branch information
Chris Fritsche committed Sep 23, 2020
commit 605615dc7fe3a5253bc5b0cc7d37d4e21781a9a1
40 changes: 26 additions & 14 deletions lib/FilesHooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -354,6 +343,7 @@ public function fileMove($oldPath, $newPath) {
return;
}
$this->oldAccessList = $this->getUserPathsFromPath($this->oldParentPath, $this->oldParentOwner);
$this->oldAccessList['users'] = $this->getAffectedUsers($this->oldAccessList['users'], $this->oldParentId);
}


Expand Down Expand Up @@ -413,7 +403,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) {
Expand Down Expand Up @@ -461,7 +451,7 @@ protected function fileMoving($oldPath, $newPath) {
return;
}
$accessList = $this->getUserPathsFromPath($parentPath, $parentOwner);
$affectedUsers = $accessList['users'];
$affectedUsers = $this->getAffectedUsers($accessList['users'], $fileId);
$oldUsers = $this->oldAccessList['users'];

$beforeUsers = array_keys($oldUsers);
Expand Down Expand Up @@ -1193,4 +1183,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;
}
}