display displayname on federated shares by ArtificialOwl · Pull Request #35915 · nextcloud/server

ArtificialOwl · 2022-12-29T15:30:46Z

retrieve data from lookup-server if available when displaying shares.
includes some caching

also needed:

+ try {
+ $slaveService = Server::get(\OCA\GlobalSiteSelector\Service\SlaveService::class);
+ } catch (ContainerExceptionInterface $e) {
+ \OC::$server->getLogger()->logException($e);
+ return [];
+ }


+ }
+
+ try {
+ $slaveService = Server::get(\OCA\GlobalSiteSelector\Service\SlaveService::class);


+ try {
+ $slaveService = Server::get(\OCA\GlobalSiteSelector\Service\SlaveService::class);
+ } catch (ContainerExceptionInterface $e) {
+ \OC::$server->getLogger()->logException($e);


+ try {
+ $slaveService = Server::get(\OCA\GlobalSiteSelector\Service\SlaveService::class);
+ } catch (ContainerExceptionInterface $e) {
+ \OC::$server->getLogger()->logException($e);


+ return '';
+ }
+
+ return $slaveService->getUserDisplayName($userId, false);
+	}
 }


-	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
+	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
 $notification = $this->notificationManager->createNotification();
 $notification->setApp('files_sharing')


-	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
+	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
 $notification = $this->notificationManager->createNotification();
 $notification->setApp('files_sharing')


-	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
+	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
 $notification = $this->notificationManager->createNotification();
 $notification->setApp('files_sharing')


-	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
+	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
 $notification = $this->notificationManager->createNotification();
 $notification->setApp('files_sharing')


-	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
+	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
 $notification = $this->notificationManager->createNotification();
 $notification->setApp('files_sharing')


-	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
+	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
 $notification = $this->notificationManager->createNotification();
 $notification->setApp('files_sharing')


- 'strict_search' => true,
- ]);
+ try {
+ $result = \OC::$server->getContactsManager()->search($query, [$property], [


come-nc · 2023-02-02T16:44:37Z

 	}

-	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void {
+	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {


Suggested change
privatefunction notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
privatefunction notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, string$displayName): void {
And might as well type all parameters, this is a private function.

ArtificialOwl · 2023-02-09T17:22:51Z

 	}

+
+	/**


add some comment on how this method works ...

blizzz · 2023-04-20T16:00:06Z

what's with all the psalm warnings?

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

ArtificialOwl · 2023-06-28T11:26:19Z

/backport to stable27

ArtificialOwl · 2023-06-28T11:26:24Z

/backport to stable26

backportbot-nextcloud · 2023-06-29T12:48:08Z

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27
# Create the new backport branch
git checkout -b fix/foo-stable27
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

backportbot-nextcloud · 2023-06-29T12:54:25Z

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

AndyScherzinger · 2023-06-29T12:59:47Z

@ArtificialOwl can you take care of the manual backports? 🥇

github-advanced-securityAI found potential problems Dec 29, 2022
View reviewed changes

szaimen added enhancement 2. developing Work in progress labels Dec 29, 2022

szaimen added this to the Nextcloud 26 milestone Dec 29, 2022

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch from 0fbdea9 to 4e40b11Compare January 4, 2023 09:51

github-advanced-securityAI found potential problems Jan 4, 2023
View reviewed changes

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch from 4e40b11 to 9e1914cCompare January 26, 2023 16:22

github-advanced-securityAI found potential problems Jan 26, 2023
View reviewed changes

Comment threadapps/files_sharing/lib/Controller/ShareAPIController.php Fixed

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch from 819cecf to efdc115Compare January 26, 2023 20:44

github-advanced-securityAI found potential problems Jan 26, 2023
View reviewed changes

Comment threadapps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php Fixed

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch 4 times, most recently from 3c5e09f to 6631ea2Compare January 30, 2023 18:16

github-advanced-securityAI found potential problems Jan 30, 2023
View reviewed changes

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch 3 times, most recently from bb00928 to 2532553Compare February 1, 2023 09:28

ArtificialOwl added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 1, 2023

ArtificialOwl requested review from a team, blizzz, come-nc and icewind1991 and removed request for a teamFebruary 1, 2023 12:15

blizzz mentioned this pull request Feb 1, 2023
26.0.0 beta 2 #36484
Merged

come-nc approved these changes Feb 2, 2023
View reviewed changes

ArtificialOwl commented Feb 9, 2023
View reviewed changes

skjnldsv mentioned this pull request Feb 23, 2023
26.0.0 beta 5 #36834
Merged

blizzz mentioned this pull request Mar 7, 2023
26.0.0 RC2 #37078
Merged

github-advanced-securityAI found potential problems Apr 18, 2023
View reviewed changes

Comment threadapps/dav/lib/Connector/Sabre/FilesPlugin.php Fixed

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch from c606739 to 60f9cf0Compare April 22, 2023 11:16

github-advanced-securityAI found potential problems Apr 22, 2023
View reviewed changes

Comment threadapps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php Fixed

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch 2 times, most recently from bcaef17 to 2e69ffaCompare April 23, 2023 12:24

This was referenced May 3, 2023
27.0.0 beta 1 #38038
Merged
27.0.0 beta 2 #38137
Closed
27.0.0 beta 2 #38139
Merged
feat(changelog): group PR list by author in markdown nextcloud/github_helper#79
Merged

blizzz mentioned this pull request May 17, 2023
27.0.0 RC1 #38341
Merged

blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch from 2e69ffa to b5562abCompare June 27, 2023 14:38

github-advanced-securityAI found potential problems Jun 27, 2023
View reviewed changes

Comment threadapps/files_sharing/lib/Controller/ShareAPIController.php Fixed

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch from b5562ab to 415d824Compare June 27, 2023 14:52

displayname on federated shares
d2efd0e
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

ArtificialOwl force-pushed the enh/noid/display-name-federated-shares branch from 415d824 to d2efd0eCompare June 28, 2023 10:28

backportbot-nextcloudBot added the backport-request label Jun 28, 2023

AndyScherzinger approved these changes Jun 28, 2023
View reviewed changes

blizzz merged commit 7b7148c into masterJun 29, 2023

blizzz deleted the enh/noid/display-name-federated-shares branch June 29, 2023 12:40

This was referenced Jul 10, 2023
[stable26] display displayname on federated shares #39270
Merged
[stable27] display displayname on federated shares #39269
Merged

skjnldsv removed the backport-request label Jun 28, 2025

	privatefunction notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
	privatefunction notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, string$displayName): void {

Uh oh!

Uh oh!

Conversation

ArtificialOwl commented Dec 29, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Check failure

Check failure

Check notice

Check notice

Check failure

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

come-ncFeb 2, 2023

Choose a reason for hiding this comment

Uh oh!

ArtificialOwlFeb 9, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

blizzz commented Apr 20, 2023

Uh oh!

Uh oh!

Uh oh!

ArtificialOwl commented Jun 28, 2023

Uh oh!

ArtificialOwl commented Jun 28, 2023

Uh oh!

backportbot-nextcloudBot commented Jun 29, 2023

Uh oh!

backportbot-nextcloudBot commented Jun 29, 2023

Uh oh!

AndyScherzinger commented Jun 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ArtificialOwl commented Dec 29, 2022•
edited
Loading