feat: Implement sharing with circles

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

lib/AppInfo/Application.php

@@ -17,18 +17,22 @@
 use OCA\Bookmarks\Events\UpdateEvent;
 use OCA\Bookmarks\Flow\CreateBookmark;
 use OCA\Bookmarks\Hooks\BeforeTemplateRenderedListener;
-use OCA\Bookmarks\Hooks\UserGroupListener;
+use OCA\Bookmarks\Hooks\UsersGroupsCirclesListener;
 use OCA\Bookmarks\Middleware\ExceptionMiddleware;
 use OCA\Bookmarks\Reference\BookmarkReferenceProvider;
 use OCA\Bookmarks\Search\Provider;
 use OCA\Bookmarks\Service\TreeCacheManager;
+use OCA\Circles\Events\CircleDestroyedEvent;
+use OCA\Circles\Events\CircleMemberAddedEvent;
+use OCA\Circles\Events\CircleMemberRemovedEvent;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\Events\BeforeGroupDeletedEvent;
 use OCP\Group\Events\UserAddedEvent;
 use OCP\Group\Events\UserRemovedEvent;
 use OCP\IRequest;
@@ -81,9 +85,15 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforeDeleteEvent::class, ActivityPublisher::class);
 		$context->registerEventListener(MoveEvent::class, ActivityPublisher::class);
 
-		$context->registerEventListener(BeforeUserDeletedEvent::class, UserGroupListener::class);
-		$context->registerEventListener(UserAddedEvent::class, UserGroupListener::class);
-		$context->registerEventListener(UserRemovedEvent::class, UserGroupListener::class);
+		$context->registerEventListener(BeforeUserDeletedEvent::class, UsersGroupsCirclesListener::class);
+		$context->registerEventListener(UserAddedEvent::class, UsersGroupsCirclesListener::class);
+		$context->registerEventListener(UserRemovedEvent::class, UsersGroupsCirclesListener::class);
+		$context->registerEventListener(BeforeGroupDeletedEvent::class, UsersGroupsCirclesListener::class);
+		if (class_exists('\OCA\Circles\Model\Circle')) {
+			$context->registerEventListener(CircleMemberAddedEvent::class, UsersGroupsCirclesListener::class);
+			$context->registerEventListener(CircleMemberRemovedEvent::class, UsersGroupsCirclesListener::class);
+			$context->registerEventListener(CircleDestroyedEvent::class, UsersGroupsCirclesListener::class);
+		}
 
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
 

lib/Db/Share.php

@@ -7,7 +7,13 @@
 
 namespace OCA\Bookmarks\Db;
 
+use OCA\Bookmarks\Service\CirclesService;
 use OCP\AppFramework\Db\Entity;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use OCP\Share\IShare;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class Share
@@ -58,6 +64,32 @@ public function __construct() {
 	 * @psalm-return array{id: mixed, folderId: mixed, owner: mixed, participant: mixed, type: mixed, canWrite: mixed, canShare: mixed, createdAt: mixed}
 	 */
 	public function toArray(): array {
-		return ['id' => $this->id, 'folderId' => $this->folderId, 'owner' => $this->owner, 'participant' => $this->participant, 'type' => $this->type, 'canWrite' => $this->canWrite, 'canShare' => $this->canShare, 'createdAt' => $this->createdAt];
+		return [
+			'id' => $this->id,
+			'folderId' => $this->folderId,
+			'owner' => $this->owner,
+			'participant' => $this->participant,
+			'type' => $this->type,
+			'canWrite' => $this->canWrite,
+			'canShare' => $this->canShare,
+			'createdAt' => $this->createdAt,
+			'participantDisplayName' => self::getParticipantDisplayName($this->type, $this->participant),
+		];
+	}
+
+	private static function getParticipantDisplayName($type, $participant) {
+		try {
+			if ($type === IShare::TYPE_USER) {
+				return \OCP\Server::get(IUserManager::class)->get($participant)->getDisplayName();
+			}
+			if ($type === IShare::TYPE_GROUP) {
+				return \OCP\Server::get(IGroupManager::class)->get($participant)->getDisplayName();
+			}
+			if ($type === IShare::TYPE_CIRCLE) {
+				return \OCP\Server::get(CirclesService::class)->getCircle($participant)->getName();
+			}
+		} catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+			return $participant;
+		}
 	}
 }