fix(activity): Also fix former conversations

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Nov 7, 2024 · fa6c521 · fa6c521
1 parent 5826e30
commit fa6c521
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/lib/Activity/Provider/Base.php b/lib/Activity/Provider/Base.php
@@ -116,12 +116,11 @@ protected function getRoom(Room $room, string $userId): array {
 		];
 	}
 
-	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):
 			$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/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);
 	}