Skip to content

fix(federation): Proxy all requests with the users language #11801

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

Merged
nickvergessen merged 2 commits into from
Mar 14, 2024
Merged

fix(federation): Proxy all requests with the users language #11801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84e3e69
fix(federation): Proxy all requests with the users language
nickvergessen Mar 14, 2024
f207c54
fix(federation): Add "… invited you" short cut
nickvergessen Mar 14, 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
10 changes: 10 additions & 0 deletions lib/Chat/Parser/SystemMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,11 @@ protected function parseMessage(Message $chatMessage): void {
if ($parsedParameters['federated_user']['id'] === $parsedParameters['actor']['id']) {
$parsedMessage = $this->l->t('You accepted the invitation');
}
} elseif ($this->isCurrentParticipantChangedUser($currentActorType, $currentActorId, $parsedParameters['federated_user'])) {
$parsedMessage = $this->l->t('{actor} invited you');
if ($cliIsActor) {
$parsedMessage = $this->l->t('An administrator invited you');
}
} elseif ($cliIsActor) {
$parsedMessage = $this->l->t('An administrator invited {federated_user}');
} elseif ($parsedParameters['federated_user']['id'] === $parsedParameters['actor']['id']) {
Expand All @@ -378,6 +383,11 @@ protected function parseMessage(Message $chatMessage): void {
$parsedMessage = $this->l->t('{actor} removed {federated_user}');
if ($currentUserIsActor) {
$parsedMessage = $this->l->t('You removed {federated_user}');
} elseif ($this->isCurrentParticipantChangedUser($currentActorType, $currentActorId, $parsedParameters['federated_user'])) {
$parsedMessage = $this->l->t('{actor} removed you');
if ($cliIsActor) {
$parsedMessage = $this->l->t('An administrator removed you');
}
} elseif ($cliIsActor) {
$parsedMessage = $this->l->t('An administrator removed {federated_user}');
} elseif ($parsedParameters['federated_user']['id'] === $parsedParameters['actor']['id']) {
Expand Down
5 changes: 5 additions & 0 deletions lib/Federation/Proxy/TalkV1/ProxyRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
use OCP\Http\Client\IClientService;
use OCP\Http\Client\IResponse;
use OCP\IConfig;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use Psr\Log\LoggerInterface;
use SensitiveParameter;

Expand All @@ -43,6 +45,8 @@ public function __construct(
protected IConfig $config,
protected IClientService $clientService,
protected LoggerInterface $logger,
protected IFactory $l10nFactory,
protected IUserSession $userSession,
) {
}

Expand Down Expand Up @@ -72,6 +76,7 @@ protected function generateDefaultRequestOptions(
'Accept' => 'application/json',
'X-Nextcloud-Federation' => 'true',
'OCS-APIRequest' => 'true',
'Accept-Language' => $this->l10nFactory->getUserLanguage($this->userSession->getUser()),
],
'timeout' => 5,
];
Expand Down