summaryrefslogtreecommitdiffstats
path: root/apps/federatedfilesharing/lib/ocm
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-11-18 15:00:33 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-11-18 15:00:33 +0100
commit17fae47bdba84ed520fee2cbf1a9485cc14fbbcb (patch)
treeddbeccd9d9a2800877b5679e58872915f358076d /apps/federatedfilesharing/lib/ocm
parentbb77c1447b7e2b1e16c85bc4ee313a48db109cce (diff)
downloadnextcloud-server-17fae47bdba84ed520fee2cbf1a9485cc14fbbcb.tar.gz
nextcloud-server-17fae47bdba84ed520fee2cbf1a9485cc14fbbcb.zip
Use the displayname for federated notifications
Since we have the showing this is a lot nicer. Especially on alrge isntances where the uid can be totally random. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/federatedfilesharing/lib/ocm')
-rw-r--r--apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php
index 1d922ce60ba..062c79ad97d 100644
--- a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php
+++ b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php
@@ -245,7 +245,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
->setAffectedUser($shareWith)
->setObject('remote_share', (int)$shareId, $name);
\OC::$server->getActivityManager()->publish($event);
- $this->notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name);
+ $this->notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner);
} else {
$groupMembers = $this->groupManager->get($shareWith)->getUsers();
foreach ($groupMembers as $user) {
@@ -256,7 +256,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
->setAffectedUser($user->getUID())
->setObject('remote_share', (int)$shareId, $name);
\OC::$server->getActivityManager()->publish($event);
- $this->notifyAboutNewShare($user->getUID(), $shareId, $ownerFederatedId, $sharedByFederatedId, $name);
+ $this->notifyAboutNewShare($user->getUID(), $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner);
}
}
return $shareId;
@@ -333,13 +333,13 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
* @param $sharedByFederatedId
* @param $name
*/
- private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name) {
+ private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner) {
$notification = $this->notificationManager->createNotification();
$notification->setApp('files_sharing')
->setUser($shareWith)
->setDateTime(new \DateTime())
->setObject('remote_share', $shareId)
- ->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]);
+ ->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/'), $sharedBy, $owner]);
$declineAction = $notification->createAction();
$declineAction->setLabel('decline')