Merge pull request #3650 from nextcloud/bugfix/3649

Handle description shortening more gracefully
nextcloud · Mar 22, 2022 · 48cd275 · 48cd275
2 parents 4027f40 + 48db989
commit 48cd275
Show file tree

Hide file tree

Showing 2 changed files with 196 additions and 54 deletions.
diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
@@ -31,7 +31,6 @@
 use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\Assignment;
 use OCA\Deck\Db\Attachment;
-use OCA\Deck\Db\AttachmentMapper;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\Card;
@@ -50,12 +49,15 @@
 
 class ActivityManager {
 	public const DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED = 'DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED';
+
+	public const SUBJECT_PARAMS_MAX_LENGTH = 4000;
+	public const SHORTENED_DESCRIPTION_MAX_LENGTH = 2000;
+
 	private $manager;
 	private $userId;
 	private $permissionService;
 	private $boardMapper;
 	private $cardMapper;
-	private $attachmentMapper;
 	private $aclMapper;
 	private $stackMapper;
 	private $l10nFactory;
@@ -110,7 +112,6 @@ public function __construct(
 		BoardMapper $boardMapper,
 		CardMapper $cardMapper,
 		StackMapper $stackMapper,
-		AttachmentMapper $attachmentMapper,
 		AclMapper $aclMapper,
 		IFactory $l10nFactory,
 		$userId
@@ -120,7 +121,6 @@ public function __construct(
 		$this->boardMapper = $boardMapper;
 		$this->cardMapper = $cardMapper;
 		$this->stackMapper = $stackMapper;
-		$this->attachmentMapper = $attachmentMapper;
 		$this->aclMapper = $aclMapper;
 		$this->l10nFactory = $l10nFactory;
 		$this->userId = $userId;
@@ -249,19 +249,6 @@ public function triggerEvent($objectType, $entity, $subject, $additionalParams =
 		try {
 			$event = $this->createEvent($objectType, $entity, $subject, $additionalParams, $author);
 			if ($event !== null) {
-				$json = json_encode($event->getSubjectParameters());
-				if (mb_strlen($json) > 4000) {
-					$params = json_decode(json_encode($event->getSubjectParameters()), true);
-
-					$newContent = $params['after'];
-					unset($params['before'], $params['after'], $params['card']['description']);
-
-					$params['after'] = mb_substr($newContent, 0, 2000);
-					if (mb_strlen($newContent) > 2000) {
-						$params['after'] .= '...';
-					}
-					$event->setSubject($event->getSubject(), $params);
-				}
 				$this->sendToUsers($event);
 			}
 		} catch (\Exception $e) {
@@ -410,12 +397,31 @@ private function createEvent($objectType, $entity, $subject, $additionalParams =
 
 		$subjectParams['author'] = $author === null ? $this->userId : $author;
 
+		$subjectParams = array_merge($subjectParams, $additionalParams);
+		$json = json_encode($subjectParams);
+		if (mb_strlen($json) > self::SUBJECT_PARAMS_MAX_LENGTH) {
+			$params = json_decode(json_encode($subjectParams), true);
+
+			if ($subject === self::SUBJECT_CARD_UPDATE_DESCRIPTION && isset($params['after'])) {
+				$newContent = $params['after'];
+				unset($params['before'], $params['after'], $params['card']['description']);
+
+				$params['after'] = mb_substr($newContent, 0, self::SHORTENED_DESCRIPTION_MAX_LENGTH);
+				if (mb_strlen($newContent) > self::SHORTENED_DESCRIPTION_MAX_LENGTH) {
+					$params['after'] .= '...';
+				}
+				$subjectParams = $params;
+			} else {
+				throw new \Exception('Subject parameters too long');
+			}
+		}
+
 		$event = $this->manager->generateEvent();
 		$event->setApp('deck')
 			->setType($eventType)
 			->setAuthor($subjectParams['author'])
 			->setObject($objectType, (int)$object->getId(), $object->getTitle())
-			->setSubject($subject, array_merge($subjectParams, $additionalParams))
+			->setSubject($subject, $subjectParams)
 			->setTimestamp(time());
 
 		if ($message !== null) {