Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable28] fix(activity): Fix parameter type of call activity #13720

Merged
merged 4 commits into from
Nov 7, 2024
Merged

[stable28] fix(activity): Fix parameter type of call activity #13720

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
066cacc
fix(activity): Fix parameter type of call activity
nickvergessen Oct 19, 2024
058163c
fix(activity): Also fix former conversations
nickvergessen Oct 19, 2024
61b37f4
ci: Bump CS-Fixer
nickvergessen Nov 7, 2024
8e9695a
ci: Fix CS
nickvergessen Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lib/Activity/Provider/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
];
}

Expand Down
4 changes: 2 additions & 2 deletions lib/Activity/Provider/Invitation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}'), [
Expand Down
10 changes: 6 additions & 4 deletions tests/php/Activity/Provider/InvitationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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())
Expand All @@ -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);
}
Expand Down
Loading