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

Fix comment activity entry

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-12-04 11:42:26 +01:00
parent 3b403d5576
commit 8499318928
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Activity/ActivityManager.php
View File

@@ -322,11 +322,13 @@ class ActivityManager {
// case self::SUBJECT_BOARD_UPDATE_COLOR // case self::SUBJECT_BOARD_UPDATE_COLOR
break; break;
case self::SUBJECT_CARD_COMMENT_CREATE: case self::SUBJECT_CARD_COMMENT_CREATE:
/** @var IComment $entity */ $subjectParams = $this->findDetailsForCard($entity->getId());
$subjectParams = [ if (array_key_exists('comment', $additionalParams)) {
'comment' => $entity->getMessage() /** @var IComment $entity */
]; $comment = $additionalParams['comment'];
$message = '{comment}'; $subjectParams['comment'] = $comment->getId();
unset($additionalParams['comment']);
}
break; break;
case self::SUBJECT_STACK_CREATE: case self::SUBJECT_STACK_CREATE:

12
lib/Activity/CommentEventHandler.php
View File

@@ -23,8 +23,10 @@
namespace OCA\Deck\Activity; namespace OCA\Deck\Activity;
use OCA\Deck\Db\CardMapper;
use OCA\Deck\Notification\NotificationHelper; use OCA\Deck\Notification\NotificationHelper;
use OCP\Comments\CommentsEvent; use OCP\Comments\CommentsEvent;
use OCP\Comments\IComment;
use \OCP\Comments\ICommentsEventHandler; use \OCP\Comments\ICommentsEventHandler;
class CommentEventHandler implements ICommentsEventHandler { class CommentEventHandler implements ICommentsEventHandler {
@@ -35,9 +37,13 @@ class CommentEventHandler implements ICommentsEventHandler {
/** @var NotificationHelper */ /** @var NotificationHelper */
private $notificationHelper; private $notificationHelper;
public function __construct(ActivityManager $activityManager, NotificationHelper $notificationHelper) { /** @var CardMapper */
private $cardMapper;
public function __construct(ActivityManager $activityManager, NotificationHelper $notificationHelper, CardMapper $cardMapper) {
$this->notificationHelper = $notificationHelper; $this->notificationHelper = $notificationHelper;
$this->activityManager = $activityManager; $this->activityManager = $activityManager;
$this->cardMapper = $cardMapper;
} }
/** /**
@@ -71,8 +77,10 @@ class CommentEventHandler implements ICommentsEventHandler {
* @param CommentsEvent $event * @param CommentsEvent $event
*/ */
private function activityHandler(CommentsEvent $event) { private function activityHandler(CommentsEvent $event) {
/** @var IComment $comment */
$comment = $event->getComment(); $comment = $event->getComment();
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $comment, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => $comment->getId()]); $card = $this->cardMapper->find($comment->getObjectId());
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => $comment]);
} }