[stable34] fix(user): Clean up on user deletion

lib/AppInfo/Application.php

@@ -226,6 +226,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(AttendeesAddedEvent::class, SystemMessageListener::class);
 		$context->registerEventListener(AttendeeRemovedEvent::class, SystemMessageListener::class);
 		$context->registerEventListener(AttendeesRemovedEvent::class, SystemMessageListener::class);
+		$context->registerEventListener(AttendeesRemovedEvent::class, ChatListener::class);
 		$context->registerEventListener(BeforeDuplicateShareSentEvent::class, SystemMessageListener::class);
 		$context->registerEventListener(BeforeParticipantModifiedEvent::class, SystemMessageListener::class);
 		$context->registerEventListener(BeforeShareCreatedEvent::class, SystemMessageListener::class);

lib/Chat/Listener.php

@@ -9,7 +9,10 @@
 
 namespace OCA\Talk\Chat;
 
+use OCA\Talk\Events\AttendeesRemovedEvent;
 use OCA\Talk\Events\RoomDeletedEvent;
+use OCA\Talk\Model\Attendee;
+use OCA\Talk\Service\ReminderService;
 use OCA\Talk\Service\ScheduledMessageService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
@@ -21,6 +24,7 @@ class Listener implements IEventListener {
 	public function __construct(
 		private readonly ChatManager $chatManager,
 		private readonly ScheduledMessageService $scheduledMessageService,
+		private readonly ReminderService $reminderService,
 	) {
 	}
 
@@ -30,5 +34,15 @@ public function handle(Event $event): void {
 			$this->chatManager->deleteMessages($event->getRoom());
 			$this->scheduledMessageService->deleteMessagesByRoom($event->getRoom());
 		}
+		if ($event instanceof AttendeesRemovedEvent) {
+			foreach ($event->getAttendees() as $attendee) {
+				if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
+					$this->reminderService->deleteAllRemindersForUser(
+						$attendee->getActorId(),
+						$event->getRoom()->getToken(),
+					);
+				}
+			}
+		}
 	}
 }

lib/Federation/FederationManager.php

@@ -275,4 +275,8 @@ public function getNumberOfPendingInvitationsForUser(IUser $user): int {
 	public function getNumberOfInvitations(Room $room): int {
 		return $this->invitationMapper->countInvitationsForLocalRoom($room);
 	}
+
+	public function deleteInvitationsForUser(string $userId): void {
+		$this->invitationMapper->deleteInvitationsForUser($userId);
+	}
 }

lib/Listener/UserDeletedListener.php

@@ -8,10 +8,14 @@
 
 namespace OCA\Talk\Listener;
 
+use OCA\Talk\Federation\FederationManager;
 use OCA\Talk\Manager;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Service\ConsentService;
+use OCA\Talk\Service\ConversationTagService;
+use OCA\Talk\Service\PhoneService;
 use OCA\Talk\Service\PollService;
+use OCA\Talk\Service\ReminderService;
 use OCA\Talk\Service\ScheduledMessageService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
@@ -27,6 +31,10 @@ public function __construct(
 		private readonly PollService $pollService,
 		private readonly ConsentService $consentService,
 		private readonly ScheduledMessageService $messageManager,
+		private readonly ConversationTagService $tagService,
+		private readonly PhoneService $phoneService,
+		private readonly ReminderService $reminderService,
+		private readonly FederationManager $federationManager,
 	) {
 	}
 
@@ -38,12 +46,14 @@ public function handle(Event $event): void {
 		}
 
 		$user = $event->getUser();
-		$this->manager->removeUserFromAllRooms($user);
 
+		$this->manager->removeUserFromAllRooms($user);
 		$this->pollService->neutralizeDeletedUser(Attendee::ACTOR_USERS, $user->getUID());
-
 		$this->consentService->deleteByActor(Attendee::ACTOR_USERS, $user->getUID());
-
 		$this->messageManager->deleteByActor(Attendee::ACTOR_USERS, $user->getUID());
+		$this->tagService->deleteAllTagsByUserId($user->getUID());
+		$this->phoneService->deleteByUser($user->getUID());
+		$this->reminderService->deleteAllRemindersForUser($user->getUID());
+		$this->federationManager->deleteInvitationsForUser($user->getUID());
 	}
 }

lib/Model/ConversationTagMapper.php

@@ -74,4 +74,11 @@ public function clearTagFromAttendees(string $tagId, string $userId): void {
 		}
 		$result->closeCursor();
 	}
+
+	public function deleteAllByUserId(string $userId): void {
+		$query = $this->db->getQueryBuilder();
+		$query->delete('talk_conversation_tags')
+			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
+		$query->executeStatement();
+	}
 }

lib/Model/InvitationMapper.php

@@ -118,6 +118,13 @@ public function countInvitationsForUser(IUser $user, ?int $state = null): int {
 		return $count;
 	}
 
+	public function deleteInvitationsForUser(string $userId): void {
+		$query = $this->db->getQueryBuilder();
+		$query->delete($this->getTableName())
+			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
+		$query->executeStatement();
+	}
+
 	/**
 	 * @throws DoesNotExistException
 	 */

lib/Model/ReminderMapper.php

@@ -73,4 +73,16 @@ public function deleteExecutedReminders(\DateTime $dateTime): void {
 
 		$query->executeStatement();
 	}
+
+	public function deleteAllRemindersForUser(string $userId, ?string $token): void {
+		$query = $this->db->getQueryBuilder();
+		$query->delete($this->getTableName())
+			->where($query->expr()->eq('user_id', $query->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
+
+		if ($token !== null) {
+			$query->andWhere($query->expr()->eq('token', $query->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
+		}
+
+		$query->executeStatement();
+	}
 }

lib/Service/ConversationTagService.php

@@ -178,6 +178,10 @@ public function deleteTag(string $tagId, string $userId): void {
 		$this->mapper->delete($tag);
 	}
 
+	public function deleteAllTagsByUserId(string $userId): void {
+		$this->mapper->deleteAllByUserId($userId);
+	}
+
 	/**
 	 * Trim the caller-supplied name, enforce non-empty and the MAX_TAG_NAME_LENGTH cap.
 	 *

lib/Service/ReminderService.php

@@ -77,6 +77,10 @@ public function deleteReminder(string $userId, string $token, int $messageId): v
 		}
 	}
 
+	public function deleteAllRemindersForUser(string $userId, ?string $token = null): void {
+		$this->reminderMapper->deleteAllRemindersForUser($userId, $token);
+	}
+
 	public function executeReminders(\DateTime $executeBefore): void {
 		$reminders = $this->reminderMapper->findRemindersToExecute($executeBefore);