Merge pull request #736 from nextcloud/bugfix/noid/remove-card-parameter-when-its-null

Remove card parameter when it's null

lib/Activity/DeckProvider.php

@@ -79,7 +79,16 @@ class DeckProvider implements IProvider {
 		/**
 		 * Map stored parameter objects to rich string types
 		 */
-		$board = null;
+
+		$author = $event->getAuthor();
+		$user = $this->userManager->get($author);
+		$params = [
+			'user' => [
+				'type' => 'user',
+				'id' => $author,
+				'name' => $user !== null ? $user->getDisplayName() : $author
+			],
+		];
 		if ($event->getObjectType() === ActivityManager::DECK_OBJECT_BOARD) {
 			$board = [
 				'type' => 'highlight',
@@ -87,9 +96,9 @@ class DeckProvider implements IProvider {
 				'name' => $event->getObjectName(),
 				'link' => $this->deckUrl('/board/' . $event->getObjectId()),
 			];
+			$params['board'] = $board;
 		}
 
-		$card = null;
 		if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
 			$card = [
 				'type' => 'highlight',
@@ -101,20 +110,9 @@ class DeckProvider implements IProvider {
 				$archivedParam = $subjectParams['card']['archived'] ? 'archived' : '';
 				$card['link'] = $this->deckUrl('/board/' . $subjectParams['board']['id'] . '/' . $archivedParam . '/card/' . $event->getObjectId());
 			}
+			$params['card'] = $card;
 		}
 
-		$author = $event->getAuthor();
-		$user = $this->userManager->get($author);
-		$params = [
-			'board' => $board,
-			'card' => $card,
-			'user' => [
-				'type' => 'user',
-				'id' => $author,
-				'name' => $user !== null ? $user->getDisplayName() : $author
-			],
-		];
-
 		$params = $this->parseParamForBoard('board', $subjectParams, $params);
 		$params = $this->parseParamForStack('stack', $subjectParams, $params);
 		$params = $this->parseParamForStack('stackBefore', $subjectParams, $params);

tests/unit/Activity/DeckProviderTest.php

@@ -180,7 +180,6 @@ class DeckProviderTest extends TestCase {
 				'name' => 'Board',
 				'link' => '#!/board/1',
 			],
-			'card' => null,
 			'user' => [
 				'type' => 'user',
 				'id' => 'admin',
@@ -216,7 +215,6 @@ class DeckProviderTest extends TestCase {
 
 		$this->provider->parse('en_US', $event);
 		$data = [
-			'board' => null,
 			'card' => [
 				'type' => 'highlight',
 				'id' => 1,
@@ -266,7 +264,6 @@ class DeckProviderTest extends TestCase {
 
 		$this->provider->parse('en_US', $event);
 		$data = [
-			'board' => null,
 			'card' => [
 				'type' => 'highlight',
 				'id' => 1,