Change system message string

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Jul 7, 2021 · b138414 · b138414
1 parent 31a32b6
commit b138414
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/docs/chat.md b/docs/chat.md
@@ -292,7 +292,7 @@ See [OCP\RichObjectStrings\Definitions](https://github.com/nextcloud/server/blob
 * `guest_moderator_promoted` - {actor} promoted {user} to moderator
 * `guest_moderator_demoted` - {actor} demoted {user} from moderator
 * `message_deleted` - Message deleted by {actor} (Should not be shown to the user)
-* `cleared_history` - {actor} cleared the history of the conversation
+* `history_cleared` - {actor} cleared the history of the conversation
 * `file_shared` - {file}
 * `object_shared` - {object}
 * `matterbridge_config_added` - {actor} set up Matterbridge to synchronize this conversation with other chats

diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php
@@ -297,7 +297,7 @@ public function clearHistory(Room $chat, string $actorType, string $actorId): IC
 			$chat,
 			$actorType,
 			$actorId,
-			json_encode(['message' => 'cleared_history', 'parameters' => []]),
+			json_encode(['message' => 'history_cleared', 'parameters' => []]),
 			$this->timeFactory->getDateTime(),
 			false
 		);

diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
@@ -402,7 +402,7 @@ public function parseMessage(Message $chatMessage): void {
 			if ($currentUserIsActor) {
 				$parsedMessage = $this->l->t('You deleted a message');
 			}
-		} elseif ($message === 'cleared_history') {
+		} elseif ($message === 'history_cleared') {
 			$parsedMessage = $this->l->t('{actor} cleared the history of the conversation');
 			if ($currentUserIsActor) {
 				$parsedMessage = $this->l->t('You cleared the history of the conversation');

diff --git a/tests/integration/features/chat/delete.feature b/tests/integration/features/chat/delete.feature
@@ -203,7 +203,7 @@ Feature: chat/reply
       | room  | actorType | actorId      | actorDisplayName         | message   | messageParameters |
     Then user "participant1" sees the following system messages in room "room1" with 200 (v1)
       | room  | actorType | actorId      | actorDisplayName         | systemMessage   |
-      | room1 | users     | participant1 | participant1-displayname | cleared_history |
+      | room1 | users     | participant1 | participant1-displayname | history_cleared |
     Then user "participant2" sees the following system messages in room "room1" with 200 (v1)
       | room  | actorType | actorId      | actorDisplayName         | systemMessage   |
-      | room1 | users     | participant1 | participant1-displayname | cleared_history |
+      | room1 | users     | participant1 | participant1-displayname | history_cleared |
diff --git a/tests/php/Chat/ChatManagerTest.php b/tests/php/Chat/ChatManagerTest.php
@@ -427,7 +427,7 @@ public function testClearHistory(): void {
 				$chat,
 				'users',
 				'admin',
-				json_encode(['message' => 'cleared_history', 'parameters' => []]),
+				json_encode(['message' => 'history_cleared', 'parameters' => []]),
 				$date,
 				false
 			);