fix: format code and update lang for bot tools

cslant · Nov 23, 2023 · 378275a · 378275a
1 parent f240240
commit 378275a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/lang/en/app.php b/lang/en/app.php
@@ -3,4 +3,5 @@
 return [
     'by' => 'by',
     'unknown_callback' => 'Unknown Callback. Something went wrong!',
+    'invalid_request' => '🤨 Invalid Request!',
 ];
diff --git a/lang/en/tools/menu.php b/lang/en/tools/menu.php
@@ -11,4 +11,7 @@
     'server' => 'To get Server Information',
     'settings' => 'Go to settings of the bot',
     'back' => 'Back',
+
+    'discussion' => '🗨 Discussion',
+    'source_code' => '💠 Source Code',
 ];
diff --git a/src/Services/CallbackService.php b/src/Services/CallbackService.php
@@ -28,8 +28,8 @@ public function __construct(Bot $bot)
      * Answer the back button.
      *
      * @param  string  $callback
-     *
      * @return void
+     *
      * @throws MessageIsEmptyException
      * @throws BotException
      * @throws CallbackException
@@ -71,6 +71,7 @@ public function answerBackButton(string $callback): void
 
     /**
      * @return void
+     *
      * @throws MessageIsEmptyException
      * @throws InvalidViewTemplateException
      * @throws BotException|CallbackException

diff --git a/src/Services/CommandService.php b/src/Services/CommandService.php
@@ -22,9 +22,9 @@ public function __construct(Bot $bot)
     }
 
     /**
-     * @param Bot $bot
-     *
+     * @param  Bot  $bot
      * @return void
+     *
      * @throws EntryNotFoundException
      */
     public function sendStartMessage(Bot $bot): void
@@ -34,13 +34,14 @@ public function sendStartMessage(Bot $bot): void
             ['first_name' => $bot->telegram->FirstName()]
         );
         $bot->sendPhoto(
-            __DIR__ . '/../../resources/images/start.png',
+            __DIR__.'/../../resources/images/start.png',
             ['caption' => $reply]
         );
     }
 
     /**
      * @return void
+     *
      * @throws EntryNotFoundException
      * @throws MessageIsEmptyException
      */
@@ -64,7 +65,7 @@ public function handle(): void
             case '/id':
             case '/usage':
             case '/server':
-                $this->bot->sendMessage(view('tools.' . trim($text, '/')));
+                $this->bot->sendMessage(view("$this->viewNamespace::tools.".trim($text, '/')));
 
                 break;
             case '/settings':
@@ -76,7 +77,7 @@ public function handle(): void
 
                 break;
             default:
-                $this->bot->sendMessage('🤨 Invalid Request!');
+                $this->bot->sendMessage(__('tg-notifier::app.invalid_request'));
         }
     }
 

diff --git a/src/Traits/Markup.php b/src/Traits/Markup.php
@@ -7,17 +7,17 @@
 trait Markup
 {
     /**
-     * Generate menu markup
+     * Generate menu markup.
      *
      * @return array[]
      */
     public function menuMarkup(Telegram $telegram): array
     {
         return [
             [
-                $telegram->buildInlineKeyBoardButton('🗨 Discussion', config('telegram-git-notifier.author.discussion')),
+                $telegram->buildInlineKeyBoardButton(__('tg-notifier::tools/menu.discussion'), config('telegram-git-notifier.author.discussion')),
             ], [
-                $telegram->buildInlineKeyBoardButton('💠 Source Code', config('telegram-git-notifier.author.source_code')),
+                $telegram->buildInlineKeyBoardButton(__('tg-notifier::tools/menu.source_code'), config('telegram-git-notifier.author.source_code')),
             ],
         ];
     }