fix(conversations): this fixes the behavior described in #11882: system messages like user added or removed, moderator promoted or demoted trigger an activity bump of the conversation in the list and move it to the top. This fix keeps activity bumps for real chat messages but won't bump the activity anymore for the aforementioned system messages. This fix also incorporates use of the new lastMetadataActivity field to update this information instead of lastActivity accordingly and can be expanded later on to handle other kind of messages differently. No changes client side are needed.

Signed-off-by: Christian Lorang <madcatcl2@gmx.de>

Author: sudormant

lib/Migration/Version24000Date20260510193300.php

@@ -42,12 +42,30 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table->addColumn('last_metadata_activity', Types::DATETIME, [
 				'notnull' => false,
 			]);
+<<<<<<< HEAD
+<<<<<<< HEAD
 			$table->addIndex(['last_metadata_activity'], 'talkroom_lastmetadataactive');
 
 		}
 
 		$table = $schema->getTable('talk_threads');
 
+		if (!$table->hasColumn('last_metadata_activity')) {
+			$table->addColumn('last_metadata_activity', Types::DATETIME, [
+				'notnull' => false,
+			]);
+			$table->addIndex(['last_metadata_activity'], 'talkthread_lastmetadataactive');
+=======
+			$table->addIndex(['last_metadata_activity'], 'talkthread_lastmetadataactive');
+=======
+			$table->addIndex(['last_metadata_activity'], 'talkroom_lastmetadataactive');
+>>>>>>> a798ce9366 (change(conversations): change behavior in all necessary places for Rooms and Threads to use / set lastMetadataActivity instaed of lastActivity where appropriate, i.e. where system messages are signalled and not real chat messages.)
+
+>>>>>>> 2ed52550f0 (feature(api): Add a new field and corresponding functionality for lastMetadaActivity for Rooms and Threads, similar to lastActivity. This also adds a database migration for the oc_talk_rooms and oc_talk_threads tables as well. Functions are introduced and prepared for later use. The use of the field lastActivity to signal when the last real message in a conversation appeared remains unchanged to keep the API stable. The intended use of this feature is to better distinguish between real messages (lastActivity) to notify and bump conversations in the thread list to the top, and other status / metadata related messages (lastMetadataActivity) like room state and participant list changes that shall get synced and be updated in the clients, but not trigger an activity bump of its conversations in the thread list.)
+		}
+		
+		$table = $schema->getTable('talk_threads');
+
 		if (!$table->hasColumn('last_metadata_activity')) {
 			$table->addColumn('last_metadata_activity', Types::DATETIME, [
 				'notnull' => false,
@@ -65,6 +83,10 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 	 */
 	#[Override]
 	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) : void {
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> a798ce9366 (change(conversations): change behavior in all necessary places for Rooms and Threads to use / set lastMetadataActivity instaed of lastActivity where appropriate, i.e. where system messages are signalled and not real chat messages.)
 		$update = $this->connection->getQueryBuilder();
 		$update->update('talk_rooms')
 			->set('last_metadata_activity', 'last_activity');
@@ -73,6 +95,15 @@ public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array
 		$update->update('talk_threads')
 			->set('last_metadata_activity', 'last_activity');
 		$update->executeStatement();
+<<<<<<< HEAD
+=======
+	   $update = $this->connection->getQueryBuilder();
+	   $update->update('talk_rooms')
+               ->set('last_metadata_activity', 'last_activity');
+       $update->executeStatement();
+>>>>>>> 2ed52550f0 (feature(api): Add a new field and corresponding functionality for lastMetadaActivity for Rooms and Threads, similar to lastActivity. This also adds a database migration for the oc_talk_rooms and oc_talk_threads tables as well. Functions are introduced and prepared for later use. The use of the field lastActivity to signal when the last real message in a conversation appeared remains unchanged to keep the API stable. The intended use of this feature is to better distinguish between real messages (lastActivity) to notify and bump conversations in the thread list to the top, and other status / metadata related messages (lastMetadataActivity) like room state and participant list changes that shall get synced and be updated in the clients, but not trigger an activity bump of its conversations in the thread list.)
+=======
+>>>>>>> a798ce9366 (change(conversations): change behavior in all necessary places for Rooms and Threads to use / set lastMetadataActivity instaed of lastActivity where appropriate, i.e. where system messages are signalled and not real chat messages.)
 	}	
 
 }

lib/Service/ParticipantService.php

@@ -738,24 +738,33 @@ public function addUsers(Room $room, array $participants, ?IUser $addedBy = null
 		$this->dispatcher->dispatchTyped($event);
 
 		$lastMessage = $event->getLastMessage();
-		if ($lastMessage instanceof IComment) {
+		// TODO: is there any better getter / way to access message type?
+		$lastMessageType = json_decode($lastMessage->getMessage(), true)['message'] ?? '';
+		if ($lastMessage instanceof IComment || !in_array($lastMessageType, ['user_added', 'user_removed', 'moderator_promoted', 'moderator_demoted'], true)) {
+			// do not update the room message to the status message, so the conversion / thread will not be bumped by activity to the top
+			// left to do is to update the last message in the preview in the room list, without bumping it up.
+		} elseif ($lastMessage instanceof IComment) {
 			$this->updateRoomLastMessage($room, $lastMessage);
 		}
+		$now = $this->timeFactory->getDateTime();
+		$room->setLastMetadataActivity($now);
 
 		return $attendees;
 	}
 
 	protected function updateRoomLastMessage(Room $room, IComment $message): void {
 		/** @var RoomService $roomService */
 		$roomService = Server::get(RoomService::class);
-		$roomService->setLastMessage($room, $message);
+		$roomService->setLastMessageInfo($room, (int)$message->getId(), $message->getCreationDateTime());
+		$now = $this->timeFactory->getDateTime();
+		$room->setLastMetadataActivity($now);
 
 		$lastMessageCache = $this->cacheFactory->createDistributed(CachePrefix::CHAT_LAST_MESSAGE_ID);
 		$lastMessageCache->remove($room->getToken());
 		$unreadCountCache = $this->cacheFactory->createDistributed(CachePrefix::CHAT_UNREAD_COUNT);
 		$unreadCountCache->clear($room->getId() . '-');
 
-		$event = new SystemMessagesMultipleSentEvent($room, $message);
+		$event = new SystemMessagesMultipleSentEvent($room, $message, skipLastActivityUpdate: true);
 		$this->dispatcher->dispatchTyped($event);
 	}
 
@@ -1255,6 +1264,9 @@ public function removeUser(Room $room, IUser $user, string $reason): void {
 			return;
 		}
 
+		$now = $this->timeFactory->getDateTime();
+		$room->setLastMetadataActivity($now);
+
 		$attendee = $participant->getAttendee();
 		$sessions = $this->sessionService->getAllSessionsForAttendee($attendee);
 

lib/Signaling/Listener.php

@@ -557,7 +557,7 @@ protected function notifySystemMessageSent(ASystemMessageSentEvent $event): void
 		$messageType = $messageDecoded['message'] ?? '';
 
 		if ($event->shouldSkipLastActivityUpdate() === true
-			&& !in_array($messageType, ['message_deleted', 'message_edited', 'thread_created', 'thread_renamed'], true)
+			&& !in_array($messageType, ['message_deleted', 'message_edited', 'thread_created', 'thread_renamed', 'user_added', 'user_removed', 'moderator_promoted', 'moderator_demoted'], true)
 		) {
 			return;
 		}