From d28bf74c7343023bdd1a7d57e974ba7c51e6d6ce Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 23 Nov 2018 12:30:55 +0100
Subject: [PATCH 1/2] Remove card parameter when it's null

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Activity/DeckProvider.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
index 2667b20e3..7df0a56a4 100644
--- a/lib/Activity/DeckProvider.php
+++ b/lib/Activity/DeckProvider.php
@@ -89,7 +89,17 @@ class DeckProvider implements IProvider {
 			];
 		}
 
-		$card = null;
+		$author = $event->getAuthor();
+		$user = $this->userManager->get($author);
+		$params = [
+			'board' => $board,
+			'user' => [
+				'type' => 'user',
+				'id' => $author,
+				'name' => $user !== null ? $user->getDisplayName() : $author
+			],
+		];
+
 		if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
 			$card = [
 				'type' => 'highlight',
@@ -101,20 +111,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);

From 2c024dedcea55a541042f3bda62eb9a78330c459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 23 Nov 2018 15:04:04 +0100
Subject: [PATCH 2/2] Remove null board value in activity parameters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Activity/DeckProvider.php            | 23 +++++++++++------------
 tests/unit/Activity/DeckProviderTest.php |  3 ---
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
index 7df0a56a4..83f689955 100644
--- a/lib/Activity/DeckProvider.php
+++ b/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,19 +96,9 @@ class DeckProvider implements IProvider {
 				'name' => $event->getObjectName(),
 				'link' => $this->deckUrl('/board/' . $event->getObjectId()),
 			];
+			$params['board'] = $board;
 		}
 
-		$author = $event->getAuthor();
-		$user = $this->userManager->get($author);
-		$params = [
-			'board' => $board,
-			'user' => [
-				'type' => 'user',
-				'id' => $author,
-				'name' => $user !== null ? $user->getDisplayName() : $author
-			],
-		];
-
 		if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
 			$card = [
 				'type' => 'highlight',
diff --git a/tests/unit/Activity/DeckProviderTest.php b/tests/unit/Activity/DeckProviderTest.php
index 971f50a7f..657dd01d5 100644
--- a/tests/unit/Activity/DeckProviderTest.php
+++ b/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,