Skip to content

Use the last known user instead of erroring #22

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

Merged
nickvergessen merged 1 commit into from
Aug 17, 2016
Merged

Use the last known user instead of erroring #22

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
19 changes: 17 additions & 2 deletions lib/FilesHooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ protected function addNotificationsForFileAction($filePath, $activityType, $subj
}

list($filePath, $uidOwner, $fileId) = $this->getSourcePathAndOwner($filePath);
if ($fileId === 0) {
// Could not find the file for the owner ...
return;
}

$affectedUsers = $this->getUserPathsFromPath($filePath, $uidOwner);
$filteredStreamUsers = $this->userSettings->filterUsersBySetting(array_keys($affectedUsers), 'stream', $activityType);
$filteredEmailUsers = $this->userSettings->filterUsersBySetting(array_keys($affectedUsers), 'email', $activityType);
Expand Down Expand Up @@ -194,12 +199,22 @@ protected function getUserPathsFromPath($path, $uidOwner) {
* @return array
*/
protected function getSourcePathAndOwner($path) {
$uidOwner = Filesystem::getOwner($path);
$view = Filesystem::getView();
$uidOwner = $view->getOwner($path);
$fileId = 0;

if ($uidOwner !== $this->currentUser) {
Filesystem::initMountPoints($uidOwner);
/** @var \OCP\Files\Storage\IStorage $storage */
list($storage,) = $view->resolvePath($path);
if (!$storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
Filesystem::initMountPoints($uidOwner);
} else {
// Probably a remote user, let's try to at least generate activities
// for the current user
$uidOwner = $this->currentUser;
}
}

$info = Filesystem::getFileInfo($path);
if ($info !== false) {
$ownerView = new View('/' . $uidOwner . '/files');
Expand Down