ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove card parameter when it's null

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling
2018-11-23 12:30:55 +01:00
parent 223523005d
commit d28bf74c73
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Activity/DeckProvider.php
View File

@@ -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) { if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
$card = [ $card = [
'type' => 'highlight', 'type' => 'highlight',
@@ -101,20 +111,9 @@ class DeckProvider implements IProvider {
$archivedParam = $subjectParams['card']['archived'] ? 'archived' : ''; $archivedParam = $subjectParams['card']['archived'] ? 'archived' : '';
$card['link'] = $this->deckUrl('/board/' . $subjectParams['board']['id'] . '/' . $archivedParam . '/card/' . $event->getObjectId()); $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->parseParamForBoard('board', $subjectParams, $params);
$params = $this->parseParamForStack('stack', $subjectParams, $params); $params = $this->parseParamForStack('stack', $subjectParams, $params);
$params = $this->parseParamForStack('stackBefore', $subjectParams, $params); $params = $this->parseParamForStack('stackBefore', $subjectParams, $params);