-
Notifications
You must be signed in to change notification settings - Fork 196
Moved users_picker profile custom picker to contacts #3487
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.
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
Draft
andrey18106
wants to merge
8
commits into
nextcloud:main
Choose a base branch
from
andrey18106:profile_picker
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6deb877
Moved users_picker profile custom picker to contacts
andrey18106 df4298d
Update src/components/ProfilePicker/ProfilesCustomPicker.vue
andrey18106 cf6a674
Polish. Use try-catch-finally. Some restructure
andrey18106 462660b
Remove usage of private API. Lint fixes
andrey18106 166da70
Update src/components/ProfilePicker/ProfilePickerReferenceWidget.vue
andrey18106 4520655
Update src/components/ProfilePicker/ProfilePickerReferenceWidget.vue
andrey18106 7858742
Added some reference provider unit tests
andrey18106 74f4deb
added profile icon license
andrey18106 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2023 Andrey Borysenko <[email protected]> | ||
| * | ||
| * @author 2023 Andrey Borysenko <[email protected]> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Contacts\Listener; | ||
|
|
||
| use OCA\Contacts\AppInfo\Application; | ||
| use OCP\Collaboration\Reference\RenderReferenceEvent; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\Util; | ||
|
|
||
| class ProfilePickerReferenceListener implements IEventListener { | ||
| public function handle(Event $event): void { | ||
| if (!$event instanceof RenderReferenceEvent) { | ||
| return; | ||
| } | ||
|
|
||
| Util::addScript(Application::APP_ID, Application::APP_ID . '-reference'); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2023 Andrey Borysenko <[email protected]> | ||
| * | ||
| * @author 2023 Andrey Borysenko <[email protected]> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Contacts\Reference; | ||
|
|
||
| use OC\Collaboration\Reference\LinkReferenceProvider; | ||
| use OCP\Collaboration\Reference\ADiscoverableReferenceProvider; | ||
| use OCP\Collaboration\Reference\Reference; | ||
|
|
||
| use OCP\Collaboration\Reference\IReference; | ||
| use OCP\IL10N; | ||
| use OCP\IURLGenerator; | ||
|
|
||
| use OCA\Contacts\AppInfo\Application; | ||
| use OCP\Accounts\IAccountManager; | ||
| use OCP\IUserManager; | ||
|
|
||
| class ProfilePickerReferenceProvider extends ADiscoverableReferenceProvider { | ||
andrey18106 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // private const RICH_OBJECT_TYPE = Application::APP_ID . '_profile_picker'; | ||
andrey18106 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| private const RICH_OBJECT_TYPE = 'users_picker_profile'; | ||
|
|
||
| private ?string $userId; | ||
| private IL10N $l10n; | ||
| private IURLGenerator $urlGenerator; | ||
| private LinkReferenceProvider $linkReferenceProvider; | ||
| private IUserManager $userManager; | ||
| private IAccountManager $accountManager; | ||
|
|
||
| public function __construct( | ||
| IL10N $l10n, | ||
| IURLGenerator $urlGenerator, | ||
| LinkReferenceProvider $linkReferenceProvider, | ||
| IUserManager $userManager, | ||
| IAccountManager $accountManager, | ||
| ?string $userId | ||
| ) { | ||
| $this->userId = $userId; | ||
| $this->l10n = $l10n; | ||
| $this->urlGenerator = $urlGenerator; | ||
| $this->linkReferenceProvider = $linkReferenceProvider; | ||
| $this->userManager = $userManager; | ||
| $this->accountManager = $accountManager; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getId(): string { | ||
| return 'profile_picker'; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getTitle(): string { | ||
| return $this->l10n->t('Profile picker'); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getOrder(): int { | ||
| return 10; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getIconUrl(): string { | ||
| return $this->urlGenerator->imagePath(Application::APP_ID, 'profile-dark.svg'); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function matchReference(string $referenceText): bool { | ||
| return $this->getObjectId($referenceText) !== null; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function resolveReference(string $referenceText): ?IReference { | ||
| if ($this->matchReference($referenceText)) { | ||
ChristophWurst marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| $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; | ||
| } | ||
| return $this->linkReferenceProvider->resolveReference($referenceText); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private function getObjectId(string $url): ?string { | ||
| $baseUrl = $this->urlGenerator->getBaseUrl(); | ||
| $baseWithIndex = $baseUrl . '/index.php'; | ||
|
|
||
| preg_match('/^' . preg_quote($baseUrl, '/') . '\/u\/(\w+)$/', $url, $matches); | ||
| if (count($matches) > 1) { | ||
| return $matches[1]; | ||
| } | ||
| preg_match('/^' . preg_quote($baseWithIndex, '/') . '\/u\/(\w+)$/', $url, $matches); | ||
| if (count($matches) > 1) { | ||
| return $matches[1]; | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| private function getOpenStreetLocationUrl($location) { | ||
| return 'https://www.openstreetmap.org/search?query=' . urlencode($location); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getCachePrefix(string $referenceId): string { | ||
| return $this->userId ?? ''; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getCacheKey(string $referenceId): ?string { | ||
| $objectId = $this->getObjectId($referenceId); | ||
| if ($objectId !== null) { | ||
| return $objectId; | ||
| } | ||
| return $referenceId; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.