Merge pull request #12343 from nextcloud/backport/12341/stable28

[stable28] fix(polls): Remove actor info from system message
nextcloud · May 13, 2024 · 5012ae1 · 5012ae1
2 parents 4f316c3 + 45ed619
commit 5012ae1
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 8 deletions.
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
@@ -602,6 +602,8 @@ protected function parseMessage(Message $chatMessage): void {
 			$parsedParameters['poll']['id'] = (string) $parsedParameters['poll']['id'];
 			$parsedMessage = $this->l->t('Someone voted on the poll {poll}');
 			unset($parsedParameters['actor']);
+
+			$chatMessage->setActor(Attendee::ACTOR_GUESTS, Attendee::ACTOR_ID_SYSTEM, '');
 		} else {
 			throw new \OutOfBoundsException('Unknown subject');
 		}

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
@@ -2679,7 +2679,16 @@ public function userSeesTheFollowingSystemMessagesInRoom($user, $identifier, $st
 			return;
 		}
 
-		$expected = $formData->getHash();
+		$expected = array_map(static function (array $message) {
+			if (isset($message['messageParameters'])) {
+				$result = preg_match('/POLL_ID\(([^)]+)\)/', $message['messageParameters'], $matches);
+				if ($result) {
+					$message['messageParameters'] = str_replace($matches[0], '"' . self::$questionToPollId[$matches[1]] . '"', $message['messageParameters']);
+				}
+			}
+			return $message;
+		}, $formData->getHash());
+
 
 		Assert::assertCount(count($expected), $messages, 'Message count does not match');
 		Assert::assertEquals($expected, array_map(function ($message, $expected) {
@@ -2700,6 +2709,9 @@ public function userSeesTheFollowingSystemMessagesInRoom($user, $identifier, $st
 
 			if (isset($expected['messageParameters'])) {
 				$data['messageParameters'] = json_encode($message['messageParameters']);
+				if ($expected['messageParameters'] === '"IGNORE"') {
+					$data['messageParameters'] = '"IGNORE"';
+				}
 			}
 
 			return $data;