Handle overdue notifications

kanboard · Dec 31, 2016 · 25ff9df · 25ff9df
1 parent d79a70c
commit 25ff9df
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/Notification/RocketChat.php b/Notification/RocketChat.php
@@ -4,6 +4,7 @@
 
 use Kanboard\Core\Base;
 use Kanboard\Core\Notification\NotificationInterface;
+use Kanboard\Model\TaskModel;
 
 /**
  * RocketChat Notification
@@ -18,17 +19,25 @@ class RocketChat extends Base implements NotificationInterface
      *
      * @access public
      * @param  array     $user
-     * @param  string    $event_name
-     * @param  array     $event_data
+     * @param  string    $eventName
+     * @param  array     $eventData
      */
-    public function notifyUser(array $user, $event_name, array $event_data)
+    public function notifyUser(array $user, $eventName, array $eventData)
     {
         $webhook = $this->userMetadataModel->get($user['id'], 'rocketchat_webhook_url');
         $channel = $this->userMetadataModel->get($user['id'], 'rocketchat_webhook_channel');
 
         if (! empty($webhook)) {
-            $project = $this->projectModel->getById($event_data['task']['project_id']);
-            $this->sendMessage($webhook, $channel, $project, $event_name, $event_data);
+            if ($eventName === TaskModel::EVENT_OVERDUE) {
+                foreach ($eventData['tasks'] as $task) {
+                    $project = $this->projectModel->getById($task['project_id']);
+                    $eventData['task'] = $task;
+                    $this->sendMessage($webhook, $channel, $project, $eventName, $eventData);
+                }
+            } else {
+                $project = $this->projectModel->getById($eventData['task']['project_id']);
+                $this->sendMessage($webhook, $channel, $project, $eventName, $eventData);
+            }
         }
     }
 
@@ -37,16 +46,16 @@ public function notifyUser(array $user, $event_name, array $event_data)
      *
      * @access public
      * @param  array     $project
-     * @param  string    $event_name
-     * @param  array     $event_data
+     * @param  string    $eventName
+     * @param  array     $eventData
      */
-    public function notifyProject(array $project, $event_name, array $event_data)
+    public function notifyProject(array $project, $eventName, array $eventData)
     {
         $webhook = $this->projectMetadataModel->get($project['id'], 'rocketchat_webhook_url');
         $channel = $this->projectMetadataModel->get($project['id'], 'rocketchat_webhook_channel');
 
         if (! empty($webhook)) {
-            $this->sendMessage($webhook, $channel, $project, $event_name, $event_data);
+            $this->sendMessage($webhook, $channel, $project, $eventName, $eventData);
         }
     }
 
@@ -55,26 +64,26 @@ public function notifyProject(array $project, $event_name, array $event_data)
      *
      * @access public
      * @param  array     $project
-     * @param  string    $event_name
-     * @param  array     $event_data
-     * @return string
+     * @param  string    $eventName
+     * @param  array     $eventData
+     * @return array
      */
-    public function getMessage(array $project, $event_name, array $event_data)
+    public function getMessage(array $project, $eventName, array $eventData)
     {
         if ($this->userSession->isLogged()) {
             $author = $this->helper->user->getFullname();
-            $title = $this->notificationModel->getTitleWithAuthor($author, $event_name, $event_data);
+            $title = $this->notificationModel->getTitleWithAuthor($author, $eventName, $eventData);
         } else {
-            $title = $this->notificationModel->getTitleWithoutAuthor($event_name, $event_data);
+            $title = $this->notificationModel->getTitleWithoutAuthor($eventName, $eventData);
         }
 
         $message = '*['.$project['name'].']* ';
         $message .= $title;
-        $message .= ' ('.$event_data['task']['title'].')';
+        $message .= ' ('.$eventData['task']['title'].')';
 
         if ($this->configModel->get('application_url') !== '') {
             $message .= ' - <';
-            $message .= $this->helper->url->to('TaskViewController', 'show', array('task_id' => $event_data['task']['id'], 'project_id' => $project['id']), '', true);
+            $message .= $this->helper->url->to('TaskViewController', 'show', array('task_id' => $eventData['task']['id'], 'project_id' => $project['id']), '', true);
             $message .= '|'.t('view the task on Kanboard').'>';
         }
 
@@ -92,12 +101,12 @@ public function getMessage(array $project, $event_name, array $event_data)
      * @param  string    $webhook
      * @param  string    $channel
      * @param  array     $project
-     * @param  string    $event_name
-     * @param  array     $event_data
+     * @param  string    $eventName
+     * @param  array     $eventData
      */
-    private function sendMessage($webhook, $channel, array $project, $event_name, array $event_data)
+    private function sendMessage($webhook, $channel, array $project, $eventName, array $eventData)
     {
-        $payload = $this->getMessage($project, $event_name, $event_data);
+        $payload = $this->getMessage($project, $eventName, $eventData);
 
         if (! empty($channel)) {
           $payload['channel'] = $channel;

diff --git a/Plugin.php b/Plugin.php
@@ -39,7 +39,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.0.3';
+        return '1.0.4';
     }
 
     public function getPluginHomepage()