Skip to content

Workaround/quick-fix for broken resharing issue #14082 #14084

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
mikaelh wants to merge 1 commit into from
Closed

Workaround/quick-fix for broken resharing issue #14082 #14084

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
33 changes: 21 additions & 12 deletions apps/sharebymail/lib/ShareByMailProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,34 +244,43 @@ protected function getPasswordPolicy() {
*
* @param IShare $share
* @param string $type
* @throws \OCP\Files\InvalidPathException
* @throws \OCP\Files\NotFoundException
*/
protected function createShareActivity(IShare $share, string $type = 'share') {

// Workaround for issue https://github.com/nextcloud/server/issues/14082
//
// When a new share is created, node path in share object is based on the logged in user ("shared by")
// When a share is deleted, node path in share object is based on the share owner
// Here we test to see if either path is relative to the logged in user
$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());

$userRelativePath = $userFolder->getRelativePath($share->getNode()->getPath());
if (!$userRelativePath) {
$userRelativePath = $ownerFolder->getRelativePath($share->getNode()->getPath());
}
if (!$userRelativePath) {
throw new \OCP\Files\InvalidPathException('Could not find relative path to share');
}

$this->publishActivity(
$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_SELF : Activity::SUBJECT_UNSHARED_EMAIL_SELF,
[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
[$userRelativePath, $share->getSharedWith()],
$share->getSharedBy(),
$share->getNode()->getId(),
$userFolder->getRelativePath($share->getNode()->getPath())
$userRelativePath
);

if ($share->getShareOwner() !== $share->getSharedBy()) {
$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
$fileId = $share->getNode()->getId();
$nodes = $ownerFolder->getById($fileId);
$ownerPath = $nodes[0]->getPath();
$this->publishActivity(
$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
Activity::SUBJECT_SHARED_EMAIL_BY,
[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
[$userRelativePath, $share->getSharedWith(), $share->getSharedBy()],
$share->getShareOwner(),
$fileId,
$ownerFolder->getRelativePath($ownerPath)
$share->getNode()->getId(),
$userRelativePath
);
}

}

/**
Expand Down