Combine move activities as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years ago · 38292753ac
parent 5a8c7854d6
commit 38292753ac
1 changed files with 5 additions and 1 deletions
--- a/apps/files/lib/Activity/Provider.php
+++ b/apps/files/lib/Activity/Provider.php
@ -246,7 +246,11 @@ class Provider implements IProvider {

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

-		$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
+		if ($event->getSubject() === 'moved_self' || $event->getSubject() === 'moved_by') {
+			$event = $this->eventMerger->mergeEvents('oldfile', $event, $previousEvent);
+		} else {
+			$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
+		}

 		if ($event->getChildEvent() === null) {
 			// Couldn't group by file, maybe we can group by user