Merge branch 'main' into feature/team

Author: hokhacminhtri

lang/de/app.php

@@ -4,4 +4,5 @@
     'by' => 'by',
     'unknown_callback' => 'Unknown Callback. Something went wrong!',
     'invalid_request' => 'Invalid Request!',
+    'branch' => 'Branch',
 ];

lang/de/events/github/push.php

@@ -2,7 +2,7 @@
 
 return [
     'default' => [
-        'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
+        'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
         'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
         'pusher' => 'Pushed by',
     ],

lang/en/app.php

@@ -4,4 +4,5 @@
     'by' => 'by',
     'unknown_callback' => 'Unknown Callback. Something went wrong!',
     'invalid_request' => 'Invalid Request!',
+    'branch' => 'Branch',
 ];

lang/en/events/github/push.php

@@ -2,7 +2,7 @@
 
 return [
     'default' => [
-        'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
+        'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
         'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
         'pusher' => 'Pushed by',
     ],

lang/ja/app.php

@@ -4,4 +4,5 @@
     'by' => 'by',
     'unknown_callback' => 'Unknown Callback. Something went wrong!',
     'invalid_request' => 'Invalid Request!',
+    'branch' => 'Branch',
 ];

lang/ja/events/github/push.php

@@ -2,7 +2,7 @@
 
 return [
     'default' => [
-        'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
+        'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
         'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
         'pusher' => 'Pushed by',
     ],

lang/vi/app.php

@@ -1,7 +1,8 @@
 <?php
 
 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ệ!',
+    'by' => 'by',
+    'unknown_callback' => 'Unknown Callback. Something went wrong!',
+    'invalid_request' => 'Invalid Request!',
+    'branch' => 'Branch',
 ];

lang/vi/events/github/push.php

@@ -2,7 +2,7 @@
 
 return [
     'default' => [
-        'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
+        'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
         'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
         'pusher' => 'Pushed by',
     ],

resources/views/events/github/push/default.blade.php

@@ -8,19 +8,26 @@
 
 $ref = explode('/', $payload->ref);
 $branch = implode('/', array_slice($ref, 2));
+
+if (empty($payload->commits)) {
+    return '';
+}
 ?>
 
-{!! __('tg-notifier::events/github/push.default.title', [
+👷⚙️ {!! __('tg-notifier::events/github/push.default.title', [
             'count' => $count,
             'noun' => $noun,
-            'repo' => $payload->repository->full_name,
+            'repo' => "🦑<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>",
             'branch' => $branch,
         ]
     ) !!}
 
 @foreach($payload->commits as $commit)
 @php
     $commitId = substr($commit->id, -7);
+
+    $commit->message = $commit->message ?? '';
+    $commit->message = explode("\n", $commit->message)[0];
 @endphp
 {!! __('tg-notifier::events/github/push.default.commit', [
        'commit' => "<a href='$commit->url'>$commitId</a>",
@@ -30,4 +37,5 @@
 ) !!}
 @endforeach
 
+🌲 {{ __('tg-notifier::app.branch') }}: <code>{{ $branch }}</code>
 👤 {!! __('tg-notifier::events/github/push.default.pusher') !!}: <code>{{ $payload->pusher->name }}</code>

resources/views/events/github/workflow_job/completed.blade.php

@@ -22,5 +22,5 @@
 {{ $icon }} {!! __("tg-notifier::events/github/workflow_job.completed.$status", ['repo' => "🦑<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
 
 🚀 {!! __('tg-notifier::events/github/workflow_job.name') !!}: {{ $icon }} <code>{{ $payload->workflow_job->name }}</code> {{ $last }}
-🚨 {!! __('tg-notifier::events/github/workflow_job.status.title') !!}: <code>{!! __('tg-notifier::events/github/workflow_job.status.'.$status) !!}</code> 🕓 <code>{{ $allSeconds }}s</code>
+🚨 {!! __('tg-notifier::events/github/workflow_job.status.title') !!}: <code>{!! __('tg-notifier::events/github/workflow_job.status.'.$status) !!}</code> ⏱️ <code>{{ $allSeconds }}s</code>
 🔗 {!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->workflow_name}</a>"]) !!}

routes/bot.php

@@ -17,13 +17,13 @@
 
 $routePrefix = config('telegram-git-notifier.defaults.route_prefix');
 
-Route::prefix($routePrefix)->group(function () use ($routePrefix) {
-    Route::match(['get', 'post'], '/', IndexAction::class)->name("$routePrefix.index");
+Route::prefix($routePrefix)->name("$routePrefix.")->group(function () {
+    Route::match(['get', 'post'], '/', IndexAction::class)->name('index');
 
-    Route::prefix('webhook')->group(function () use ($routePrefix) {
-        Route::get('set', [WebhookAction::class, 'set'])->name("$routePrefix.webhook.set");
-        Route::get('delete', [WebhookAction::class, 'delete'])->name("$routePrefix.webhook.delete");
-        Route::get('info', [WebhookAction::class, 'getWebHookInfo'])->name("$routePrefix.webhook.info");
-        Route::get('updates', [WebhookAction::class, 'getUpdates'])->name("$routePrefix.webhook.updates");
+    Route::prefix('webhook')->name('webhook.')->group(function () {
+        Route::get('set', [WebhookAction::class, 'set'])->name('set');
+        Route::get('delete', [WebhookAction::class, 'delete'])->name('delete');
+        Route::get('info', [WebhookAction::class, 'getWebHookInfo'])->name('info');
+        Route::get('updates', [WebhookAction::class, 'getUpdates'])->name('updates');
     });
 });