diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2023-06-28 09:27:55 -0100 |
|---|---|---|
| committer | Maxence Lange <maxence@artificial-owl.com> | 2023-06-28 09:28:03 -0100 |
| commit | d2efd0e03cb0f30b748b86c324fc574e603334aa (patch) | |
| tree | 573612743cd7e60ad8f14b1426ef7735cdae7617 /apps/files_sharing/lib/Activity | |
| parent | 266436b76788d14e061bbe1f013bc052edc8041f (diff) | |
| download | nextcloud-server-d2efd0e03cb0f30b748b86c324fc574e603334aa.tar.gz nextcloud-server-d2efd0e03cb0f30b748b86c324fc574e603334aa.zip | |
displayname on federated shares
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Diffstat (limited to 'apps/files_sharing/lib/Activity')
| -rw-r--r-- | apps/files_sharing/lib/Activity/Providers/Base.php | 8 | ||||
| -rw-r--r-- | apps/files_sharing/lib/Activity/Providers/RemoteShares.php | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/files_sharing/lib/Activity/Providers/Base.php b/apps/files_sharing/lib/Activity/Providers/Base.php index 4a2c6ac919e..e9e1d870f9a 100644 --- a/apps/files_sharing/lib/Activity/Providers/Base.php +++ b/apps/files_sharing/lib/Activity/Providers/Base.php @@ -157,9 +157,11 @@ abstract class Base implements IProvider { /** * @param string $uid + * @param string $overwriteDisplayName - overwrite display name, only if user is not local + * * @return array */ - protected function getUser($uid) { + protected function getUser(string $uid, string $overwriteDisplayName = '') { // First try local user $displayName = $this->userManager->getDisplayName($uid); if ($displayName !== null) { @@ -176,7 +178,7 @@ abstract class Base implements IProvider { return [ 'type' => 'user', 'id' => $cloudId->getUser(), - 'name' => $this->getDisplayNameFromAddressBook($cloudId->getDisplayId()), + 'name' => (($overwriteDisplayName !== '') ? $overwriteDisplayName : $this->getDisplayNameFromAddressBook($cloudId->getDisplayId())), 'server' => $cloudId->getRemote(), ]; } @@ -185,7 +187,7 @@ abstract class Base implements IProvider { return [ 'type' => 'user', 'id' => $uid, - 'name' => $uid, + 'name' => (($overwriteDisplayName !== '') ? $overwriteDisplayName : $uid), ]; } diff --git a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php index f1cc90f5e65..e24645f8a26 100644 --- a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php +++ b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php @@ -115,13 +115,14 @@ class RemoteShares extends Base { switch ($subject) { case self::SUBJECT_REMOTE_SHARE_RECEIVED: case self::SUBJECT_REMOTE_SHARE_UNSHARED: + $displayName = (count($parameters) > 2) ? $parameters[2] : ''; return [ 'file' => [ 'type' => 'pending-federated-share', 'id' => $parameters[1], 'name' => $parameters[1], ], - 'user' => $this->getUser($parameters[0]), + 'user' => $this->getUser($parameters[0], $displayName) ]; case self::SUBJECT_REMOTE_SHARE_ACCEPTED: case self::SUBJECT_REMOTE_SHARE_DECLINED: |