Fix bug concerning task overdue events

Author: fguillot

.travis.yml

@@ -2,6 +2,7 @@ language: php
 sudo: false
 
 php:
+  - 7.1
   - 7.0
   - 5.6
   - 5.5

Notification/Jabber.php

@@ -9,6 +9,7 @@
 use Fabiang\Xmpp\Protocol\Presence;
 use Kanboard\Core\Base;
 use Kanboard\Core\Notification\NotificationInterface;
+use Kanboard\Model\TaskModel;
 
 /**
  * Jabber Notification
@@ -23,24 +24,23 @@ class Jabber 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)
     {
         try {
             $jid = $this->userMetadataModel->get($user['id'], 'jabber_jid');
 
             if (! empty($jid)) {
-                $project = $this->projectModel->getById($event_data['task']['project_id']);
-                $client = $this->getClient();
-
-                $message = new Message;
-                $message->setMessage($this->getMessage($project, $event_name, $event_data))
-                        ->setTo($jid);
-
-                $client->send($message);
-                $client->disconnect();
+                if ($eventName === TaskModel::EVENT_OVERDUE) {
+                    foreach ($eventData['tasks'] as $task) {
+                        $eventData['task'] = $task;
+                        $this->sendDirectMessage($jid, $eventName, $eventData);
+                    }
+                } else {
+                    $this->sendDirectMessage($jid, $eventName, $eventData);
+                }
             }
 
         } catch (Exception $e) {
@@ -53,23 +53,23 @@ 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)
     {
         try {
             $room = $this->projectMetadataModel->get($project['id'], 'jabber_room');
 
             if (! empty($room)) {
                 $client = $this->getClient();
 
-                $channel = new Presence;
+                $channel = new Presence();
                 $channel->setTo($room)->setNickname($this->configModel->get('jabber_nickname'));
                 $client->send($channel);
 
-                $message = new Message;
-                $message->setMessage($this->getMessage($project, $event_name, $event_data))
+                $message = new Message();
+                $message->setMessage($this->getMessage($project, $eventName, $eventData))
                         ->setTo($room)
                         ->setType(Message::TYPE_GROUPCHAT);
 
@@ -127,4 +127,24 @@ public function getMessage(array $project, $event_name, array $event_data)
 
         return $payload;
     }
+
+    /**
+     * Send XMPP message to someone
+     *
+     * @param $jid
+     * @param $eventName
+     * @param $eventData
+     */
+    public function sendDirectMessage($jid, $eventName, $eventData)
+    {
+        $project = $this->projectModel->getById($eventData['task']['project_id']);
+        $client = $this->getClient();
+
+        $message = new Message();
+        $message->setMessage($this->getMessage($project, $eventName, $eventData))
+            ->setTo($jid);
+
+        $client->send($message);
+        $client->disconnect();
+    }
 }

Plugin.php

@@ -42,7 +42,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.0.6';
+        return '1.0.7';
     }
 
     public function getPluginHomepage()

README.md

@@ -14,7 +14,7 @@ Author
 Requirements
 ------------
 
-- Kanboard >= 1.0.29
+- Kanboard >= 1.0.37
 - XMPP server
 
 Installation
@@ -56,3 +56,10 @@ Go to **Settings > Integrations > Jabber** and fill the form:
 
 - Enable the debug mode
 - All connection errors with the XMPP server are recorded in the log files `data/debug.log` or syslog
+
+Changes
+-------
+
+### Version 1.0.7
+
+- Fix bug concerning task overdue events