From 0f5f314c0b4d84384667e04334b007406e0e716f Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 25 Mar 2021 16:48:47 +0100
Subject: [PATCH] Add dedicated activities for file uploads to public shares

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/files/lib/Activity/Provider.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
index 53ee48ab550a9..3db0c091b13e5 100644
--- a/apps/files/lib/Activity/Provider.php
+++ b/apps/files/lib/Activity/Provider.php
@@ -196,9 +196,24 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
 				$subject = $this->l->t('{user} created an encrypted file in {file}');
 			}
 			$this->setIcon($event, 'add-color');
+		} elseif ($event->getSubject() === 'upload_self') {
+			$subject = $this->l->t('You upload {file}');
+			if ($this->fileIsEncrypted) {
+				$subject = $this->l->t('You upload an encrypted file in {file}');
+			}
+			$this->setIcon($event, 'add-color');
+		} elseif ($event->getSubject() === 'upload_by') {
+			$subject = $this->l->t('{user} upload {file}');
+			if ($this->fileIsEncrypted) {
+				$subject = $this->l->t('{user} uploaded an encrypted file in {file}');
+			}
+			$this->setIcon($event, 'add-color');
 		} elseif ($event->getSubject() === 'created_public') {
 			$subject = $this->l->t('{file} was created in a public folder');
 			$this->setIcon($event, 'add-color');
+		} elseif ($event->getSubject() === 'uploaded_public') {
+			$subject = $this->l->t('{file} was uploaded in a public folder');
+			$this->setIcon($event, 'add-color');
 		} elseif ($event->getSubject() === 'changed_self') {
 			$subject = $this->l->t('You changed {file}');
 			if ($this->fileIsEncrypted) {
@@ -330,7 +345,9 @@ protected function getParameters(IEvent $event) {
 		$parameters = $event->getSubjectParameters();
 		switch ($event->getSubject()) {
 			case 'created_self':
+			case 'upload_self':
 			case 'created_public':
+			case 'upload_public':
 			case 'changed_self':
 			case 'deleted_self':
 			case 'restored_self':
@@ -338,6 +355,7 @@ protected function getParameters(IEvent $event) {
 					'file' => $this->getFile($parameters[0], $event),
 				];
 			case 'created_by':
+			case 'upload_by':
 			case 'changed_by':
 			case 'deleted_by':
 			case 'restored_by':