fixup! feat(mentions): allow teams to be mentioned

Author: miaulalala

Diff for: lib/Notification/Notifier.php

@@ -775,8 +775,8 @@ protected function parseChatMessage(INotification $notification, Room $room, Par
 
 				$subject = $l->t('{user} mentioned group {group} in conversation {call}');
 			} elseif ($notification->getSubject() === 'mention_team') {
-//				$circlesManager = OC::$server->getCircleManager();
-//				$groupName = $this->groupManager->getDisplayName($subjectParameters['sourceId']) ?? $subjectParameters['sourceId'];
+				//				$circlesManager = OC::$server->getCircleManager();
+				//				$groupName = $this->groupManager->getDisplayName($subjectParameters['sourceId']) ?? $subjectParameters['sourceId'];
 				$richSubjectParameters['team'] = [
 					'type' => 'circle',
 					'id' => $subjectParameters['sourceId'],
@@ -800,8 +800,8 @@ protected function parseChatMessage(INotification $notification, Room $room, Par
 
 				$subject = $l->t('A deleted user mentioned group {group} in conversation {call}');
 			} elseif ($notification->getSubject() === 'mention_team') {
-//				$circlesManager = OC::$server->getCircleManager();
-//				$groupName = $this->groupManager->getDisplayName($subjectParameters['sourceId']) ?? $subjectParameters['sourceId'];
+				//				$circlesManager = OC::$server->getCircleManager();
+				//				$groupName = $this->groupManager->getDisplayName($subjectParameters['sourceId']) ?? $subjectParameters['sourceId'];
 				$richSubjectParameters['team'] = [
 					'type' => 'circle',
 					'id' => $subjectParameters['sourceId'],

Diff for: tests/integration/features/bootstrap/FeatureContext.php

@@ -2313,7 +2313,7 @@ public function userSendsMessageToRoom(string $user, string $sendingMode, string
 		$message = str_replace('{$LOCAL_URL}', $this->localServerUrl, $message);
 		$message = str_replace('{$LOCAL_REMOTE_URL}', $this->localRemoteServerUrl, $message);
 		$message = str_replace('{$REMOTE_URL}', $this->remoteServerUrl, $message);
-		if(str_contains($message, '@"TEAM_ID(')) {
+		if (str_contains($message, '@"TEAM_ID(')) {
 			$result = preg_match('/TEAM_ID\(([^)]+)\)/', $message, $matches);
 			if ($result) {
 				$message = str_replace($matches[0], self::$createdTeams[$this->currentServer][$matches[1]], $message);