Merge pull request #4969 from nextcloud/fix-broken-activity-avatars-w…

…ith-external-users Fix username and avatar for external users
nextcloud · May 23, 2017 · 3aee260 · 3aee260
2 parents 9c8a838 + edb4956
commit 3aee260
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
@@ -38,6 +38,8 @@ class Provider implements IProvider {
 
 	/** @var IL10N */
 	protected $l;
+	/** @var IL10N */
+	protected $activityLang;
 
 	/** @var IURLGenerator */
 	protected $url;
@@ -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 {
@@ -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);
@@ -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);
@@ -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]),
@@ -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]),