Fix/update Gitlab event template

README.md

@@ -16,7 +16,7 @@
 
 ## 📝 Introduction
 
-Laravel Telegram Git Notifier is a package that allows you to create a Telegram bot to receive notifications from GitHub
+Laravel Telegram Git Notifier is a Laravel package that allows you to create a Telegram bot to receive notifications from GitHub
 or GitLab events and manage customization through messages and buttons on Telegram.
 
 - Send notifications of your GitHub/GitLab repositories to Telegram Bots, Groups, Super Groups (Multiple Topics), and
@@ -58,13 +58,12 @@ information.
 - [x] Issue Comment
 - [x] Pull Request
 - [x] Pull Request Review
-- [x] Pull Request Review Comment
 - [x] Fork
 - [x] Commit Comment
 - [x] Deployment
 - [x] Deployment Status
 - [x] Fork
-- [x] Gollum
+- [x] Workflow
 - [x] Watch
 
   ... and more events can be seen in the [all GitHub events available](https://docs.cslant.com/telegram-git-notifier/prologue/event-availability/github)

lang/de/app.php

@@ -3,5 +3,5 @@
 return [
     'by' => 'by',
     'unknown_callback' => 'Unknown Callback. Something went wrong!',
-    'invalid_request' => '🤨 Invalid Request!',
+    'invalid_request' => 'Invalid Request!',
 ];

lang/de/events/gitlab/tag_push.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
-    'name' => '🔖 <b>Tag Name</b>: :tag_name',
-    'pusher' => '👤 Pushed by: <b>:pusher</b>',
+    'title' => '<b>A new tag has been pushed to the project</b> :repo',
+    'name' => '<b>Tag Name</b>: :tag_name',
+    'pusher' => ' Pushed by',
 ];

lang/de/events/gitlab/wiki_page.php

@@ -2,9 +2,9 @@
 
 return [
     'title' => [
-        'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
-        'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
-        'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
+        'create' => '<b>Wiki Page Created</b> - :repo by :user',
+        'update' => '<b>Wiki Page Updated</b> - :repo by :user',
+        'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
     ],
-    'name' => '📝 Page Name: <b>:name</b>',
+    'name' => 'Page Name',
 ];

lang/de/events/shared/gitlab.php

