Add and remove users from conversations when their group membership changes

Signed-off-by: Joas Schilling <[email protected]>

Author: nickvergessen

lib/AppInfo/Application.php

@@ -44,6 +44,7 @@
 use OCA\Talk\Listener\BeforeUserLoggedOutListener;
 use OCA\Talk\Listener\CSPListener;
 use OCA\Talk\Listener\FeaturePolicyListener;
+use OCA\Talk\Listener\GroupMembershipListener;
 use OCA\Talk\Listener\RestrictStartingCalls as RestrictStartingCallsListener;
 use OCA\Talk\Listener\UserDeletedListener;
 use OCA\Talk\Middleware\CanUseTalkMiddleware;
@@ -69,6 +70,8 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Collaboration\Resources\IProviderManager;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\Events\UserAddedEvent;
+use OCP\Group\Events\UserRemovedEvent;
 use OCP\IServerContainer;
 use OCP\IUser;
 use OCP\Security\CSP\AddContentSecurityPolicyEvent;
@@ -92,6 +95,8 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(AddContentSecurityPolicyEvent::class, CSPListener::class);
 		$context->registerEventListener(AddFeaturePolicyEvent::class, FeaturePolicyListener::class);
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
+		$context->registerEventListener(UserAddedEvent::class, GroupMembershipListener::class);
+		$context->registerEventListener(UserRemovedEvent::class, GroupMembershipListener::class);
 		$context->registerEventListener(BeforeUserLoggedOutEvent::class, BeforeUserLoggedOutListener::class);
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, PublicShareTemplateLoader::class);
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, PublicShareAuthTemplateLoader::class);

lib/Listener/GroupMembershipListener.php

@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * 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\Talk\Listener;
+
+use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Room;
+use OCA\Talk\Service\ParticipantService;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Group\Events\UserAddedEvent;
+use OCP\Group\Events\UserRemovedEvent;
+use OCP\IGroup;
+use OCP\IGroupManager;
+use OCP\IUser;
+
+class GroupMembershipListener implements IEventListener {
+
+	/** @var IGroupManager */
+	private $groupManager;
+	/** @var Manager */
+	private $manager;
+	/** @var ParticipantService */
+	private $participantService;
+
+	public function __construct(IGroupManager $groupManager,
+								Manager $manager,
+								ParticipantService $participantService) {
+		$this->groupManager = $groupManager;
+		$this->manager = $manager;
+		$this->participantService = $participantService;
+	}
+
+	public function handle(Event $event): void {
+		if ($event instanceof UserAddedEvent) {
+			$this->addNewMemberToRooms($event->getGroup(), $event->getUser());
+		}
+		if ($event instanceof UserRemovedEvent) {
+			$this->removeFormerMemberFromRooms($event->getGroup(), $event->getUser());
+		}
+	}
+
+	protected function addNewMemberToRooms(IGroup $group, IUser $user): void {
+		$rooms = $this->manager->getRoomsForActor(Attendee::ACTOR_GROUP, $group->getGID());
+
+		foreach ($rooms as $room) {
+			$this->participantService->addUsers($room, [[
+				'actorType' => Attendee::ACTOR_USERS,
+				'actorId' => $user->getUID(),
+			]]);
+		}
+	}
+
+	protected function removeFormerMemberFromRooms(IGroup $group, IUser $user): void {
+		$rooms = $this->manager->getRoomsForActor(Attendee::ACTOR_GROUP, $group->getGID());
+		if (empty($rooms)) {
+			return;
+		}
+
+		$userGroupIds = $this->groupManager->getUserGroupIds($user);
+
+		$furtherMemberships = [];
+		foreach ($userGroupIds as $groupId) {
+			$groupRooms = $this->manager->getRoomsForActor(Attendee::ACTOR_GROUP, $groupId);
+			foreach ($groupRooms as $room) {
+				$furtherMemberships[$room->getId()] = true;
+			}
+		}
+
+		$rooms = array_filter($rooms, static function (Room $room) use ($furtherMemberships) {
+			// Only delete from rooms where the user is not member via another group
+			return !isset($furtherMemberships[$room->getId()]);
+		});
+
+		foreach ($rooms as $room) {
+			$this->participantService->removeUser($room, $user, Room::PARTICIPANT_REMOVED);
+		}
+	}
+}

lib/Manager.php

@@ -302,15 +302,25 @@ public function searchRoomsByToken(string $searchToken = '', int $limit = null,
 	 * @return Room[]
 	 */
 	public function getRoomsForUser(string $userId, bool $includeLastMessage = false): array {
+		return $this->getRoomsForActor(Attendee::ACTOR_USERS, $userId, $includeLastMessage);
+	}
+
+	/**
+	 * @param string $actorType
+	 * @param string $actorId
+	 * @param bool $includeLastMessage
+	 * @return Room[]
+	 */
+	public function getRoomsForActor(string $actorType, string $actorId, bool $includeLastMessage = false): array {
 		$query = $this->db->getQueryBuilder();
 		$helper = new SelectHelper();
 		$helper->selectRoomsTable($query);
 		$helper->selectAttendeesTable($query);
 		$helper->selectSessionsTable($query);
 		$query->from('talk_rooms', 'r')
 			->leftJoin('r', 'talk_attendees', 'a', $query->expr()->andX(
-				$query->expr()->eq('a.actor_id', $query->createNamedParameter($userId)),
-				$query->expr()->eq('a.actor_type', $query->createNamedParameter(Attendee::ACTOR_USERS)),
+				$query->expr()->eq('a.actor_id', $query->createNamedParameter($actorId)),
+				$query->expr()->eq('a.actor_type', $query->createNamedParameter($actorType)),
 				$query->expr()->eq('a.room_id', 'r.id')
 			))
 			->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
@@ -331,7 +341,7 @@ public function getRoomsForUser(string $userId, bool $includeLastMessage = false
 			}
 
 			$room = $this->createRoomObject($row);
-			if ($userId !== null && isset($row['actor_id'])) {
+			if ($actorType === Attendee::ACTOR_USERS && isset($row['actor_id'])) {
 				$room->setParticipant($row['actor_id'], $this->createParticipantObject($room, $row));
 			}
 			$rooms[] = $room;