Merge pull request #1622 from nextcloud/backport/1616/stable29

[stable29] Group activities sent by mail
nextcloud · Apr 11, 2024 · 4235985 · 4235985
2 parents d4c4d98 + b707995
commit 4235985
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 192 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -32,12 +32,14 @@
 use OCA\Activity\Dashboard\ActivityWidget;
 use OCA\Activity\Data;
 use OCA\Activity\FilesHooksStatic;
+use OCA\Activity\GroupHelper;
 use OCA\Activity\Listener\LoadSidebarScripts;
 use OCA\Activity\Listener\SetUserDefaults;
 use OCA\Activity\Listener\ShareEventListener;
 use OCA\Activity\Listener\UserDeleted;
 use OCA\Activity\MailQueueHandler;
 use OCA\Activity\NotificationGenerator;
+use OCA\Activity\UserSettings;
 use OCA\Files\Event\LoadSidebar;
 use OCP\Activity\IManager;
 use OCP\AppFramework\App;
@@ -128,6 +130,9 @@ public function register(IRegistrationContext $context): void {
 				$c->get(IValidator::class),
 				$c->get(IConfig::class),
 				$c->get(LoggerInterface::class),
+				$c->get(Data::class),
+				$c->get(GroupHelper::class),
+				$c->get(UserSettings::class),
 			);
 		});
 

diff --git a/lib/GroupHelper.php b/lib/GroupHelper.php
@@ -31,36 +31,40 @@
 
 class GroupHelper {
 	/** @var IEvent[] */
-	protected $event = [];
-	/** @var int */
-	protected $lastEvent = 0;
-
-	/** @var bool */
-	protected $allowGrouping;
+	protected array $event = [];
+	protected int $lastEvent = 0;
+	protected bool $allowGrouping = true;
 
 	public function __construct(
 		protected IL10N $l,
 		protected IManager $activityManager,
 		protected IValidator $richObjectValidator,
-		protected LoggerInterface $logger) {
-		$this->allowGrouping = true;
+		protected LoggerInterface $logger
+	) {
 	}
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function setL10n(IL10N $l) {
+	public function resetEvents(): void {
+		$this->event = [];
+		$this->lastEvent = 0;
+	}
+
+	public function setL10n(IL10N $l): void {
 		$this->l = $l;
 	}
 
 	/**
 	 * Add an activity to the internal array
-	 *
-	 * @param array $activity
 	 */
-	public function addActivity($activity) {
+	public function addActivity(array $activity): void {
 		$id = (int) $activity['activity_id'];
 		$event = $this->arrayToEvent($activity);
+		$this->addEvent($id, $event);
+	}
+
+	/**
+	 * Add an event to the internal array
+	 */
+	public function addEvent(int $id, IEvent $event): void {
 		$language = $this->l->getLanguageCode();
 
 		foreach ($this->activityManager->getProviders() as $provider) {
@@ -71,46 +75,49 @@ public function addActivity($activity) {
 				} else {
 					$event = $provider->parse($language, $event);
 				}
-				try {
-					$this->richObjectValidator->validate($event->getRichSubject(), $event->getRichSubjectParameters());
-				} catch (InvalidObjectExeption $e) {
-					$this->logger->error(
-						$e->getMessage(),
-						[
-							'app' => 'activity',
-							'exception' => $e
-						],
-					);
-					$event->setRichSubject('Rich subject or a parameter for "' . $event->getRichSubject() . '" is malformed', []);
-					$event->setParsedSubject('Rich subject or a parameter for "' . $event->getRichSubject() . '" is malformed');
-				}
-
-				if ($event->getRichMessage()) {
-					try {
-						$this->richObjectValidator->validate($event->getRichMessage(), $event->getRichMessageParameters());
-					} catch (InvalidObjectExeption $e) {
-						$this->logger->error(
-							$e->getMessage(),
-							[
-								'app' => 'activity',
-								'exception' => $e
-							],
-						);
-						$event->setRichMessage('Rich message or a parameter is malformed', []);
-						$event->setParsedMessage('Rich message or a parameter is malformed');
-					}
-				}
+			} catch (\InvalidArgumentException $e) {
+			} catch (\Throwable $e) {
+				$this->logger->error('Error while parsing activity event', ['exception' => $e]);
+			}
+		}
 
-				$this->activityManager->setFormattingObject('', 0);
+		try {
+			$this->richObjectValidator->validate($event->getRichSubject(), $event->getRichSubjectParameters());
+		} catch (InvalidObjectExeption $e) {
+			$this->logger->error(
+				$e->getMessage(),
+				[
+					'app' => 'activity',
+					'exception' => $e
+				],
+			);
+			$event->setRichSubject('Rich subject or a parameter for "' . $event->getRichSubject() . '" is malformed', []);
+			$event->setParsedSubject('Rich subject or a parameter for "' . $event->getRichSubject() . '" is malformed');
+		}
 
-				$child = $event->getChildEvent();
-				if ($child instanceof IEvent) {
-					unset($this->event[$this->lastEvent]);
-				}
-			} catch (\InvalidArgumentException $e) {
+		if ($event->getRichMessage()) {
+			try {
+				$this->richObjectValidator->validate($event->getRichMessage(), $event->getRichMessageParameters());
+			} catch (InvalidObjectExeption $e) {
+				$this->logger->error(
+					$e->getMessage(),
+					[
+						'app' => 'activity',
+						'exception' => $e
+					],
+				);
+				$event->setRichMessage('Rich message or a parameter is malformed', []);
+				$event->setParsedMessage('Rich message or a parameter is malformed');
 			}
 		}
 
+		$this->activityManager->setFormattingObject('', 0);
+
+		$child = $event->getChildEvent();
+		if ($child instanceof IEvent) {
+			unset($this->event[$this->lastEvent]);
+		}
+
 		if (!$event->getParsedSubject()) {
 			$this->logger->debug('Activity "' . $event->getRichSubject() . '" was not parsed by any provider');
 			return;
@@ -125,7 +132,7 @@ public function addActivity($activity) {
 	 *
 	 * @return array translated activities ready for use
 	 */
-	public function getActivities() {
+	public function getActivities(): array {
 		$return = [];
 		foreach ($this->event as $id => $event) {
 			$return[] = $this->eventToArray($event, $id);
@@ -144,11 +151,7 @@ public function getEvents(): array {
 		return $return;
 	}
 
-	/**
-	 * @param array $row
-	 * @return IEvent
-	 */
-	protected function arrayToEvent(array $row) {
+	protected function arrayToEvent(array $row): IEvent {
 		$event = $this->activityManager->generateEvent();
 		$event->setApp((string) $row['app'])
 			->setType((string) $row['type'])
@@ -164,14 +167,10 @@ protected function arrayToEvent(array $row) {
 	}
 
 	/**
-	 * @param IEvent $event
 	 * @param (int|string) $id
-	 *
-	 * @return array
-	 *
 	 * @psalm-param array-key $id
 	 */
-	protected function eventToArray(IEvent $event, $id) {
+	protected function eventToArray(IEvent $event, $id): array {
 		return [
 			'activity_id' => $id,
 			'app' => $event->getApp(),
@@ -198,10 +197,6 @@ protected function eventToArray(IEvent $event, $id) {
 		];
 	}
 
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
 	protected function getObjectsFromChildren(IEvent $event): array {
 		$child = $event->getChildEvent();
 		$objects = [];