@@ -2,7 +2,7 @@
 
 return [
     '_body' => [
-        'title' => '📖 <b>Content:</b>',
+        'title' => 'Content',
     ],
     '_assignee' => [
         'title' => '🙋 Assignee: ',

lang/en/app.php

@@ -3,5 +3,5 @@
 return [
     'by' => 'by',
     'unknown_callback' => 'Unknown Callback. Something went wrong!',
-    'invalid_request' => '🤨 Invalid Request!',
+    'invalid_request' => 'Invalid Request!',
 ];

lang/en/events/gitlab/tag_push.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
-    'name' => '🔖 <b>Tag Name</b>: :tag_name',
-    'pusher' => '👤 Pushed by: <b>:pusher</b>',
+    'title' => '<b>A new tag has been pushed to the project</b> :repo',
+    'name' => '<b>Tag Name</b>: :tag_name',
+    'pusher' => ' Pushed by',
 ];

lang/en/events/gitlab/wiki_page.php

@@ -2,9 +2,9 @@
 
 return [
     'title' => [
-        'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
-        'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
-        'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
+        'create' => '<b>Wiki Page Created</b> - :repo by :user',
+        'update' => '<b>Wiki Page Updated</b> - :repo by :user',
+        'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
     ],
-    'name' => '📝 Page Name: <b>:name</b>',
+    'name' => 'Page Name',
 ];

lang/en/events/shared/gitlab.php

@@ -2,7 +2,7 @@
 
 return [
     '_body' => [
-        'title' => '📖 <b>Content:</b>',
+        'title' => 'Content',
     ],
     '_assignee' => [
         'title' => '🙋 Assignee: ',

lang/ja/app.php

@@ -3,5 +3,5 @@
 return [
     'by' => 'by',
     'unknown_callback' => 'Unknown Callback. Something went wrong!',
-    'invalid_request' => '🤨 Invalid Request!',
+    'invalid_request' => 'Invalid Request!',
 ];

lang/ja/events/gitlab/tag_push.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
-    'name' => '🔖 <b>Tag Name</b>: :tag_name',
-    'pusher' => '👤 Pushed by: <b>:pusher</b>',
+    'title' => '<b>A new tag has been pushed to the project</b> :repo',
+    'name' => '<b>Tag Name</b>: :tag_name',
+    'pusher' => ' Pushed by',
 ];

lang/ja/events/gitlab/wiki_page.php

@@ -2,9 +2,9 @@
 
 return [
     'title' => [
-        'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
-        'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
-        'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
+        'create' => '<b>Wiki Page Created</b> - :repo by :user',
+        'update' => '<b>Wiki Page Updated</b> - :repo by :user',
+        'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
     ],
-    'name' => '📝 Page Name: <b>:name</b>',
+    'name' => 'Page Name',
 ];

lang/ja/events/shared/gitlab.php

@@ -2,7 +2,7 @@
 
 return [
     '_body' => [
-        'title' => '📖 <b>Content:</b>',
+        'title' => 'Content',
     ],
     '_assignee' => [
         'title' => '🙋 Assignee: ',

lang/vi/app.php

@@ -3,5 +3,5 @@
 return [
     'by' => 'bởi',
     'unknown_callback' => 'Callback không xác định. Đã xảy ra lỗi!',
-    'invalid_request' => '🤨 Yêu cầu không hợp lệ!',
+    'invalid_request' => 'Yêu cầu không hợp lệ!',
 ];

lang/vi/events/gitlab/tag_push.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
-    'name' => '🔖 <b>Tag Name</b>: :tag_name',
-    'pusher' => '👤 Pushed by: <b>:pusher</b>',
+    'title' => '<b>A new tag has been pushed to the project</b> :repo',
+    'name' => '<b>Tag Name</b>: :tag_name',
+    'pusher' => ' Pushed by',
 ];

lang/vi/events/gitlab/wiki_page.php

@@ -2,9 +2,9 @@
 
 return [
     'title' => [
-        'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
-        'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
-        'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
+        'create' => '<b>Wiki Page Created</b> - :repo by :user',
+        'update' => '<b>Wiki Page Updated</b> - :repo by :user',
+        'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
     ],
-    'name' => '📝 Page Name: <b>:name</b>',
+    'name' => 'Page Name',
 ];

lang/vi/events/shared/gitlab.php

@@ -2,9 +2,9 @@
 
 return [
     '_body' => [
-        'title' => '📖 <b>Nội dung:</b>',
+        'title' => 'Content',
     ],
     '_assignee' => [
-        'title' => '🙋 Người được giao: ',
+        'title' => '🙋 Assignee: ',
     ],
 ];

resources/views/events/gitlab/tag_push/default.blade.php

@@ -8,14 +8,9 @@
 $tagUrl = $payload->project->web_url.'/tags/'.$tag;
 ?>
 
-{!! __('tg-notifier::events/gitlab/tag_push.title', [
-       'repo' => "<a href='{$payload->project->web_url}'>{$payload->project->path_with_namespace}</a>",
+⚙️ {!! __('tg-notifier::events/gitlab/tag_push.title', [
+       'repo' => "🦊<a href='{$payload->project->web_url}'>{$payload->project->path_with_namespace}</a>",
    ]) !!}
 
-{!! __('tg-notifier::events/gitlab/tag_push.name', [
-       'tag_name' => "<a href='{$tagUrl}'>{$tag}</a>",
-   ]) !!}
-
-{!! __('tg-notifier::events/gitlab/tag_push.pusher', [
-       'pusher' => "<b>{$payload->user_name}</b>",
-   ]) !!}
+🔖 <b>{!! __('tg-notifier::events/gitlab/tag_push.name') !!}</b>: <a href='{{ $tagUrl }}'>{{ $tag }}</a>
+👤 {!! __('tg-notifier::events/gitlab/tag_push.pusher') !!}: <code>{{ $payload->user_name }}</code>

resources/views/events/gitlab/wiki_page/create.blade.php

@@ -5,13 +5,11 @@
  */
 
 ?>
-{!! __('tg-notifier::events/gitlab/wiki_page.title.create', [
-       'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
-       'user' => "<b>{$payload->user->name}</b>"
+📒 {!! __('tg-notifier::events/gitlab/wiki_page.title.create', [
+       'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
+       'user' => "<code>{$payload->user->name}</code>"
    ]) !!}
 
-{!! __('tg-notifier::events/gitlab/wiki_page.name', [
-       'name' => "<b>{$payload->object_attributes->title}</b>"
-   ]) !!}
+📝 {!! __('tg-notifier::events/gitlab/wiki_page.name') !!}: <code>{{ $payload->object_attributes->title }}</code>
 
 @include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

resources/views/events/gitlab/wiki_page/delete.blade.php

@@ -5,13 +5,11 @@
  */
 
 ?>
-{!! __('tg-notifier::events/gitlab/wiki_page.title.delete', [
-       'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
-       'user' => "<b>{$payload->user->name}</b>"
+🗑 {!! __('tg-notifier::events/gitlab/wiki_page.title.delete', [
+       'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
+       'user' => "<code>{$payload->user->name}</code>"
    ]) !!}
 
-{!! __('tg-notifier::events/gitlab/wiki_page.name', [
-       'name' => "<b>{$payload->object_attributes->title}</b>"
-   ]) !!}
+📝 {!! __('tg-notifier::events/gitlab/wiki_page.name') !!}: <code>{{ $payload->object_attributes->title }}</code>
 
 @include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

resources/views/events/gitlab/wiki_page/update.blade.php

@@ -5,13 +5,11 @@
  */
 
 ?>
-{!! __('tg-notifier::events/gitlab/wiki_page.title.update', [
-       'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
-       'user' => "<b>{$payload->user->name}</b>"
+📝 {!! __('tg-notifier::events/gitlab/wiki_page.title.update', [
+       'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
+       'user' => "<code>{$payload->user->name}</code>"
    ]) !!}
 
-{!! __('tg-notifier::events/gitlab/wiki_page.name', [
-       'name' => "<b>{$payload->object_attributes->title}</b>"
-   ]) !!}
+📝 {!! __('tg-notifier::events/gitlab/wiki_page.name') !!}: <code>{{ $payload->object_attributes->title }}</code>
 
 @include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

resources/views/events/shared/partials/gitlab/_body.blade.php

@@ -19,13 +19,15 @@
     } else {
         return '';
     }
-    if (strlen($body) > 50) {
-        $body = substr($body, 0, 50) . '...';
+    if (strlen($body) > 100) {
+        $body = substr($body, 0, 100) . '...';
     }
 
-    $html = __('tg-notifier::events/shared/gitlab._body.title', ['body' => $body])
-        ."\n"
-        .htmlentities($body);
+    $html = htmlentities($body);
 }
 ?>
-{!! $html !!}
+@if(!empty($html))
+📖 <b>{!! __('tg-notifier::events/shared/gitlab._body.title') !!}:</b>
+<pre>{!! $html !!}</pre>
+@endif
+

src/Services/CommandService.php

@@ -77,7 +77,7 @@ public function handle(): void
 
                 break;
             default:
-                $this->bot->sendMessage(__('tg-notifier::app.invalid_request'));
+                $this->bot->sendMessage('🤨 '.__('tg-notifier::app.invalid_request'));
         }
     }