From 38292753ac571c48cd48c779ee26b35097a45fee Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 10 Mar 2020 09:32:10 +0100
Subject: [PATCH] Combine move activities as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
apps/files/lib/Activity/Provider.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
index 86f5e71b580..07bc471281c 100644
--- 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
--
GitLab