Skip to content

Fix username and avatar for external users #4969

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
rullzer merged 1 commit into from
May 23, 2017
Merged

Fix username and avatar for external users #4969

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions apps/files/lib/Activity/Provider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ class Provider implements IProvider {

/** @var IL10N */
protected $l;
/** @var IL10N */
protected $activityLang;

/** @var IURLGenerator */
protected $url;
Expand Down Expand Up @@ -83,6 +85,7 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
}

$this->l = $this->languageFactory->get('files', $language);
$this->activityLang = $this->languageFactory->get('activity', $language);

if ($this->activityManager->isFormattingFilteredObject()) {
try {
Expand Down Expand Up @@ -126,6 +129,11 @@ public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
throw new \InvalidArgumentException();
}

if (!isset($parsedParameters['user'])) {
// External user via public link share
$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
}

$this->setSubjects($event, $subject, $parsedParameters);

return $this->eventMerger->mergeEvents('user', $event, $previousEvent);
Expand Down Expand Up @@ -182,6 +190,11 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
throw new \InvalidArgumentException();
}

if (!isset($parsedParameters['user'])) {
// External user via public link share
$subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject);
}

$this->setSubjects($event, $subject, $parsedParameters);

$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
Expand Down Expand Up @@ -229,6 +242,12 @@ protected function getParameters(IEvent $event) {
case 'changed_by':
case 'deleted_by':
case 'restored_by':
if ($parameters[1] === '') {
// External user via public link share
return [
'file' => $this->getFile($parameters[0], $event),
];
}
return [
'file' => $this->getFile($parameters[0], $event),
'user' => $this->getUser($parameters[1]),
Expand All @@ -241,6 +260,13 @@ protected function getParameters(IEvent $event) {
];
case 'renamed_by':
case 'moved_by':
if ($parameters[1] === '') {
// External user via public link share
return [
'newfile' => $this->getFile($parameters[0]),
'oldfile' => $this->getFile($parameters[2]),
];
}
return [
'newfile' => $this->getFile($parameters[0]),
'user' => $this->getUser($parameters[1]),
Expand Down