Merge pull request #94 from tanhongit/feature/gitlab-combine

Feature/gitlab combine

config/jsons/gitlab-event.json

@@ -10,8 +10,8 @@
   "note": {
     "issue": true,
     "merge_request": true,
-    "snippet": false,
-    "commit": false
+    "commit": false,
+    "snippet": false
   },
   "merge_request": {
     "open": true,
@@ -33,9 +33,5 @@
   "release": {
     "create": true,
     "update": false
-  },
-  "emoji": {
-    "award": true,
-    "revoke": false
   }
 }

resources/events/gitlab/note/commit.php

@@ -1,3 +1,14 @@
+<?php
+/**
+ * @var $payload mixed
+ */
 
+$message = "💬 <b>New Comment on Commit</b> - 🦊<a href=\"{$payload->object_attributes->url}\">{$payload->project->path_with_namespace}</a> by <b>{$payload->user->name}</b>\n\n";
 
-// comment issue in gitlab
+$message .= "⚙️ <b>{$payload->commit->message}</b> \n\n";
+
+$message .= "🔗 View Comment: <a href=\"{$payload->object_attributes->url}\">{$payload->commit->id}</a> \n\n";
+
+$message .= require __DIR__ . '/../../shared/partials/gitlab/_body.php';
+
+echo $message;

resources/events/gitlab/note/issue.php

@@ -5,7 +5,7 @@
 
 $message = "💬 <b>New Comment on Issue</b> - 🦊<a href=\"{$payload->object_attributes->url}\">{$payload->project->path_with_namespace}#{$payload->issue->iid}</a> by <b>{$payload->user->name}</b>\n\n";
 
-$message .= "📢 <b>{$payload->issue->title}</b> \n";
+$message .= "📢 <b>{$payload->issue->title}</b> \n\n";
 
 $message .= require __DIR__ . '/../../shared/partials/gitlab/_body.php';
 

resources/events/gitlab/note/snippet.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * @var $payload mixed
+ */
+
+$message = "💬 <b>New Comment on Snippet</b> - 🦊<a href=\"{$payload->object_attributes->url}\">{$payload->project->path_with_namespace}</a> by <b>{$payload->user->name}</b>\n\n";
+
+$message .= "📝 <b>{$payload->snippet->title}</b> \n\n";
+
+$message .= "🔗 <a href=\"{$payload->object_attributes->url}\">View Comment</a> \n\n";
+
+$message .= require __DIR__ . '/../../shared/partials/gitlab/_body.php';
+
+echo $message;

src/Services/EventService.php

@@ -70,7 +70,7 @@ public function getActionOfEvent($payload): string
             ?? '';
 
         if (!empty($action)) {
-            return ($action);
+            return convert_action_name($action);
         }
 
         return '';