Fixes after code review

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

docs/conversation.md

@@ -107,7 +107,7 @@
 | `isCustomAvatar`        | bool    | v4    |         | Flag if the conversation has a custom avatar (only available with `avatar` capability)                                                                                                                                                                                                                                                                                                            |
 | `callStartTime`         | int     | v4    |         | Timestamp when the call was started (only available with `recording-v1` capability)                                                                                                                                                                                                                                                                                                               |
 | `callRecording`         | int     | v4    |         | Type of call recording (see [Constants - Call recording status](constants.md#call-recording-status)) (only available with `recording-v1` capability)                                                                                                                                                                                                                                              |
-| `canMentionEveryone`    | int     | v4    |         | Type of call recording (see [Constants - Can mention everyone](constants.md#can-mention-everyone)) (only available with `can-mention-everyone` capability)                                                                                                                                                                                                                                        |
+| `canMentionEveryone`    | int     | v4    |         | Flag if non moderators can mention everyone (see [Constants - Can mention everyone](constants.md#can-mention-everyone)) (only available with `can-mention-everyone` capability)                                                                                                                                                                                                                   |
 
 ## Creating a new conversation
 

lib/Manager.php

@@ -230,7 +230,7 @@ public function createRoomObject(array $row): Room {
 			(int) $row['breakout_room_mode'],
 			(int) $row['breakout_room_status'],
 			(int) $row['call_recording'],
-			(int) $row['can_mention_everyone']
+			(int) $row['can_mention_everyone'],
 		);
 	}
 

…ation/Version16000Date20230505122109.php …ation/Version18000Date20230505122109.phplib/Migration/Version16000Date20230505122109.php renamed to lib/Migration/Version18000Date20230505122109.php lib/Migration/Version16000Date20230505122109.php renamed to lib/Migration/Version18000Date20230505122109.php

@@ -32,7 +32,7 @@
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
-class Version16000Date20230505122109 extends SimpleMigrationStep {
+class Version18000Date20230505122109 extends SimpleMigrationStep {
 
 	/**
 	 * @param IOutput $output

lib/Room.php

@@ -101,6 +101,9 @@ class Room {
 	public const PARTICIPANT_REMOVED_ALL = 'remove_all';
 	public const PARTICIPANT_LEFT = 'leave';
 
+	public const CAN_MENTION_EVERYONE = 1;
+	public const CAN_NOT_MENTION_EVERYONE = 0;
+
 	public const EVENT_AFTER_ROOM_CREATE = self::class . '::createdRoom';
 	public const EVENT_BEFORE_ROOM_DELETE = self::class . '::preDeleteRoom';
 	public const EVENT_AFTER_ROOM_DELETE = self::class . '::postDeleteRoom';
@@ -663,7 +666,7 @@ public function setCallRecording(int $callRecording): void {
 	}
 
 	public function setCanMentionEveryone(int $canMentionEveryone): void {
-		$this->canMentionEveryone = $canMentionEveryone === 1 ? 1 : 0;
+		$this->canMentionEveryone = $canMentionEveryone;
 	}
 
 	public function getCanMentionEveryone(): int {

lib/Service/RoomFormatter.php

@@ -139,7 +139,7 @@ public function formatRoomV4(
 			'isCustomAvatar' => $this->avatarService->isCustomAvatar($room),
 			'breakoutRoomMode' => BreakoutRoom::MODE_NOT_CONFIGURED,
 			'breakoutRoomStatus' => BreakoutRoom::STATUS_STOPPED,
-			'canMentionEveryone' => 1
+			'canMentionEveryone' => Room::CAN_MENTION_EVERYONE,
 		];
 
 		$lastActivity = $room->getLastActivity();

lib/Service/RoomService.php

@@ -853,11 +853,15 @@ public function deleteRoom(Room $room): void {
 	}
 
 	public function setCanMentionEveryone(Room $room, int $canMentionEveryone): void {
-		if (!in_array($canMentionEveryone, [0, 1])) {
+		if (!in_array($canMentionEveryone, [Room::CAN_NOT_MENTION_EVERYONE, Room::CAN_MENTION_EVERYONE])) {
 			throw new InvalidArgumentException('config');
 		}
 
 		$old = $room->getCanMentionEveryone();
+		if ($old === $canMentionEveryone) {
+			return;
+		}
+
 		$event = new ModifyRoomEvent($room, 'canMentionEveryone', $canMentionEveryone, $old);
 		$this->dispatcher->dispatch(Room::EVENT_BEFORE_SET_CAN_MENTION_EVERYONE, $event);
 

tests/php/Service/RoomServiceTest.php

@@ -397,7 +397,7 @@ public function testVerifyPassword(): void {
 			0,
 			0,
 			0,
-			0
+			0,
 		);
 
 		$verificationResult = $service->verifyPassword($room, '1234');