Merge pull request #91 from tanhongit/main

tanhongit · web-flow · commit a814d6378cbd · 2023-08-24T23:47:30.000+07:00
Feature: Gitlab combine
diff --git a/common/helpers.php b/common/helpers.php
@@ -1,8 +1,6 @@
 <?php
 
 use TelegramNotificationBot\App\Helpers\ConfigHelper;
-use TelegramNotificationBot\App\Models\Event as EventModel;
-use TelegramNotificationBot\App\Models\Setting as SettingModel;
 
 if (!function_exists('config')) {
     /**
diff --git a/composer.json b/composer.json
@@ -53,18 +53,10 @@
   },
   "scripts": {
     "post-install-cmd": [
-      "php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
-      "php -r \"file_exists('storage/json/github-event.json') || copy('config/jsons/github-event.json', 'storage/json/github-event.json');\"",
-      "php -r \"file_exists('storage/json/gitlab-event.json') || copy('config/jsons/gitlab-event.json', 'storage/json/gitlab-event.json');\"",
-      "php -r \"file_exists('storage/json/tg-setting.json') || copy('config/jsons/tg-setting.json', 'storage/json/tg-setting.json');\"",
-      "chmod -R 777 storage/json/*.json"
+      "bash ./install.sh"
     ],
     "post-update-cmd": [
-      "php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
-      "php -r \"file_exists('storage/json/github-event.json') || copy('config/jsons/github-event.json', 'storage/json/github-event.json');\"",
-      "php -r \"file_exists('storage/json/gitlab-event.json') || copy('config/jsons/gitlab-event.json', 'storage/json/gitlab-event.json');\"",
-      "php -r \"file_exists('storage/json/tg-setting.json') || copy('config/jsons/tg-setting.json', 'storage/json/tg-setting.json');\"",
-      "chmod -R 777 storage/json/*.json"
+      "bash ./install.sh"
     ]
   }
 }
diff --git a/config/jsons/gitlab-event.json b/config/jsons/gitlab-event.json
@@ -1,6 +1,6 @@
 {
   "push": true,
-  "tag_push": false,
+  "tag_push": true,
   "issue": {
     "open": true,
     "close": true,
diff --git a/install.sh b/install.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ ! -f .env ]; then
+    cp .env.example .env
+fi
+
+json_files=(
+    "github-event.json"
+    "gitlab-event.json"
+    "tg-setting.json"
+)
+
+for file in "${json_files[@]}"; do
+    if [ ! -f "storage/json/$file" ]; then
+        cp "config/jsons/$file" "storage/json/$file"
+    fi
+done
+
+chmod -R 777 storage/json/*.json
diff --git a/resources/events/github/issue_comment/created.php b/resources/events/github/issue_comment/created.php
@@ -9,8 +9,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issue_comment/deleted.php b/resources/events/github/issue_comment/deleted.php
@@ -9,8 +9,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issue_comment/edited.php b/resources/events/github/issue_comment/edited.php
@@ -9,8 +9,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issues/closed.php b/resources/events/github/issues/closed.php
@@ -7,8 +7,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issues/deleted.php b/resources/events/github/issues/deleted.php
@@ -7,6 +7,6 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
 echo $message;
diff --git a/resources/events/github/issues/edited.php b/resources/events/github/issues/edited.php
@@ -7,7 +7,7 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
 if (isset($payload->changes->title)) {
     $message .= "📖 <b>Title</b> has been changed\n";
diff --git a/resources/events/github/issues/locked.php b/resources/events/github/issues/locked.php
@@ -7,8 +7,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issues/opened.php b/resources/events/github/issues/opened.php
@@ -7,8 +7,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issues/pinned.php b/resources/events/github/issues/pinned.php
@@ -7,8 +7,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issues/reopened.php b/resources/events/github/issues/reopened.php
@@ -7,8 +7,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issues/unlocked.php b/resources/events/github/issues/unlocked.php
@@ -7,8 +7,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/issues/unpinned.php b/resources/events/github/issues/unpinned.php
@@ -7,8 +7,8 @@
 
 $message .= "📢 <b>{$payload->issue->title}</b>\n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/pull_request/closed.php b/resources/events/github/pull_request/closed.php
@@ -14,10 +14,10 @@
 
 $message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
 $message .= require __DIR__ . '/partials/_reviewers.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/pull_request/opened.php b/resources/events/github/pull_request/opened.php
@@ -9,10 +9,10 @@
 
 $message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
 $message .= require __DIR__ . '/partials/_reviewers.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/github/pull_request/reopened.php b/resources/events/github/pull_request/reopened.php
@@ -9,10 +9,10 @@
 
 $message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
 
-$message .= require __DIR__ . '/../../../shared/partials/_assignees.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_assignees.php';
 
 $message .= require __DIR__ . '/partials/_reviewers.php';
 
-$message .= require __DIR__ . '/../../../shared/partials/_body.php';
+$message .= require __DIR__ . '/../../../shared/partials/github/_body.php';
 
 echo $message;
diff --git a/resources/events/gitlab/issue/close.php b/resources/events/gitlab/issue/close.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @var $payload mixed
+ */
+
+$message = "🚫 <b>Issue Closed </b> to 🦊<a href=\"{$payload->object_attributes->url}\">{$payload->project->path_with_namespace}#{$payload->object_attributes->id}</a> by <b>{$payload->user->name}</b>\n\n";
+
+$message .= "📢 <b>{$payload->object_attributes->title}</b>\n";
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_assignees.php';
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_body.php';
+
+echo $message;
diff --git a/resources/events/gitlab/issue/open.php b/resources/events/gitlab/issue/open.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @var $payload mixed
+ */
+
+$message = "⚠️ <b>New Issue</b> to 🦊<a href=\"{$payload->object_attributes->url}\">{$payload->project->path_with_namespace}#{$payload->object_attributes->id}</a> created by <b>{$payload->user->name}</b>\n\n";
+
+$message .= "📢 <b>{$payload->object_attributes->title}</b>\n";
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_assignees.php';
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_body.php';
+
+echo $message;
diff --git a/resources/events/gitlab/issue/reopen.php b/resources/events/gitlab/issue/reopen.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @var $payload mixed
+ */
+
+$message = "⚠️ <b>Issue has been reopened</b> ⚠️ to 🦊<a href=\"{$payload->object_attributes->url}\">{$payload->project->path_with_namespace}#{$payload->object_attributes->id}</a> by <b>{$payload->user->name}</b>\n\n";
+
+$message .= "📢 <b>{$payload->object_attributes->title}</b>\n";
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_assignees.php';
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_body.php';
+
+echo $message;
diff --git a/resources/events/gitlab/issue/update.php b/resources/events/gitlab/issue/update.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @var $payload mixed
+ */
+
+$message = "⚠️ <b>Issue has been edited</b> to 🦊<a href=\"{$payload->object_attributes->url}\">{$payload->project->path_with_namespace}#{$payload->object_attributes->id}</a> by <b>{$payload->user->name}</b>\n\n";
+
+$message .= "📢 <b>{$payload->object_attributes->title}</b>\n";
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_assignees.php';
+
+$message .= require __DIR__ . '/../../../shared/partials/gitlab/_body.php';
+
+echo $message;
diff --git a/resources/events/gitlab/tag_push/default.php b/resources/events/gitlab/tag_push/default.php
@@ -6,9 +6,11 @@
 $ref = explode('/', $payload->ref);
 $tag = implode('/', array_slice($ref, 2));
 
-$message = "⚙️ <b>A new tag has been pushed to the project</b> - 🦊<a href=\"{$payload->project->web_url}\">{$payload->project->path_with_namespace}</a>\n\n";
+$tagUrl = $payload->project->web_url . '/tags/' . $tag;
 
-$message .= "🔖 <b>{$tag}</b>\n\n";
+$message = "⚙️ <b>A new tag has been pushed to the project</b> 🦊<a href=\"{$payload->project->web_url}\">{$payload->project->path_with_namespace}</a>\n\n";
+
+$message .= "🔖 Tag: <a href=\"{$tagUrl}\">{$tag}</a>\n\n";
 
 $message .= "👤 Pushed by : <b>{$payload->user_name}</b>\n";
 
diff --git a/resources/shared/partials/github/_assignees.php b/resources/shared/partials/github/_assignees.php
diff --git a/resources/shared/partials/github/_body.php b/resources/shared/partials/github/_body.php
diff --git a/resources/shared/partials/gitlab/_assignees.php b/resources/shared/partials/gitlab/_assignees.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @var $payload mixed
+ * @var $event string
+ */
+
+if (isset($event) && isset($payload) && !empty($payload->assignees)) {
+    $assigneeText = "🙋 Assignee: ";
+    $assigneeArray = [];
+    foreach ($payload->assignees as $assignee) {
+        $assigneeArray[] = "<b>{$assignee->name}</b>";
+    }
+    $assigneeText .= implode(', ', $assigneeArray) . "\n";
+}
+
+return $assigneeText ?? '';
diff --git a/resources/shared/partials/gitlab/_body.php b/resources/shared/partials/gitlab/_body.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @var $payload mixed
+ */
+
+if (isset($event) && isset($payload) && !empty($payload->object_attributes->description)) {
+    $body = $payload->object_attributes->description;
+    if (strlen($body) > 50) {
+        $body = substr($body, 0, 50) . '...';
+    }
+    return "📖 <b>Content:</b>\n{$body}";
+}
+
+return '';
diff --git a/resources/tools/custom_events.php b/resources/tools/custom_events.php
@@ -1,4 +1,14 @@
-Go to check the <a href="https://docs.github.com/en/developers/webhooks-and-events/webhook-events-and-payloads">GitHub documentation</a> for more information about events.
+<?php
+/**
+ * @var $platform string
+ */
+
+$docsUrl = 'https://docs.github.com/en/developers/webhooks-and-events/webhook-events-and-payloads';
+if ($platform === 'gitlab') {
+    $docsUrl = 'https://docs.gitlab.com/ee/user/project/integrations/webhooks.html';
+}
+?>
+Go to check the <a href="<?= $docsUrl ?>"><?= $platform ?> documentation</a> for more information about events.
 ---
 <b>Click and configure child events if the option has the ⚙ icon.</b>
 And select an event to enable or disable notifications:
diff --git a/resources/tools/start.php b/resources/tools/start.php
@@ -8,5 +8,5 @@
 
 Hey <b><?= $first_name ?></b>,
 
-I can send you notifications from your GitHub or GitLab Repository instantly to your Telegram.
+I can send you notifications from your 🦑<b>GitHub</b> or 🦊<b>GitLab</b> Repository instantly to your Telegram.
 Use /menu for more options.
diff --git a/resources/tools/usage.php b/resources/tools/usage.php
@@ -1,4 +1,4 @@
-<b>Adding webhook (Website Address) to your GitHub repository</b>
+<b>Adding webhook (Web Address) to GitHub repositories</b> 🦑
 
 1) Redirect to <i>Repository Settings->Webhooks->Add Webhook</i>.
 2) Set your Payload URL.
@@ -8,7 +8,7 @@
 5) Check <code>Active</code> checkbox. And click <code>Add Webhook</code>.
 
 ----------
-<b>Adding webhook (Website Address) to your GitLab repository</b>
+<b>Adding webhook (Web Address) to GitLab repositories</b> 🦊
 
 1) Redirect to <i>Repository Settings->Webhooks->Add new webhook</i>.
 2) Set your Payload URL.
diff --git a/src/Http/Actions/SendNotifyAction.php b/src/Http/Actions/SendNotifyAction.php
diff --git a/src/Models/Event.php b/src/Models/Event.php
diff --git a/src/Models/Setting.php b/src/Models/Setting.php
diff --git a/src/Services/EventService.php b/src/Services/EventService.php
diff --git a/src/Services/NotificationService.php b/src/Services/NotificationService.php
diff --git a/src/Services/SettingService.php b/src/Services/SettingService.php
diff --git a/src/Services/TelegramService.php b/src/Services/TelegramService.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"push": true,`
`3`		`- "tag_push": false,`
	`3`	`+ "tag_push": true,`
`4`	`4`	`"issue": {`
`5`	`5`	`"open": true,`
`6`	`6`	`"close": true,`