Update Gitlab webhook

20 files changed, 95 insertions, 8 deletions

diff --git a/app/Action/CommentCreation.php b/app/Action/CommentCreation.php
index 5dfd1c89..4029c875 100644
--- a/app/Action/CommentCreation.php
+++ b/app/Action/CommentCreation.php
@@ -28,6 +28,7 @@ class CommentCreation extends Base
             BitbucketWebhook::EVENT_ISSUE_COMMENT,
             BitbucketWebhook::EVENT_COMMIT,
             GitlabWebhook::EVENT_COMMIT,
+            GitlabWebhook::EVENT_ISSUE_COMMENT,
         );
     }
 
diff --git a/app/Integration/GitlabWebhook.php b/app/Integration/GitlabWebhook.php
index dce7413a..b8925daf 100644
--- a/app/Integration/GitlabWebhook.php
+++ b/app/Integration/GitlabWebhook.php
@@ -21,14 +21,16 @@ class GitlabWebhook extends \Core\Base
     const EVENT_ISSUE_OPENED           = 'gitlab.webhook.issue.opened';
     const EVENT_ISSUE_CLOSED           = 'gitlab.webhook.issue.closed';
     const EVENT_COMMIT                 = 'gitlab.webhook.commit';
+    const EVENT_ISSUE_COMMENT          = 'gitlab.webhook.issue.commented';
 
     /**
      * Supported webhook events
      *
      * @var string
      */
-    const TYPE_PUSH  = 'push';
-    const TYPE_ISSUE = 'issue';
+    const TYPE_PUSH    = 'push';
+    const TYPE_ISSUE   = 'issue';
+    const TYPE_COMMENT = 'comment';
 
     /**
      * Project id
@@ -63,6 +65,8 @@ class GitlabWebhook extends \Core\Base
                 return $this->handlePushEvent($payload);
             case self::TYPE_ISSUE;
                 return $this->handleIssueEvent($payload);
+            case self::TYPE_COMMENT;
+                return $this->handleCommentEvent($payload);
         }
 
         return false;
@@ -77,15 +81,20 @@ class GitlabWebhook extends \Core\Base
      */
     public function getType(array $payload)
     {
-        if (isset($payload['object_kind']) && $payload['object_kind'] === 'issue') {
-            return self::TYPE_ISSUE;
+        if (empty($payload['object_kind'])) {
+            return '';
         }
 
-        if (isset($payload['commits'])) {
-            return self::TYPE_PUSH;
+        switch ($payload['object_kind']) {
+            case 'issue':
+                return self::TYPE_ISSUE;
+            case 'note':
+                return self::TYPE_COMMENT;
+            case 'push':
+                return self::TYPE_PUSH;
+            default:
+                return '';
         }
-
-        return '';
     }
 
     /**
@@ -213,4 +222,46 @@ class GitlabWebhook extends \Core\Base
 
         return false;
     }
+
+    /**
+     * Parse comment issue events
+     *
+     * @access public
+     * @param  array   $payload   Event data
+     * @return boolean
+     */
+    public function handleCommentEvent(array $payload)
+    {
+        if (! isset($payload['issue'])) {
+            return false;
+        }
+
+        $task = $this->taskFinder->getByReference($this->project_id, $payload['issue']['id']);
+
+        if (! empty($task)) {
+
+            $user = $this->user->getByUsername($payload['user']['username']);
+
+            if (! empty($user) && ! $this->projectPermission->isMember($this->project_id, $user['id'])) {
+                $user = array();
+            }
+
+            $event = array(
+                'project_id' => $this->project_id,
+                'reference' => $payload['object_attributes']['id'],
+                'comment' => $payload['object_attributes']['note']."\n\n[".t('By @%s on Gitlab', $payload['user']['username']).']('.$payload['object_attributes']['url'].')',
+                'user_id' => ! empty($user) ? $user['id'] : 0,
+                'task_id' => $task['id'],
+            );
+
+            $this->container['dispatcher']->dispatch(
+                self::EVENT_ISSUE_COMMENT,
+                new GenericEvent($event)
+            );
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index a03dcf80..c40574d9 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index d91b6cce..37f759b2 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index c8a002b1..7d5a3c56 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 4cc28369..4093947f 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index d06ee84c..558c4f4d 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -996,4 +996,6 @@ return array(
     'Remote user' => 'Utilisateur distant',
     'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => 'Les utilisateurs distants ne stockent pas leur mot de passe dans la base de données de  Kanboard, exemples : comptes LDAP, Github ou Google.',
     'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => 'Si vous cochez la case « Interdir le formulaire d\'authentification », les identifiants entrés dans le formulaire d\'authentification seront ignorés.',
+    'By @%s on Gitlab' => 'Par @%s sur Gitlab',
+    'Gitlab issue comment created' => 'Commentaire créé sur un ticket Gitlab',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index f5c234f7..5d82f3e1 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 16970d30..5493d218 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 3656e432..3ced5ea1 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 59bba39a..688f988d 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 1e825837..c61ec77c 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 2979953f..b5f4d0e0 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index fdeb5536..40e49952 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 2019beed..7a731c15 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 5c1319eb..73c94287 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index 6755c772..ae81e16a 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 49e356cc..61210ddd 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 97b15504..37bbda95 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -994,4 +994,6 @@ return array(
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
+    // 'By @%s on Gitlab' => '',
+    // 'Gitlab issue comment created' => '',
 );
diff --git a/app/Model/Action.php b/app/Model/Action.php
index d0607794..5e994c99 100644
--- a/app/Model/Action.php
+++ b/app/Model/Action.php
@@ -92,6 +92,7 @@ class Action extends Base
             GitlabWebhook::EVENT_COMMIT => t('Gitlab commit received'),
             GitlabWebhook::EVENT_ISSUE_OPENED => t('Gitlab issue opened'),
             GitlabWebhook::EVENT_ISSUE_CLOSED => t('Gitlab issue closed'),
+            GitlabWebhook::EVENT_ISSUE_COMMENT => t('Gitlab issue comment created'),
             BitbucketWebhook::EVENT_COMMIT => t('Bitbucket commit received'),
             BitbucketWebhook::EVENT_ISSUE_OPENED => t('Bitbucket issue opened'),
             BitbucketWebhook::EVENT_ISSUE_CLOSED => t('Bitbucket issue closed'),