Merge pull request #101 from tanhongit/build-core

fix: optimize code

Author: tanhongit

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "lbiltech/telegram-git-notifier-app",
-  "description": "Send notification from Gitlab and Github events to Telegram",
+  "description": "The PHP app to send notification from Gitlab and Github events to Telegram",
   "keywords": [
     "lbiltech",
     "telegram-bot",
@@ -22,7 +22,7 @@
   "require": {
     "php": "^8.0",
     "ext-json": "*",
-    "lbiltech/telegram-git-notifier": "dev-main"
+    "lbiltech/telegram-git-notifier": "^1.2.0"
   },
   "autoload": {
     "psr-4": {

public/images/github.jpeg renamed to resources/images/start.png

@@ -5,9 +5,12 @@
 use LbilTech\TelegramGitNotifier\Bot;
 use LbilTech\TelegramGitNotifier\Constants\SettingConstant;
 use LbilTech\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
+use LbilTech\TelegramGitNotifierApp\Traits\Markup;
 
 class CallbackService
 {
+    use Markup;
+
     private Bot $bot;
 
     public function __construct(Bot $bot)
@@ -42,7 +45,7 @@ public function answerBackButton(string $callback): void
                 break;
             case 'menu':
                 $view = view('tools.menu');
-                $markup = $this->menuMarkup();
+                $markup = $this->menuMarkup($this->bot->telegram);
                 break;
             default:
                 $this->bot->answerCallbackQuery('Unknown callback');
@@ -53,18 +56,4 @@ public function answerBackButton(string $callback): void
             'reply_markup' => $markup,
         ]);
     }
-
-    /**
-     * @return array[]
-     */
-    public function menuMarkup(): array
-    {
-        return [
-            [
-                $this->bot->telegram->buildInlineKeyBoardButton('🗨 Discussion', config('telegram-git-notifier.author.discussion'))
-            ], [
-                $this->bot->telegram->buildInlineKeyBoardButton('💠 Source Code', config('telegram-git-notifier.author.source_code'))
-            ]
-        ];
-    }
 }

src/Services/CallbackService.php

@@ -4,10 +4,12 @@
 
 use LbilTech\TelegramGitNotifier\Bot;
 use LbilTech\TelegramGitNotifier\Exceptions\EntryNotFoundException;
-use Telegram;
+use LbilTech\TelegramGitNotifierApp\Traits\Markup;
 
 class CommandService
 {
+    use Markup;
+
     public const MENU_COMMANDS
         = [
             [
@@ -34,22 +36,6 @@ class CommandService
             ],
         ];
 
-    /**
-     * Generate menu markup
-     *
-     * @return array[]
-     */
-    public function menuMarkup(Telegram $telegram): array
-    {
-        return [
-            [
-                $telegram->buildInlineKeyBoardButton("🗨 Discussion", config('telegram-git-notifier.author.discussion'))
-            ], [
-                $telegram->buildInlineKeyBoardButton("💠 Source Code", config('telegram-git-notifier.author.source_code'))
-            ]
-        ];
-    }
-
     /**
      * @param Bot $bot
      *

src/Services/CommandService.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace LbilTech\TelegramGitNotifierApp\Traits;
+
+use Telegram;
+
+trait Markup
+{
+    /**
+     * Generate menu markup
+     *
+     * @return array[]
+     */
+    public function menuMarkup(Telegram $telegram): array
+    {
+        return [
+            [
+                $telegram->buildInlineKeyBoardButton('🗨 Discussion', config('telegram-git-notifier.author.discussion'))
+            ], [
+                $telegram->buildInlineKeyBoardButton('💠 Source Code', config('telegram-git-notifier.author.source_code'))
+            ]
+        ];
+    }
+}