adjustments after rebase

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Nov 29, 2024 · b30830e · b30830e
1 parent 9d01694
commit b30830e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 56 deletions.
diff --git a/lib/Reference/ProfilePickerReferenceProvider.php b/lib/Reference/ProfilePickerReferenceProvider.php
@@ -40,24 +40,14 @@
 
 class ProfilePickerReferenceProvider extends ADiscoverableReferenceProvider {
 	public const RICH_OBJECT_TYPE = 'users_picker_profile';
-	private ?string $userId;
-	private IL10N $l10n;
-	private IURLGenerator $urlGenerator;
-	private IUserManager $userManager;
-	private IAccountManager $accountManager;
 
 	public function __construct(
-		IL10N $l10n,
-		IURLGenerator $urlGenerator,
-		IUserManager $userManager,
-		IAccountManager $accountManager,
-		?string $userId
+		private IL10N $l10n,
+		private IURLGenerator $urlGenerator,
+		private IUserManager $userManager,
+		private IAccountManager $accountManager,
+		private ?string $userId
 	) {
-		$this->userId = $userId;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
 	}
 
 	/**
@@ -105,47 +95,48 @@ public function resolveReference(string $referenceText): ?IReference {
 
 		$userId = $this->getObjectId($referenceText);
 		$user = $this->userManager->get($userId);
-		if ($user !== null) {
-			$reference = new Reference($referenceText);
-
-			$userDisplayName = $user->getDisplayName();
-			$userEmail = $user->getEMailAddress();
-			$userAvatarUrl = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $userId, 'size' => '64']);
-
-			$bio = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_BIOGRAPHY);
-			$bio = $bio->getScope() !== IAccountManager::SCOPE_PRIVATE ? $bio->getValue() : null;
-			$headline = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_HEADLINE);
-			$location = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_ADDRESS);
-			$website = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_WEBSITE);
-			$organisation = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_ORGANISATION);
-			$role = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_ROLE);
-
-			// for clients who can't render the reference widgets
-			$reference->setTitle($userDisplayName);
-			$reference->setDescription($userEmail ?? $userDisplayName);
-			$reference->setImageUrl($userAvatarUrl);
-
-			// for the Vue reference widget
-			$reference->setRichObject(
-				self::RICH_OBJECT_TYPE,
-				[
-					'user_id' => $userId,
-					'title' => $userDisplayName,
-					'subline' => $userEmail ?? $userDisplayName,
-					'email' => $userEmail,
-					'bio' => isset($bio) && $bio !== '' ? substr_replace($bio, '...', 80, strlen($bio)) : null,
-					'headline' => $headline->getScope() !== IAccountManager::SCOPE_PRIVATE ? $headline->getValue() : null,
-					'location' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $location->getValue() : null,
-					'location_url' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $this->getOpenStreetLocationUrl($location->getValue()) : null,
-					'website' => $website->getScope() !== IAccountManager::SCOPE_PRIVATE ? $website->getValue() : null,
-					'organisation' => $organisation->getScope() !== IAccountManager::SCOPE_PRIVATE ? $organisation->getValue() : null,
-					'role' => $role->getScope() !== IAccountManager::SCOPE_PRIVATE ? $role->getValue() : null,
-					'url' => $referenceText,
-				]
-			);
-			return $reference;
+		if ($user === null) {
+			return null;
 		}
-		return null;
+
+		$reference = new Reference($referenceText);
+
+		$userDisplayName = $user->getDisplayName();
+		$userEmail = $user->getEMailAddress();
+		$userAvatarUrl = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $userId, 'size' => '64']);
+
+		$bio = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_BIOGRAPHY);
+		$bio = $bio->getScope() !== IAccountManager::SCOPE_PRIVATE ? $bio->getValue() : null;
+		$headline = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_HEADLINE);
+		$location = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_ADDRESS);
+		$website = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_WEBSITE);
+		$organisation = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_ORGANISATION);
+		$role = $this->accountManager->getAccount($user)->getProperty(IAccountManager::PROPERTY_ROLE);
+
+		// for clients who can't render the reference widgets
+		$reference->setTitle($userDisplayName);
+		$reference->setDescription($userEmail ?? $userDisplayName);
+		$reference->setImageUrl($userAvatarUrl);
+
+		// for the Vue reference widget
+		$reference->setRichObject(
+			self::RICH_OBJECT_TYPE,
+			[
+				'user_id' => $userId,
+				'title' => $userDisplayName,
+				'subline' => $userEmail ?? $userDisplayName,
+				'email' => $userEmail,
+				'bio' => isset($bio) && $bio !== '' ? substr_replace($bio, '...', 80, strlen($bio)) : null,
+				'headline' => $headline->getScope() !== IAccountManager::SCOPE_PRIVATE ? $headline->getValue() : null,
+				'location' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $location->getValue() : null,
+				'location_url' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $this->getOpenStreetLocationUrl($location->getValue()) : null,
+				'website' => $website->getScope() !== IAccountManager::SCOPE_PRIVATE ? $website->getValue() : null,
+				'organisation' => $organisation->getScope() !== IAccountManager::SCOPE_PRIVATE ? $organisation->getValue() : null,
+				'role' => $role->getScope() !== IAccountManager::SCOPE_PRIVATE ? $role->getValue() : null,
+				'url' => $referenceText,
+			]
+		);
+		return $reference;
 	}
 
 	public function getObjectId(string $url): ?string {

diff --git a/src/reference.js b/src/reference.js
@@ -12,7 +12,7 @@ registerWidget('users_picker_profile', async (el, { richObjectType, richObject,
 			accessible,
 		},
 	}).$mount(el)
-})
+}, () => {}, { hasInteractiveView: false })
 
 registerCustomPickerElement('profile_picker', async (el, { providerId, accessible }) => {
 	const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')