fix(archive): Improve archive preference handling

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Sep 26, 2024 · eac8129 · eac8129
1 parent f67e2ff
commit eac8129
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
@@ -1546,6 +1546,9 @@ public function setPassword(string $password): DataResponse {
 	/**
 	 * Archive a conversation
 	 *
+	 * - Turns off call notifications
+	 * - Reduces chat notifications in group and public rooms when it was "default" resulting in "always"
+	 *
 	 * @return DataResponse<Http::STATUS_OK, TalkRoom, array{}>
 	 *
 	 * 200: Conversation was archived

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
@@ -299,18 +299,36 @@ public function updateNotificationCalls(Participant $participant, int $level): v
 	}
 
 	/**
-	 * @param Participant $participant
+	 * @return Participant::NOTIFY_*
 	 */
+	protected function getDefaultGroupNotification(): int {
+		$config = (int)$this->serverConfig->getAppValue('spreed', 'default_group_notification', (string)Participant::NOTIFY_MENTION);
+		return max(Participant::NOTIFY_DEFAULT, min($config, Participant::NOTIFY_NEVER));
+	}
+
 	public function archiveConversation(Participant $participant): void {
 		$attendee = $participant->getAttendee();
 		$attendee->setArchived(true);
 		$attendee->setLastAttendeeActivity($this->timeFactory->getTime());
+
+		$room = $participant->getRoom();
+		if ($room->getType() === Room::TYPE_PUBLIC || $room->getType() === Room::TYPE_GROUP) {
+			// Turn of call notifications by default
+			if ($attendee->getNotificationCalls() === Participant::NOTIFY_CALLS_ON) {
+				$attendee->setNotificationCalls(Participant::NOTIFY_CALLS_OFF);
+			}
+
+			// Reduce notifications when it was "Always" via the default
+			// Otherwise we respect the attendees selection
+			if ($attendee->getNotificationLevel() === Participant::NOTIFY_DEFAULT
+				&& $this->getDefaultGroupNotification() !== Participant::NOTIFY_NEVER) {
+				$attendee->setNotificationCalls(Participant::NOTIFY_MENTION);
+			}
+		}
+
 		$this->attendeeMapper->update($attendee);
 	}
 
-	/**
-	 * @param Participant $participant
-	 */
 	public function unarchiveConversation(Participant $participant): void {
 		$attendee = $participant->getAttendee();
 		$attendee->setArchived(false);

diff --git a/openapi-full.json b/openapi-full.json
@@ -15814,6 +15814,7 @@
             "post": {
                 "operationId": "room-archive-conversation",
                 "summary": "Archive a conversation",
+                "description": "- Turns off call notifications - Reduces chat notifications in group and public rooms when it was \"default\" resulting in \"always\"",
                 "tags": [
                     "room"
                 ],

diff --git a/openapi.json b/openapi.json
@@ -15948,6 +15948,7 @@
             "post": {
                 "operationId": "room-archive-conversation",
                 "summary": "Archive a conversation",
+                "description": "- Turns off call notifications - Reduces chat notifications in group and public rooms when it was \"default\" resulting in \"always\"",
                 "tags": [
                     "room"
                 ],

diff --git a/src/types/openapi/openapi-full.ts b/src/types/openapi/openapi-full.ts
@@ -1231,7 +1231,10 @@ export type paths = {
         };
         get?: never;
         put?: never;
-        /** Archive a conversation */
+        /**
+         * Archive a conversation
+         * @description - Turns off call notifications - Reduces chat notifications in group and public rooms when it was "default" resulting in "always"
+         */
         post: operations["room-archive-conversation"];
         /** Unarchive a conversation */
         delete: operations["room-unarchive-conversation"];

diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts
@@ -1233,7 +1233,10 @@ export type paths = {
         };
         get?: never;
         put?: never;
-        /** Archive a conversation */
+        /**
+         * Archive a conversation
+         * @description - Turns off call notifications - Reduces chat notifications in group and public rooms when it was "default" resulting in "always"
+         */
         post: operations["room-archive-conversation"];
         /** Unarchive a conversation */
         delete: operations["room-unarchive-conversation"];