Merge pull request #1 from Jamie-Owen/override-channel

Added option to override the channel

Author: fguillot

Notification/RocketChat.php

@@ -24,10 +24,11 @@ class RocketChat extends Base implements NotificationInterface
     public function notifyUser(array $user, $event_name, array $event_data)
     {
         $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, $project, $event_name, $event_data);
+            $this->sendMessage($webhook, $channel, $project, $event_name, $event_data);
         }
     }
 
@@ -42,9 +43,10 @@ public function notifyUser(array $user, $event_name, array $event_data)
     public function notifyProject(array $project, $event_name, array $event_data)
     {
         $webhook = $this->projectMetadataModel->get($project['id'], 'rocketchat_webhook_url');
+        $channel = $this->projectMetadataModel->get($project['id'], 'rocketchat_webhook_channel');
 
         if (! empty($webhook)) {
-            $this->sendMessage($webhook, $project, $event_name, $event_data);
+            $this->sendMessage($webhook, $channel, $project, $event_name, $event_data);
         }
     }
 
@@ -88,13 +90,19 @@ public function getMessage(array $project, $event_name, array $event_data)
      *
      * @access private
      * @param  string    $webhook
+     * @param  string    $channel
      * @param  array     $project
      * @param  string    $event_name
      * @param  array     $event_data
      */
-    private function sendMessage($webhook, array $project, $event_name, array $event_data)
+    private function sendMessage($webhook, $channel, array $project, $event_name, array $event_data)
     {
         $payload = $this->getMessage($project, $event_name, $event_data);
+
+        if (! empty($channel)) {
+          $payload['channel'] = $channel;
+        }
+
         $this->httpClient->postFormAsync($webhook, $payload);
     }
 }

Plugin.php

@@ -8,7 +8,7 @@
 /**
  * RocketChat Plugin
  *
- * @package  slack
+ * @package  rocketchat
  * @author   Frederic Guillot
  */
 class Plugin extends Base
@@ -39,7 +39,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.0.2';
+        return '1.0.3';
     }
 
     public function getPluginHomepage()

README.md

@@ -39,9 +39,21 @@ Configuration
 
 - Generate a new webhook url
 - Go to **Administration > Integrations > New Integration > Incoming Webhook**
+- You can override the channel later if required
 
 ### Kanboard configuration
 
-1. Copy and paste the webhook url in **Integrations > RocketChat** (user profile or project settings)
+#### Individual notifications
+
+1. Copy and paste the webhook url into **Integrations > RocketChat** in your
+   user profile 
 2. Enable RocketChat notifications in your user profile or project settings
 3. Enjoy!
+
+#### Project notification
+
+1. Copy and paste the webhook url into **Integrations > RocketChat** in the
+   project settings
+2. Add the channel name (Optional)
+3. Enable RocketChat notification in the project
+4. Enjoy!

Template/project/integration.php

@@ -2,6 +2,9 @@
 <div class="listing">
     <?= $this->form->label(t('Webhook URL'), 'rocketchat_webhook_url') ?>
     <?= $this->form->text('rocketchat_webhook_url', $values) ?>
+
+    <?= $this->form->label(t('Channel (Optional)'), 'rocketchat_webhook_channel') ?>
+    <?= $this->form->text('rocketchat_webhook_channel', $values, array(), array('placeholder="#channel"')) ?>
     <p class="form-help"><a href="https://kanboard.net/plugin/rocketchat" target="_blank"><?= t('Help on RocketChat integration') ?></a></p>
 
     <div class="form-actions">

Template/user/integration.php

@@ -2,6 +2,10 @@
 <div class="listing">
     <?= $this->form->label(t('Webhook URL'), 'rocketchat_webhook_url') ?>
     <?= $this->form->text('rocketchat_webhook_url', $values) ?>
+
+    <?= $this->form->label(t('User (Optional)'), 'rocketchat_webhook_channel') ?>
+    <?= $this->form->text('rocketchat_webhook_channel', $values, array(), array('placeholder="@username"')) ?>
+
     <p class="form-help"><a href="https://kanboard.net/plugin/rocketchat" target="_blank"><?= t('Help on RocketChat integration') ?></a></p>
 
     <div class="form-actions">