Merge pull request #13720 from nextcloud/backport/13593/stable28

[stable28] fix(activity): Fix parameter type of call activity
nextcloud-releases · Nov 7, 2024 · be73841 · be73841
2 parents f471eca + 8e9695a
commit be73841
Show file tree

Hide file tree

Showing 6 changed files with 758 additions and 45 deletions.
diff --git a/lib/Activity/Provider/Base.php b/lib/Activity/Provider/Base.php
@@ -108,20 +108,19 @@ protected function getRoom(Room $room, string $userId): array {
 
 		return [
 			'type' => 'call',
-			'id' => $room->getId(),
+			'id' => (string)$room->getId(),
 			'name' => $room->getDisplayName($userId),
 			'link' => $this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()]),
 			'call-type' => $stringType,
 			'icon-url' => $this->avatarService->getAvatarUrl($room),
 		];
 	}
 
-	protected function getFormerRoom(IL10N $l, int $roomId): array {
+	protected function getFormerRoom(IL10N $l): array {
 		return [
-			'type' => 'call',
-			'id' => $roomId,
+			'type' => 'highlight',
+			'id' => 'deleted',
 			'name' => $l->t('a conversation'),
-			'call-type' => Room::TYPE_UNKNOWN,
 		];
 	}
 

diff --git a/lib/Activity/Provider/Invitation.php b/lib/Activity/Provider/Invitation.php
@@ -42,11 +42,11 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
 			$l = $this->languageFactory->get('spreed', $language);
 			$parameters = $event->getSubjectParameters();
 
-			$roomParameter = $this->getFormerRoom($l, (int) $parameters['room']);
 			try {
 				$room = $this->manager->getRoomById((int) $parameters['room']);
 				$roomParameter = $this->getRoom($room, $event->getAffectedUser());
-			} catch (RoomNotFoundException $e) {
+			} catch (RoomNotFoundException) {
+				$roomParameter = $this->getFormerRoom($l);
 			}
 
 			$this->setSubjects($event, $l->t('{actor} invited you to {call}'), [

diff --git a/lib/BackgroundJob/CheckHostedSignalingServer.php b/lib/BackgroundJob/CheckHostedSignalingServer.php
@@ -119,7 +119,7 @@ protected function run($argument): void {
 				];
 			}
 
-		// only credentials have changed
+			// only credentials have changed
 		} elseif ($newStatus === 'active' && (
 			$oldAccountInfo['signaling']['url'] !== $accountInfo['signaling']['url'] ||
 			$oldAccountInfo['signaling']['secret'] !== $accountInfo['signaling']['secret'])

diff --git a/tests/php/Activity/Provider/InvitationTest.php b/tests/php/Activity/Provider/InvitationTest.php
@@ -192,6 +192,8 @@ public function testParse($lang, $roomExists, array $params, array $expectedPara
 				->method('getRoom')
 				->with($room, 'user')
 				->willReturn(['call-data']);
+			$provider->expects($this->never())
+				->method('getFormerRoom');
 		} else {
 			$this->manager->expects($this->once())
 				->method('getRoomById')
@@ -200,6 +202,10 @@ public function testParse($lang, $roomExists, array $params, array $expectedPara
 
 			$provider->expects($this->never())
 				->method('getRoom');
+			$provider->expects($this->once())
+				->method('getFormerRoom')
+				->with($l)
+				->willReturn(['call-unknown']);
 		}
 
 		$this->l10nFactory->expects($this->once())
@@ -218,10 +224,6 @@ public function testParse($lang, $roomExists, array $params, array $expectedPara
 			->method('getUser')
 			->with($params['user'])
 			->willReturn(['actor-data']);
-		$provider->expects($this->once())
-			->method('getFormerRoom')
-			->with($l, $params['room'])
-			->willReturn(['call-unknown']);
 
 		$provider->parse($lang, $event);
 	}

diff --git a/vendor-bin/csfixer/composer.json b/vendor-bin/csfixer/composer.json
@@ -1,12 +1,12 @@
 {
 	"config": {
 		"platform": {
-			"php": "8.0"
+			"php": "8.0.2"
 		},
 		"sort-packages": true
 	},
 	"require-dev": {
-		"friendsofphp/php-cs-fixer": "^3.16",
+		"friendsofphp/php-cs-fixer": "^3.64",
 		"nextcloud/coding-standard": "^1.1"
 	}
 }