From cbc40b5b302172270b3a068143bcf2a42b7dde44 Mon Sep 17 00:00:00 2001
From: pxthinh <pxthinh.vn@gmail.com>
Date: Sun, 19 Nov 2023 13:12:46 +0700
Subject: [PATCH 01/10] feat: update view and lang for pull request review

---
 lang/en/events/github/pull_request_review.php       | 11 +++++++++++
 .../github/pull_request_review/dismissed.blade.php  | 13 +++++++++----
 .../github/pull_request_review/submitted.blade.php  | 13 +++++++++----
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 lang/en/events/github/pull_request_review.php

diff --git a/lang/en/events/github/pull_request_review.php b/lang/en/events/github/pull_request_review.php
new file mode 100644
index 0000000..8360b78
--- /dev/null
+++ b/lang/en/events/github/pull_request_review.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'dismissed' => [
+        'title' => '👷‍♂️🛠️ <b>Dismissed Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'submitted' => [
+        'title' => '♂️🛠️ <b>New Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'link' => '🔗 Link: :review',
+];
diff --git a/resources/views/events/github/pull_request_review/dismissed.blade.php b/resources/views/events/github/pull_request_review/dismissed.blade.php
index 0235a06..41705ca 100644
--- a/resources/views/events/github/pull_request_review/dismissed.blade.php
+++ b/resources/views/events/github/pull_request_review/dismissed.blade.php
@@ -3,10 +3,15 @@
  * @var $payload mixed
  */
 
-$message = "👷‍♂️🛠️ <b>Dismissed Pull Request Review Comment</b> 💬 - 🦑<a href=\"{$payload->pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number}</a> by <a href=\"{$payload->review->user->html_url}\">@{$payload->review->user->login}</a>\n\n";
+$pull_request = $payload->pull_request;
+?>
 
-$message .= "🛠 <b>{$payload->pull_request->title}</b> \n\n";
+{!! __('tg-notifier::events/github/pull_request_review.dismissed.title', [
+            'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
+            'user' => "<a href='{$pull_request->user->html_url}'>@{$pull_request->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= "🔗 Link: <a href=\"{$payload->review->html_url}\">{$payload->review->html_url}</a>\n\n";
+🛠 <b>{{ $pull_request->title }}</b>
 
-echo $message;
+{!! __('tg-notifier::events/github/pull_request_review.link', ['review' => "<a href='{$payload->review->html_url}'>{$payload->review->html_url}</a>"]) !!}
diff --git a/resources/views/events/github/pull_request_review/submitted.blade.php b/resources/views/events/github/pull_request_review/submitted.blade.php
index 2fed0b9..cb7c82e 100644
--- a/resources/views/events/github/pull_request_review/submitted.blade.php
+++ b/resources/views/events/github/pull_request_review/submitted.blade.php
@@ -3,10 +3,15 @@
  * @var $payload mixed
  */
 
-$message = "👷‍♂️🛠️ <b>New Pull Request Review Comment</b> 💬 - 🦑<a href=\"{$payload->pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number}</a> by <a href=\"{$payload->review->user->html_url}\">@{$payload->review->user->login}</a>\n\n";
+$pull_request = $payload->pull_request;
+?>
 
-$message .= "🛠 <b>{$payload->pull_request->title}</b> \n\n";
+{!! __('tg-notifier::events/github/pull_request_review.submitted.title', [
+            'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
+            'user' => "<a href='{$pull_request->user->html_url}'>@{$pull_request->user->login}</a>"
+        ]
+    ) !!}
 
-$message .= "🔗 Link: <a href=\"{$payload->review->html_url}\">{$payload->review->html_url}</a>\n\n";
+🛠 <b>{{ $pull_request->title }}</b>
 
-echo $message;
+{!! __('tg-notifier::events/github/pull_request_review.link', ['review' => "<a href='{$payload->review->html_url}'>{$payload->review->html_url}</a>"]) !!}

From 0d17a8e3e71e54f713d1aa85ff4c1de5ff92aa86 Mon Sep 17 00:00:00 2001
From: pxthinh <pxthinh.vn@gmail.com>
Date: Sun, 19 Nov 2023 13:13:18 +0700
Subject: [PATCH 02/10] feat: update view and lang for push event and watch
 event

---
 lang/en/events/github/push.php                |  9 +++++++
 lang/en/events/github/watch.php               |  8 ++++++
 .../events/github/push/default.blade.php      | 26 +++++++++++++------
 .../events/github/watch/started.blade.php     | 10 ++++---
 4 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 lang/en/events/github/push.php
 create mode 100644 lang/en/events/github/watch.php

diff --git a/lang/en/events/github/push.php b/lang/en/events/github/push.php
new file mode 100644
index 0000000..cf34b67
--- /dev/null
+++ b/lang/en/events/github/push.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
+        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'pushed' => '👤 Pushed by : <b>:name</b>',
+    ],
+];
diff --git a/lang/en/events/github/watch.php b/lang/en/events/github/watch.php
new file mode 100644
index 0000000..c6ed1a8
--- /dev/null
+++ b/lang/en/events/github/watch.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'started' => [
+        'title' => '🎉 <b>Watch Started</b> form 🦑:user',
+        'watcher' => '👤 Watcher: <b>:sender_login</b> 👀',
+    ],
+];
diff --git a/resources/views/events/github/push/default.blade.php b/resources/views/events/github/push/default.blade.php
index 7ee9595..cfff159 100644
--- a/resources/views/events/github/push/default.blade.php
+++ b/resources/views/events/github/push/default.blade.php
@@ -8,14 +8,24 @@
 
 $ref = explode('/', $payload->ref);
 $branch = implode('/', array_slice($ref, 2));
+?>
 
-$message = "⚙️ <b>{$count}</b> new {$noun} to 🦑<b>{$payload->repository->full_name}:<code>{$branch}</code></b>\n\n";
+{!! __('tg-notifier::events/github/push.default.title', [
+            'count' => $count,
+            'noun' => $noun,
+            'user' => $payload->repository->full_name,
+            'branch' => $branch,
+        ]
+    ) !!}
 
-foreach ($payload->commits as $commit) {
-    $commitId = substr($commit->id, -7);
-    $message .= "<a href=\"{$commit->url}\">{$commitId}</a>: {$commit->message} - by <i>{$commit->author->name}</i>\n";
-}
+@foreach($payload->commits as $commit)
+   <?= $commitId = substr($commit->id, -7);?>
+   {!! __('tg-notifier::events/github/push.default.commit', [
+           'commit' => "<a href='$commit->url'>$commitId</a>",
+           'commit_message' => $commit->message,
+           'commit_name' => $commit->author->name,
+       ]
+   ) !!}
+@endforeach
 
-$message .= "\n👤 Pushed by : <b>{$payload->pusher->name}</b>\n";
-
-echo $message;
+{!! __('tg-notifier::events/github/push.default.pushed', ['name' => $payload->pusher->name]) !!}
diff --git a/resources/views/events/github/watch/started.blade.php b/resources/views/events/github/watch/started.blade.php
index 1f9dc6d..2abc3f6 100644
--- a/resources/views/events/github/watch/started.blade.php
+++ b/resources/views/events/github/watch/started.blade.php
@@ -2,9 +2,11 @@
 /**
  * @var $payload mixed
  */
+?>
 
-$message = "🎉 <b>Watch Started</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+{!! __('tg-notifier::events/github/watch.started.title', [
+    'user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"
+        ]
+    ) !!}
 
-$message .= "👤 Watcher: <b>{$payload->sender->login}</b> 👀\n\n";
-
-echo $message;
+{!! __('tg-notifier::events/github/watch.started.watched', ['sender_login' => $payload->sender->login]) !!}

From 0df833d392e4f87bea9ba8614e119c835b2a160d Mon Sep 17 00:00:00 2001
From: pxthinh <pxthinh.vn@gmail.com>
Date: Sun, 19 Nov 2023 14:05:18 +0700
Subject: [PATCH 03/10] feat: update view and lang for workflow job event

---
 lang/en/events/github/workflow_job.php        | 19 +++++++++++++++++++
 .../github/workflow_job/completed.blade.php   | 19 +++++++++----------
 .../github/workflow_job/in_progress.blade.php |  9 ++++-----
 .../github/workflow_job/queued.blade.php      |  7 ++++---
 4 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 lang/en/events/github/workflow_job.php

diff --git a/lang/en/events/github/workflow_job.php b/lang/en/events/github/workflow_job.php
new file mode 100644
index 0000000..5008a9a
--- /dev/null
+++ b/lang/en/events/github/workflow_job.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+    'completed' => [
+        'completed' => '🎉 <b>Action Completed</b> form :user',
+        'done' => 'Done action: 🎉 <b>:runner_name</b> ✨',
+        'canceled' => '🚫 <b>Canceled Action</b> form 🦑:user',
+        'failed' => 'Failed action: 🚫 <b>:runner_name</b> ❌',
+    ],
+    'in_progress' => [
+        'progress' => '🔧 <b>Action in progress</b> form🦑:user',
+        'running' => 'Running action: 💥 <b>:runner_name</b> ⏳',
+    ],
+    'queued' => [
+        'title' => ' <b>Action Queued</b> form 🦑:user',
+        'body' => 'Queued action: 💥 <b>:runner_name</b> ⏰',
+    ],
+    'link' => '🔗 Link: :link',
+];
diff --git a/resources/views/events/github/workflow_job/completed.blade.php b/resources/views/events/github/workflow_job/completed.blade.php
index 3497a82..25c90e2 100644
--- a/resources/views/events/github/workflow_job/completed.blade.php
+++ b/resources/views/events/github/workflow_job/completed.blade.php
@@ -2,17 +2,16 @@
 /**
  * @var $payload mixed
  */
+?>
 
-if ($payload->workflow_job->conclusion === 'success') {
-    $message = "🎉 <b>Action Completed</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+@if($payload->workflow_job->conclusion === 'success')
+{!! __('tg-notifier::events/github/workflow_job.completed.completed', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-    $message .= "Done action: 🎉 <b>{$payload->workflow_job->runner_name}</b> ✨ \n\n";
-} else {
-    $message = "🚫 <b>Canceled Action</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+{!! __('tg-notifier::events/github/workflow_job.completed.done', ['runner_name' => $payload->workflow_job->runner_name]) !!}
+@else
+{!! __('tg-notifier::events/github/workflow_job.completed.canceled', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-    $message .= "Failed action: 🚫 <b>{$payload->workflow_job->runner_name}</b> ❌ \n\n";
-}
+{!! __('tg-notifier::events/github/workflow_job.completed.failed', ['runner_name' => $payload->workflow_job->runner_name]) !!}
+@endif
 
-$message .= "🔗 Link: <a href=\"{$payload->workflow_job->html_url}\">{$payload->workflow_job->html_url}</a>\n\n";
-
-echo $message;
+{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->html_url}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_job/in_progress.blade.php b/resources/views/events/github/workflow_job/in_progress.blade.php
index ef5dbea..10dc0b1 100644
--- a/resources/views/events/github/workflow_job/in_progress.blade.php
+++ b/resources/views/events/github/workflow_job/in_progress.blade.php
@@ -2,11 +2,10 @@
 /**
  * @var $payload mixed
  */
+?>
 
-$message = "🔧 <b>Action in progress</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name} </a>\n\n";
+{!! __('tg-notifier::events/github/workflow_job.in_progress.progress', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-$message .= "Running action: 💥 <b>{$payload->workflow_job->runner_name}</b> ⏳\n\n";
+{!! __('tg-notifier::events/github/workflow_job.in_progress.running', ['runner_name' => $payload->workflow_job->runner_name]) !!}
 
-$message .= "🔗 Link: <a href=\"{$payload->workflow_job->html_url}\">{$payload->workflow_job->html_url}</a>\n\n";
-
-echo $message;
+{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->html_url}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_job/queued.blade.php b/resources/views/events/github/workflow_job/queued.blade.php
index d2fab19..3ded415 100644
--- a/resources/views/events/github/workflow_job/queued.blade.php
+++ b/resources/views/events/github/workflow_job/queued.blade.php
@@ -2,9 +2,10 @@
 /**
  * @var $payload mixed
  */
+?>
 
-$message = "🎉 <b>Action Queued</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+{!! __('tg-notifier::events/github/workflow_job.queued.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-$message .= "Queued action: 💥 <b>{$payload->workflow_job->runner_name}</b> ⏰\n\n";
+{!! __('tg-notifier::events/github/workflow_job.queued.body', ['runner_name' => $payload->workflow_job->runner_name]) !!}
 
-$message .= "🔗 Link: <a href=\"{$payload->workflow_job->html_url}\">{$payload->workflow_job->html_url}</a>\n\n";
+{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->html_url}</a>"]) !!}

From 92af3c9255bab436ed40ee43b9683fcc875f0b25 Mon Sep 17 00:00:00 2001
From: pxthinh <pxthinh.vn@gmail.com>
Date: Sun, 19 Nov 2023 14:57:48 +0700
Subject: [PATCH 04/10] feat: update view and lang for workflow run event

---
 lang/en/events/github/workflow_run.php        | 27 ++++++++++++
 .../github/workflow_run/completed.blade.php   | 43 ++++++++-----------
 .../github/workflow_run/requested.blade.php   | 11 ++---
 3 files changed, 50 insertions(+), 31 deletions(-)
 create mode 100644 lang/en/events/github/workflow_run.php

diff --git a/lang/en/events/github/workflow_run.php b/lang/en/events/github/workflow_run.php
new file mode 100644
index 0000000..4e895d4
--- /dev/null
+++ b/lang/en/events/github/workflow_run.php
@@ -0,0 +1,27 @@
+<?php
+
+return [
+    'completed' => [
+        'success' => [
+            'title' => '🎉 <b>Workflow Completed</b> form 🦑 :user',
+            'body' => 'Done workflow: 🎉 <b>:name</b> ✨ ',
+        ],
+        'failure' => [
+            'title' => '🚫 <b>Workflow Failed</b> form 🦑:user',
+            'body' => 'Failed workflow: 🚫 <b>:name</b> ❌',
+        ],
+        'cancelled' => [
+            'title' => '❌ <b>Workflow Cancelled</b> form 🦑 :user',
+            'body' => 'Cancelled workflow: 🚨 <b>:name</b> ❌ ',
+        ],
+        'default' => [
+            'title' => "🚨 <b>Workflow Can't Success</b> form 🦑:user",
+            'body' => "Can't Success workflow: 🚨 <b>:name</b> ❌",
+        ],
+    ],
+    'requested' => [
+        'title' => ' <b>Workflow Requested</b> form 🦑:user',
+        'body' => 'Running workflow: 💥 <b>:name</b> ⏳',
+    ],
+    'link' => '🔗 Link: :link',
+];
diff --git a/resources/views/events/github/workflow_run/completed.blade.php b/resources/views/events/github/workflow_run/completed.blade.php
index 951134b..d051e1a 100644
--- a/resources/views/events/github/workflow_run/completed.blade.php
+++ b/resources/views/events/github/workflow_run/completed.blade.php
@@ -2,36 +2,31 @@
 /**
  * @var $payload mixed
  */
+?>
 
-switch ($payload->workflow_run->conclusion) {
-    case 'success':
-        $message = "🎉 <b>Workflow Completed</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+@switch($payload->workflow_run->conclusion)
+    @case('success')
+{!! __('tg-notifier::events/github/workflow_run.completed.success.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-        $message .= "Done workflow: 🎉 <b>{$payload->workflow_run->name}</b> ✨ \n\n";
+{!! __('tg-notifier::events/github/workflow_run.completed.success.body', ['name' => $payload->workflow_run->runner_name]) !!}
 
-        break;
-    case 'failure':
-        $message = "🚫 <b>Workflow Failed</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+        @break
+    @case('failure')
+{!! __('tg-notifier::events/github/workflow_run.completed.failure.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-        $message .= "Failed workflow: 🚫 <b>{$payload->workflow_run->name}</b> ❌ \n\n";
+{!! __('tg-notifier::events/github/workflow_run.completed.failure.body', ['name' => $payload->workflow_run->runner_name]) !!}
 
-        break;
-    case 'cancelled':
-        $message = "❌ <b>Workflow Cancelled</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+        @break
+    @case('cancelled')
+{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-        $message .= "Cancelled workflow: 🚨 <b>{$payload->workflow_run->name}</b> ❌ \n\n";
+{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.body', ['name' => $payload->workflow_run->runner_name]) !!}
 
-        break;
-    default:
-        $message = "🚨 <b>Workflow Can't Success</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+        @break
+    @default
+{!! __('tg-notifier::events/github/workflow_run.completed.default.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-        $message .= "Can't Success workflow: 🚨 <b>{$payload->workflow_run->name}</b> ❌ \n\n";
+{!! __('tg-notifier::events/github/workflow_run.completed.default.body', ['name' => $payload->workflow_run->runner_name]) !!}
+@endswitch
 
-        break;
-}
-
-// $message .= "📤 Commit: <b>{$payload->workflow_run->head_commit->message}</b>\n\n";
-
-$message .= "🔗 Link: <a href=\"{$payload->workflow_run->html_url}\">{$payload->workflow_run->html_url}</a>\n\n";
-
-echo $message;
+{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_run/requested.blade.php b/resources/views/events/github/workflow_run/requested.blade.php
index 1c15c87..bb7391e 100644
--- a/resources/views/events/github/workflow_run/requested.blade.php
+++ b/resources/views/events/github/workflow_run/requested.blade.php
@@ -2,13 +2,10 @@
 /**
  * @var $payload mixed
  */
+?>
 
-$message = "🔧 <b>Workflow Requested</b> form 🦑<a href=\"{$payload->repository->html_url}\">{$payload->repository->full_name}</a>\n\n";
+{!! __('tg-notifier::events/github/workflow_run.requested.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
 
-$message .= "Running workflow: 💥 <b>{$payload->workflow_run->name}</b> ⏳\n\n";
+{!! __('tg-notifier::events/github/workflow_run.requested.body', ['name' => $payload->workflow_run->runner_name]) !!}
 
-// $message .= "📤 Commit: <b>{$payload->workflow_run->head_commit->message}</b>\n\n";
-
-$message .= "🔗 Link: <a href=\"{$payload->workflow_run->html_url}\">{$payload->workflow_run->html_url}</a>\n\n";
-
-echo $message;
+{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}

From a252c2a574d5d5a7cbe369b1ce33a35daf763071 Mon Sep 17 00:00:00 2001
From: pxthinh <pxthinh.vn@gmail.com>
Date: Sun, 19 Nov 2023 22:19:19 +0700
Subject: [PATCH 05/10] fix: update view push, lang for start event and
 submitted event

---
 lang/en/events/github/pull_request_review.php    |  2 +-
 lang/en/events/github/watch.php                  |  2 +-
 .../views/events/github/push/default.blade.php   | 16 +++++++++-------
 .../views/events/github/watch/started.blade.php  |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lang/en/events/github/pull_request_review.php b/lang/en/events/github/pull_request_review.php
index 8360b78..da3b25c 100644
--- a/lang/en/events/github/pull_request_review.php
+++ b/lang/en/events/github/pull_request_review.php
@@ -5,7 +5,7 @@
         'title' => '👷‍♂️🛠️ <b>Dismissed Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
     ],
     'submitted' => [
-        'title' => '♂️🛠️ <b>New Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+        'title' => '👷‍♂️‍🛠️ <b>New Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
     ],
     'link' => '🔗 Link: :review',
 ];
diff --git a/lang/en/events/github/watch.php b/lang/en/events/github/watch.php
index c6ed1a8..706de28 100644
--- a/lang/en/events/github/watch.php
+++ b/lang/en/events/github/watch.php
@@ -2,7 +2,7 @@
 
 return [
     'started' => [
-        'title' => '🎉 <b>Watch Started</b> form 🦑:user',
+        'title' => '🎉 <b>New Started</b> form 🦑:user',
         'watcher' => '👤 Watcher: <b>:sender_login</b> 👀',
     ],
 ];
diff --git a/resources/views/events/github/push/default.blade.php b/resources/views/events/github/push/default.blade.php
index cfff159..f6b7302 100644
--- a/resources/views/events/github/push/default.blade.php
+++ b/resources/views/events/github/push/default.blade.php
@@ -19,13 +19,15 @@
     ) !!}
 
 @foreach($payload->commits as $commit)
-   <?= $commitId = substr($commit->id, -7);?>
-   {!! __('tg-notifier::events/github/push.default.commit', [
-           'commit' => "<a href='$commit->url'>$commitId</a>",
-           'commit_message' => $commit->message,
-           'commit_name' => $commit->author->name,
-       ]
-   ) !!}
+@php
+    $commitId = substr($commit->id, -7);
+@endphp
+{!! __('tg-notifier::events/github/push.default.commit', [
+       'commit' => "<a href='$commit->url'>$commitId</a>",
+       'commit_message' => $commit->message,
+       'commit_name' => $commit->author->name,
+   ]
+) !!}
 @endforeach
 
 {!! __('tg-notifier::events/github/push.default.pushed', ['name' => $payload->pusher->name]) !!}
diff --git a/resources/views/events/github/watch/started.blade.php b/resources/views/events/github/watch/started.blade.php
index 2abc3f6..f0a8f02 100644
--- a/resources/views/events/github/watch/started.blade.php
+++ b/resources/views/events/github/watch/started.blade.php
@@ -9,4 +9,4 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/watch.started.watched', ['sender_login' => $payload->sender->login]) !!}
+{!! __('tg-notifier::events/github/watch.started.watcher', ['sender_login' => $payload->sender->login]) !!}

From 6913464d59b240ffe3f8b641e4ce2aeeb87d5251 Mon Sep 17 00:00:00 2001
From: pxthinh <pxthinh.vn@gmail.com>
Date: Sun, 19 Nov 2023 23:45:35 +0700
Subject: [PATCH 06/10] fix: delete enter line

---
 resources/views/events/github/issue_comment/created.blade.php  | 1 -
 resources/views/events/github/issue_comment/deleted.blade.php  | 1 -
 resources/views/events/github/issue_comment/edited.blade.php   | 1 -
 resources/views/events/github/issues/closed.blade.php          | 1 -
 resources/views/events/github/issues/deleted.blade.php         | 1 -
 resources/views/events/github/issues/locked.blade.php          | 1 -
 resources/views/events/github/issues/opened.blade.php          | 1 -
 resources/views/events/github/issues/pinned.blade.php          | 1 -
 resources/views/events/github/issues/reopened.blade.php        | 1 -
 resources/views/events/github/issues/unlocked.blade.php        | 1 -
 resources/views/events/github/issues/unpinned.blade.php        | 1 -
 resources/views/events/github/pull_request/closed.blade.php    | 3 +--
 resources/views/events/github/pull_request/opened.blade.php    | 3 +--
 .../events/github/pull_request/partials/_reviewers.blade.php   | 2 +-
 resources/views/events/github/pull_request/reopened.blade.php  | 3 +--
 15 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/resources/views/events/github/issue_comment/created.blade.php b/resources/views/events/github/issue_comment/created.blade.php
index 604759a..3e43030 100644
--- a/resources/views/events/github/issue_comment/created.blade.php
+++ b/resources/views/events/github/issue_comment/created.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issue_comment/deleted.blade.php b/resources/views/events/github/issue_comment/deleted.blade.php
index 52e8ebe..1f1054c 100644
--- a/resources/views/events/github/issue_comment/deleted.blade.php
+++ b/resources/views/events/github/issue_comment/deleted.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issue_comment/edited.blade.php b/resources/views/events/github/issue_comment/edited.blade.php
index c1c1c0e..18132c0 100644
--- a/resources/views/events/github/issue_comment/edited.blade.php
+++ b/resources/views/events/github/issue_comment/edited.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/closed.blade.php b/resources/views/events/github/issues/closed.blade.php
index 5940c15..66f97c1 100644
--- a/resources/views/events/github/issues/closed.blade.php
+++ b/resources/views/events/github/issues/closed.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/deleted.blade.php b/resources/views/events/github/issues/deleted.blade.php
index b0dde6b..c9f6416 100644
--- a/resources/views/events/github/issues/deleted.blade.php
+++ b/resources/views/events/github/issues/deleted.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/locked.blade.php b/resources/views/events/github/issues/locked.blade.php
index 3d521de..b1b1dd5 100644
--- a/resources/views/events/github/issues/locked.blade.php
+++ b/resources/views/events/github/issues/locked.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/opened.blade.php b/resources/views/events/github/issues/opened.blade.php
index bad7aa2..d2f9b20 100644
--- a/resources/views/events/github/issues/opened.blade.php
+++ b/resources/views/events/github/issues/opened.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/pinned.blade.php b/resources/views/events/github/issues/pinned.blade.php
index f431c3b..beba183 100644
--- a/resources/views/events/github/issues/pinned.blade.php
+++ b/resources/views/events/github/issues/pinned.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/reopened.blade.php b/resources/views/events/github/issues/reopened.blade.php
index 629c01a..a6c7509 100644
--- a/resources/views/events/github/issues/reopened.blade.php
+++ b/resources/views/events/github/issues/reopened.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/unlocked.blade.php b/resources/views/events/github/issues/unlocked.blade.php
index 11f2da9..b6db3ea 100644
--- a/resources/views/events/github/issues/unlocked.blade.php
+++ b/resources/views/events/github/issues/unlocked.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/issues/unpinned.blade.php b/resources/views/events/github/issues/unpinned.blade.php
index e2bbc83..0bf2566 100644
--- a/resources/views/events/github/issues/unpinned.blade.php
+++ b/resources/views/events/github/issues/unpinned.blade.php
@@ -16,5 +16,4 @@
 📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/pull_request/closed.blade.php b/resources/views/events/github/pull_request/closed.blade.php
index 59722ab..9a060ab 100644
--- a/resources/views/events/github/pull_request/closed.blade.php
+++ b/resources/views/events/github/pull_request/closed.blade.php
@@ -22,8 +22,7 @@
 📢 <b>{{ $pull_request->title }}</b>
 
 🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
-@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 @include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/pull_request/opened.blade.php b/resources/views/events/github/pull_request/opened.blade.php
index 9114c83..2bdcb2d 100644
--- a/resources/views/events/github/pull_request/opened.blade.php
+++ b/resources/views/events/github/pull_request/opened.blade.php
@@ -16,8 +16,7 @@
 📢 <b>{{ $pull_request->title }}</b>
 
 🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
-@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 @include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/pull_request/partials/_reviewers.blade.php b/resources/views/events/github/pull_request/partials/_reviewers.blade.php
index 78dbe1e..fdc3668 100644
--- a/resources/views/events/github/pull_request/partials/_reviewers.blade.php
+++ b/resources/views/events/github/pull_request/partials/_reviewers.blade.php
@@ -10,7 +10,7 @@
         $reviewers[] = "<b>{$reviewer->login}</b>";
     }
 
-    $textReviewers .= __('tg-notifier::events/github/pull_request.review') . implode(', ', $reviewers);
+    $textReviewers .= __('tg-notifier::events/github/pull_request.review') . implode(', ', $reviewers). "\n";
 }
 ?>
 {!! $textReviewers !!}
diff --git a/resources/views/events/github/pull_request/reopened.blade.php b/resources/views/events/github/pull_request/reopened.blade.php
index 5567a00..1064253 100644
--- a/resources/views/events/github/pull_request/reopened.blade.php
+++ b/resources/views/events/github/pull_request/reopened.blade.php
@@ -16,8 +16,7 @@
 📢 <b>{{ $pull_request->title }}</b>
 
 🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
-@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 @include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
-
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))

From c9a071f80382ad07f7b67a6508c1cb5828cb657b Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 22 Nov 2023 14:27:33 +0700
Subject: [PATCH 07/10] fix: remove redundant blank line in message

---
 phpstan-baseline.neon                                       | 1 -
 resources/views/events/github/pull_request/closed.blade.php | 1 -
 resources/views/events/github/pull_request/opened.blade.php | 1 -
 .../github/pull_request/partials/_reviewers.blade.php       | 2 +-
 .../views/events/github/pull_request/reopened.blade.php     | 1 -
 resources/views/events/github/push/default.blade.php        | 6 +++---
 .../events/shared/partials/github/_assignees.blade.php      | 2 +-
 .../views/events/shared/partials/github/_body.blade.php     | 3 ++-
 8 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 0342eab..002d23b 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3,7 +3,6 @@ parameters:
         - message: '#Parameter \#2 \$namespace of method Illuminate\\Support\\ServiceProvider\:\:loadViewsFrom\(\) expects string, mixed given\.#'
           path: src/Providers/TelegramGitNotifierServiceProvider.php
 
-
         - message: '#Parameter \#1 \$token of method CSlant\\TelegramGitNotifier\\Webhook\:\:setToken\(\) expects string, mixed given\.#'
           path: src/Http/Actions/WebhookAction.php
 
diff --git a/resources/views/events/github/pull_request/closed.blade.php b/resources/views/events/github/pull_request/closed.blade.php
index 9a060ab..61df4b7 100644
--- a/resources/views/events/github/pull_request/closed.blade.php
+++ b/resources/views/events/github/pull_request/closed.blade.php
@@ -22,7 +22,6 @@
 📢 <b>{{ $pull_request->title }}</b>
 
 🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
-
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 @include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/pull_request/opened.blade.php b/resources/views/events/github/pull_request/opened.blade.php
index 2bdcb2d..c63abe1 100644
--- a/resources/views/events/github/pull_request/opened.blade.php
+++ b/resources/views/events/github/pull_request/opened.blade.php
@@ -16,7 +16,6 @@
 📢 <b>{{ $pull_request->title }}</b>
 
 🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
-
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 @include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/pull_request/partials/_reviewers.blade.php b/resources/views/events/github/pull_request/partials/_reviewers.blade.php
index fdc3668..78dbe1e 100644
--- a/resources/views/events/github/pull_request/partials/_reviewers.blade.php
+++ b/resources/views/events/github/pull_request/partials/_reviewers.blade.php
@@ -10,7 +10,7 @@
         $reviewers[] = "<b>{$reviewer->login}</b>";
     }
 
-    $textReviewers .= __('tg-notifier::events/github/pull_request.review') . implode(', ', $reviewers). "\n";
+    $textReviewers .= __('tg-notifier::events/github/pull_request.review') . implode(', ', $reviewers);
 }
 ?>
 {!! $textReviewers !!}
diff --git a/resources/views/events/github/pull_request/reopened.blade.php b/resources/views/events/github/pull_request/reopened.blade.php
index 1064253..3602163 100644
--- a/resources/views/events/github/pull_request/reopened.blade.php
+++ b/resources/views/events/github/pull_request/reopened.blade.php
@@ -16,7 +16,6 @@
 📢 <b>{{ $pull_request->title }}</b>
 
 🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
-
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 @include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
 @include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
diff --git a/resources/views/events/github/push/default.blade.php b/resources/views/events/github/push/default.blade.php
index f6b7302..e3c66dd 100644
--- a/resources/views/events/github/push/default.blade.php
+++ b/resources/views/events/github/push/default.blade.php
@@ -19,9 +19,9 @@
     ) !!}
 
 @foreach($payload->commits as $commit)
-@php
-    $commitId = substr($commit->id, -7);
-@endphp
+    @php
+        $commitId = substr($commit->id, -7);
+    @endphp
 {!! __('tg-notifier::events/github/push.default.commit', [
        'commit' => "<a href='$commit->url'>$commitId</a>",
        'commit_message' => $commit->message,
diff --git a/resources/views/events/shared/partials/github/_assignees.blade.php b/resources/views/events/shared/partials/github/_assignees.blade.php
index 6fa61b0..36e428e 100644
--- a/resources/views/events/shared/partials/github/_assignees.blade.php
+++ b/resources/views/events/shared/partials/github/_assignees.blade.php
@@ -10,7 +10,7 @@
     foreach ($payload->{$event}->assignees as $assignee) {
         $assigneeArray[] = "<a href=\"{$assignee->html_url}\">@{$assignee->login}</a> ";
     }
-    $assigneeText .= implode(', ', $assigneeArray)."\n";
+    $assigneeText .= implode(', ', $assigneeArray);
 }
 ?>
 {!! $assigneeText ?? '' !!}
diff --git a/resources/views/events/shared/partials/github/_body.blade.php b/resources/views/events/shared/partials/github/_body.blade.php
index 2089f65..08c5385 100644
--- a/resources/views/events/shared/partials/github/_body.blade.php
+++ b/resources/views/events/shared/partials/github/_body.blade.php
@@ -4,6 +4,7 @@
  * @var $event string
  */
 
+$html = '';
 if (isset($event) && isset($payload) && !empty($payload->{$event}->body)) {
     $body = $payload->{$event}->body;
     if (strlen($body) > 50) {
@@ -13,4 +14,4 @@
     $html = __('tg-notifier::events/shared/github._body.title', ['body' => $body])."\n{$body}";
 }
 ?>
-{!! $html ?? '' !!}
+{!! htmlentities($html) !!}

From 16a25bdb3e9d12618d9abd9717d690ce68f96bcf Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 22 Nov 2023 14:47:47 +0700
Subject: [PATCH 08/10] fix: error workflow run messages

---
 lang/en/events/github/workflow_job.php         |  1 +
 .../github/workflow_run/completed.blade.php    | 18 ++++++++++--------
 .../github/workflow_run/requested.blade.php    |  4 ++--
 .../shared/partials/github/_body.blade.php     |  6 ++++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lang/en/events/github/workflow_job.php b/lang/en/events/github/workflow_job.php
index 5008a9a..f477fba 100644
--- a/lang/en/events/github/workflow_job.php
+++ b/lang/en/events/github/workflow_job.php
@@ -4,6 +4,7 @@
     'completed' => [
         'completed' => '🎉 <b>Action Completed</b> form :user',
         'done' => 'Done action: 🎉 <b>:runner_name</b> ✨',
+
         'canceled' => '🚫 <b>Canceled Action</b> form 🦑:user',
         'failed' => 'Failed action: 🚫 <b>:runner_name</b> ❌',
     ],
diff --git a/resources/views/events/github/workflow_run/completed.blade.php b/resources/views/events/github/workflow_run/completed.blade.php
index d051e1a..98f1983 100644
--- a/resources/views/events/github/workflow_run/completed.blade.php
+++ b/resources/views/events/github/workflow_run/completed.blade.php
@@ -6,27 +6,29 @@
 
 @switch($payload->workflow_run->conclusion)
     @case('success')
-{!! __('tg-notifier::events/github/workflow_run.completed.success.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.success.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
 
-{!! __('tg-notifier::events/github/workflow_run.completed.success.body', ['name' => $payload->workflow_run->runner_name]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.success.body', ['name' => $payload->workflow_run->name]) !!}
 
         @break
     @case('failure')
-{!! __('tg-notifier::events/github/workflow_run.completed.failure.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.failure.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
 
-{!! __('tg-notifier::events/github/workflow_run.completed.failure.body', ['name' => $payload->workflow_run->runner_name]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.failure.body', ['name' => $payload->workflow_run->name]) !!}
 
         @break
     @case('cancelled')
-{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
 
-{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.body', ['name' => $payload->workflow_run->runner_name]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.body', ['name' => $payload->workflow_run->name]) !!}
 
         @break
     @default
-{!! __('tg-notifier::events/github/workflow_run.completed.default.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.default.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
 
-{!! __('tg-notifier::events/github/workflow_run.completed.default.body', ['name' => $payload->workflow_run->runner_name]) !!}
+{!! __('tg-notifier::events/github/workflow_run.completed.default.body', ['name' => $payload->workflow_run->name]) !!}
+
+        @break
 @endswitch
 
 {!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_run/requested.blade.php b/resources/views/events/github/workflow_run/requested.blade.php
index bb7391e..6f49720 100644
--- a/resources/views/events/github/workflow_run/requested.blade.php
+++ b/resources/views/events/github/workflow_run/requested.blade.php
@@ -4,8 +4,8 @@
  */
 ?>
 
-{!! __('tg-notifier::events/github/workflow_run.requested.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_run.requested.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
 
-{!! __('tg-notifier::events/github/workflow_run.requested.body', ['name' => $payload->workflow_run->runner_name]) !!}
+{!! __('tg-notifier::events/github/workflow_run.requested.body', ['name' => $payload->workflow_run->name]) !!}
 
 {!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}
diff --git a/resources/views/events/shared/partials/github/_body.blade.php b/resources/views/events/shared/partials/github/_body.blade.php
index 08c5385..d1ccb4b 100644
--- a/resources/views/events/shared/partials/github/_body.blade.php
+++ b/resources/views/events/shared/partials/github/_body.blade.php
@@ -11,7 +11,9 @@
         $body = substr($body, 0, 50).'...';
     }
 
-    $html = __('tg-notifier::events/shared/github._body.title', ['body' => $body])."\n{$body}";
+    $html = __('tg-notifier::events/shared/github._body.title', ['body' => $body])
+        ."\n"
+        .htmlentities($body);
 }
 ?>
-{!! htmlentities($html) !!}
+{!! $html !!}

From 4df705c396f369bcadcc3e8896a2dba3ba07c600 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 22 Nov 2023 15:38:59 +0700
Subject: [PATCH 09/10] chore: update workflow messages

---
 lang/en/events/github/workflow_job.php                          | 2 +-
 resources/views/events/github/workflow_job/completed.blade.php  | 2 +-
 .../views/events/github/workflow_job/in_progress.blade.php      | 2 +-
 resources/views/events/github/workflow_job/queued.blade.php     | 2 +-
 resources/views/events/github/workflow_run/completed.blade.php  | 2 +-
 resources/views/events/github/workflow_run/requested.blade.php  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/en/events/github/workflow_job.php b/lang/en/events/github/workflow_job.php
index f477fba..87ba8d7 100644
--- a/lang/en/events/github/workflow_job.php
+++ b/lang/en/events/github/workflow_job.php
@@ -16,5 +16,5 @@
         'title' => ' <b>Action Queued</b> form 🦑:user',
         'body' => 'Queued action: 💥 <b>:runner_name</b> ⏰',
     ],
-    'link' => '🔗 Link: :link',
+    'link' => '🔗 Workflow link: :link',
 ];
diff --git a/resources/views/events/github/workflow_job/completed.blade.php b/resources/views/events/github/workflow_job/completed.blade.php
index 25c90e2..99a183d 100644
--- a/resources/views/events/github/workflow_job/completed.blade.php
+++ b/resources/views/events/github/workflow_job/completed.blade.php
@@ -14,4 +14,4 @@
 {!! __('tg-notifier::events/github/workflow_job.completed.failed', ['runner_name' => $payload->workflow_job->runner_name]) !!}
 @endif
 
-{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->workflow_name}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_job/in_progress.blade.php b/resources/views/events/github/workflow_job/in_progress.blade.php
index 10dc0b1..53a953e 100644
--- a/resources/views/events/github/workflow_job/in_progress.blade.php
+++ b/resources/views/events/github/workflow_job/in_progress.blade.php
@@ -8,4 +8,4 @@
 
 {!! __('tg-notifier::events/github/workflow_job.in_progress.running', ['runner_name' => $payload->workflow_job->runner_name]) !!}
 
-{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->workflow_name}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_job/queued.blade.php b/resources/views/events/github/workflow_job/queued.blade.php
index 3ded415..cc22c08 100644
--- a/resources/views/events/github/workflow_job/queued.blade.php
+++ b/resources/views/events/github/workflow_job/queued.blade.php
@@ -8,4 +8,4 @@
 
 {!! __('tg-notifier::events/github/workflow_job.queued.body', ['runner_name' => $payload->workflow_job->runner_name]) !!}
 
-{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->workflow_name}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_run/completed.blade.php b/resources/views/events/github/workflow_run/completed.blade.php
index 98f1983..7da1975 100644
--- a/resources/views/events/github/workflow_run/completed.blade.php
+++ b/resources/views/events/github/workflow_run/completed.blade.php
@@ -31,4 +31,4 @@
         @break
 @endswitch
 
-{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->event} - {$payload->workflow_run->name}</a>"]) !!}
diff --git a/resources/views/events/github/workflow_run/requested.blade.php b/resources/views/events/github/workflow_run/requested.blade.php
index 6f49720..1db14fc 100644
--- a/resources/views/events/github/workflow_run/requested.blade.php
+++ b/resources/views/events/github/workflow_run/requested.blade.php
@@ -8,4 +8,4 @@
 
 {!! __('tg-notifier::events/github/workflow_run.requested.body', ['name' => $payload->workflow_run->name]) !!}
 
-{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}
+{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->event} - {$payload->workflow_run->name}</a>"]) !!}

From b331be352051155c2e75e35c511cd0d6a488d55d Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 22 Nov 2023 15:50:57 +0700
Subject: [PATCH 10/10] feat: update multi lang

---
 lang/de/app.php                               |  5 +++
 lang/de/events/github/issue_comment.php       | 14 ++++++
 lang/de/events/github/issues.php              | 43 +++++++++++++++++++
 lang/de/events/github/ping.php                | 10 +++++
 lang/de/events/github/pull_request.php        | 16 +++++++
 lang/de/events/github/pull_request_review.php | 11 +++++
 lang/de/events/github/push.php                |  9 ++++
 lang/de/events/github/watch.php               |  8 ++++
 lang/de/events/github/workflow_job.php        | 20 +++++++++
 lang/de/events/github/workflow_run.php        | 27 ++++++++++++
 lang/de/events/shared/github.php              | 10 +++++
 lang/en/events/github/workflow_job.php        |  2 +-
 lang/ja/app.php                               |  5 +++
 lang/ja/events/github/issue_comment.php       | 14 ++++++
 lang/ja/events/github/issues.php              | 43 +++++++++++++++++++
 lang/ja/events/github/ping.php                | 10 +++++
 lang/ja/events/github/pull_request.php        | 16 +++++++
 lang/ja/events/github/pull_request_review.php | 11 +++++
 lang/ja/events/github/push.php                |  9 ++++
 lang/ja/events/github/watch.php               |  8 ++++
 lang/ja/events/github/workflow_job.php        | 20 +++++++++
 lang/ja/events/github/workflow_run.php        | 27 ++++++++++++
 lang/ja/events/shared/github.php              | 10 +++++
 lang/vi/app.php                               |  5 +++
 lang/vi/events/github/issue_comment.php       | 14 ++++++
 lang/vi/events/github/issues.php              | 43 +++++++++++++++++++
 lang/vi/events/github/ping.php                | 10 +++++
 lang/vi/events/github/pull_request.php        | 16 +++++++
 lang/vi/events/github/pull_request_review.php | 11 +++++
 lang/vi/events/github/push.php                |  9 ++++
 lang/vi/events/github/watch.php               |  8 ++++
 lang/vi/events/github/workflow_job.php        | 20 +++++++++
 lang/vi/events/github/workflow_run.php        | 27 ++++++++++++
 lang/vi/events/shared/github.php              | 10 +++++
 34 files changed, 520 insertions(+), 1 deletion(-)
 create mode 100644 lang/de/app.php
 create mode 100644 lang/de/events/github/issue_comment.php
 create mode 100644 lang/de/events/github/issues.php
 create mode 100644 lang/de/events/github/ping.php
 create mode 100644 lang/de/events/github/pull_request.php
 create mode 100644 lang/de/events/github/pull_request_review.php
 create mode 100644 lang/de/events/github/push.php
 create mode 100644 lang/de/events/github/watch.php
 create mode 100644 lang/de/events/github/workflow_job.php
 create mode 100644 lang/de/events/github/workflow_run.php
 create mode 100644 lang/de/events/shared/github.php
 create mode 100644 lang/ja/app.php
 create mode 100644 lang/ja/events/github/issue_comment.php
 create mode 100644 lang/ja/events/github/issues.php
 create mode 100644 lang/ja/events/github/ping.php
 create mode 100644 lang/ja/events/github/pull_request.php
 create mode 100644 lang/ja/events/github/pull_request_review.php
 create mode 100644 lang/ja/events/github/push.php
 create mode 100644 lang/ja/events/github/watch.php
 create mode 100644 lang/ja/events/github/workflow_job.php
 create mode 100644 lang/ja/events/github/workflow_run.php
 create mode 100644 lang/ja/events/shared/github.php
 create mode 100644 lang/vi/app.php
 create mode 100644 lang/vi/events/github/issue_comment.php
 create mode 100644 lang/vi/events/github/issues.php
 create mode 100644 lang/vi/events/github/ping.php
 create mode 100644 lang/vi/events/github/pull_request.php
 create mode 100644 lang/vi/events/github/pull_request_review.php
 create mode 100644 lang/vi/events/github/push.php
 create mode 100644 lang/vi/events/github/watch.php
 create mode 100644 lang/vi/events/github/workflow_job.php
 create mode 100644 lang/vi/events/github/workflow_run.php
 create mode 100644 lang/vi/events/shared/github.php

diff --git a/lang/de/app.php b/lang/de/app.php
new file mode 100644
index 0000000..63a8747
--- /dev/null
+++ b/lang/de/app.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'by' => 'by',
+];
diff --git a/lang/de/events/github/issue_comment.php b/lang/de/events/github/issue_comment.php
new file mode 100644
index 0000000..5f972d7
--- /dev/null
+++ b/lang/de/events/github/issue_comment.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'issue_comment_title' => '📢',
+    'created' => [
+        'title' => '💬 <b>New Issue Comment</b> ⚠️ to 🦑 :issue by :user',
+    ],
+    'deleted' => [
+        'title' => '🗑 <b>Issue Comment Deleted</b> 💬 from 🦑 :issue by :user',
+    ],
+    'edited' => [
+        'title' => '📝 <b>Issue Comment Edited</b> 💬 in 🦑 :issue by :user',
+    ],
+];
diff --git a/lang/de/events/github/issues.php b/lang/de/events/github/issues.php
new file mode 100644
index 0000000..87cff4a
--- /dev/null
+++ b/lang/de/events/github/issues.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'issue_title' => '📢',
+    'closed' => [
+        'title' => '🚫 <b>Issue Closed </b> to 🦑 :issue by :user',
+    ],
+    'deleted' => [
+        'title' => '🗑 <b>Issue Deleted</b> form 🦑 :issue by :user',
+    ],
+    'edited' => [
+        'title' => '⚠️ <b>Issue has been edited</b> to 🦑 :issue by :user',
+        'changes' => [
+            'title' => [
+                'name' => '📖 <b>Title</b> has been changed',
+                'from' => '📝 <b>From:</b> :title_from',
+                'to' => '🏷 <b>To:</b> :title_to',
+            ],
+            'body' => [
+                'title' => '📖 <b>Body</b> has been changed',
+                'message' => 'Please check the issue for more details',
+            ],
+        ],
+    ],
+    'locked' => [
+        'title' => '🔒 <b>Issue Locked</b> form 🦑 :issue by :user',
+    ],
+    'opened' => [
+        'title' => '⚠️ <b>New Issue</b> to 🦑 :issue by :user',
+    ],
+    'pinned' => [
+        'title' => '📌 <b>Issue Pinned</b> form 🦑 :issue by :user',
+    ],
+    'reopened' => [
+        'title' => '⚠️ <b>Issue has been reopened</b> ⚠️ to 🦑 :issue by :user',
+    ],
+    'unlocked' => [
+        'title' => '🔐 <b>Issue Unlocked</b> form 🦑 :issue by :user',
+    ],
+    'unpinned' => [
+        'title' => '🔔 <b>Issue Unpinned</b> form 🦑 :issue by :user',
+    ],
+];
diff --git a/lang/de/events/github/ping.php b/lang/de/events/github/ping.php
new file mode 100644
index 0000000..7d9d2b9
--- /dev/null
+++ b/lang/de/events/github/ping.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '♻️ <b>Connection Successful</b>',
+        'organization' => '🏢 Organization: <b>:organization</b>',
+        'full_name' => '📦 Repository: 🦑<b>:full_name</b>',
+        'sender' => '👤 Sender (triggered the event): <b>:sender</b>',
+    ],
+];
diff --git a/lang/de/events/github/pull_request.php b/lang/de/events/github/pull_request.php
new file mode 100644
index 0000000..8fdcf31
--- /dev/null
+++ b/lang/de/events/github/pull_request.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'review' => '👥 Reviewers: ',
+    'closed' => [
+        'title' => ':title - 🦑:issue by :user',
+        'title_merged' => '✅ <b>Pull Request Merged</b>',
+        'title_closed' => '❌ <b>Pull Request Closed</b>',
+    ],
+    'opened' => [
+        'title' => '👷‍♂️🛠️ <b>New Pull Request</b> - 🦑:issue by :user',
+    ],
+    'reopened' => [
+        'title' => '👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑:issue by :user',
+    ],
+];
diff --git a/lang/de/events/github/pull_request_review.php b/lang/de/events/github/pull_request_review.php
new file mode 100644
index 0000000..da3b25c
--- /dev/null
+++ b/lang/de/events/github/pull_request_review.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'dismissed' => [
+        'title' => '👷‍♂️🛠️ <b>Dismissed Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'submitted' => [
+        'title' => '👷‍♂️‍🛠️ <b>New Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'link' => '🔗 Link: :review',
+];
diff --git a/lang/de/events/github/push.php b/lang/de/events/github/push.php
new file mode 100644
index 0000000..cf34b67
--- /dev/null
+++ b/lang/de/events/github/push.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
+        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'pushed' => '👤 Pushed by : <b>:name</b>',
+    ],
+];
diff --git a/lang/de/events/github/watch.php b/lang/de/events/github/watch.php
new file mode 100644
index 0000000..706de28
--- /dev/null
+++ b/lang/de/events/github/watch.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'started' => [
+        'title' => '🎉 <b>New Started</b> form 🦑:user',
+        'watcher' => '👤 Watcher: <b>:sender_login</b> 👀',
+    ],
+];
diff --git a/lang/de/events/github/workflow_job.php b/lang/de/events/github/workflow_job.php
new file mode 100644
index 0000000..67462ec
--- /dev/null
+++ b/lang/de/events/github/workflow_job.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'completed' => [
+        'completed' => '🎉 <b>Action Completed</b> form :user',
+        'done' => 'Done action: 🎉 <b>:runner_name</b> ✨',
+
+        'canceled' => '🚫 <b>Canceled Action</b> form 🦑:user',
+        'failed' => 'Failed action: 🚫 <b>:runner_name</b> ❌',
+    ],
+    'in_progress' => [
+        'progress' => '🔧 <b>Action in progress</b> form🦑:user',
+        'running' => 'Running action: 💥 <b>:runner_name</b> ⏳',
+    ],
+    'queued' => [
+        'title' => ' <b>Action Queued</b> form 🦑:user',
+        'body' => 'Queued action: 💥 <b>:runner_name</b> ⏰',
+    ],
+    'link' => '🔗 Workflow job link: :link',
+];
diff --git a/lang/de/events/github/workflow_run.php b/lang/de/events/github/workflow_run.php
new file mode 100644
index 0000000..4e895d4
--- /dev/null
+++ b/lang/de/events/github/workflow_run.php
@@ -0,0 +1,27 @@
+<?php
+
+return [
+    'completed' => [
+        'success' => [
+            'title' => '🎉 <b>Workflow Completed</b> form 🦑 :user',
+            'body' => 'Done workflow: 🎉 <b>:name</b> ✨ ',
+        ],
+        'failure' => [
+            'title' => '🚫 <b>Workflow Failed</b> form 🦑:user',
+            'body' => 'Failed workflow: 🚫 <b>:name</b> ❌',
+        ],
+        'cancelled' => [
+            'title' => '❌ <b>Workflow Cancelled</b> form 🦑 :user',
+            'body' => 'Cancelled workflow: 🚨 <b>:name</b> ❌ ',
+        ],
+        'default' => [
+            'title' => "🚨 <b>Workflow Can't Success</b> form 🦑:user",
+            'body' => "Can't Success workflow: 🚨 <b>:name</b> ❌",
+        ],
+    ],
+    'requested' => [
+        'title' => ' <b>Workflow Requested</b> form 🦑:user',
+        'body' => 'Running workflow: 💥 <b>:name</b> ⏳',
+    ],
+    'link' => '🔗 Link: :link',
+];
diff --git a/lang/de/events/shared/github.php b/lang/de/events/shared/github.php
new file mode 100644
index 0000000..ce3f29f
--- /dev/null
+++ b/lang/de/events/shared/github.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    '_body' => [
+        'title' => '📖 <b>Content:</b>',
+    ],
+    '_assignee' => [
+        'title' => '🙋 Assignee: ',
+    ],
+];
diff --git a/lang/en/events/github/workflow_job.php b/lang/en/events/github/workflow_job.php
index 87ba8d7..67462ec 100644
--- a/lang/en/events/github/workflow_job.php
+++ b/lang/en/events/github/workflow_job.php
@@ -16,5 +16,5 @@
         'title' => ' <b>Action Queued</b> form 🦑:user',
         'body' => 'Queued action: 💥 <b>:runner_name</b> ⏰',
     ],
-    'link' => '🔗 Workflow link: :link',
+    'link' => '🔗 Workflow job link: :link',
 ];
diff --git a/lang/ja/app.php b/lang/ja/app.php
new file mode 100644
index 0000000..63a8747
--- /dev/null
+++ b/lang/ja/app.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'by' => 'by',
+];
diff --git a/lang/ja/events/github/issue_comment.php b/lang/ja/events/github/issue_comment.php
new file mode 100644
index 0000000..5f972d7
--- /dev/null
+++ b/lang/ja/events/github/issue_comment.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'issue_comment_title' => '📢',
+    'created' => [
+        'title' => '💬 <b>New Issue Comment</b> ⚠️ to 🦑 :issue by :user',
+    ],
+    'deleted' => [
+        'title' => '🗑 <b>Issue Comment Deleted</b> 💬 from 🦑 :issue by :user',
+    ],
+    'edited' => [
+        'title' => '📝 <b>Issue Comment Edited</b> 💬 in 🦑 :issue by :user',
+    ],
+];
diff --git a/lang/ja/events/github/issues.php b/lang/ja/events/github/issues.php
new file mode 100644
index 0000000..87cff4a
--- /dev/null
+++ b/lang/ja/events/github/issues.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'issue_title' => '📢',
+    'closed' => [
+        'title' => '🚫 <b>Issue Closed </b> to 🦑 :issue by :user',
+    ],
+    'deleted' => [
+        'title' => '🗑 <b>Issue Deleted</b> form 🦑 :issue by :user',
+    ],
+    'edited' => [
+        'title' => '⚠️ <b>Issue has been edited</b> to 🦑 :issue by :user',
+        'changes' => [
+            'title' => [
+                'name' => '📖 <b>Title</b> has been changed',
+                'from' => '📝 <b>From:</b> :title_from',
+                'to' => '🏷 <b>To:</b> :title_to',
+            ],
+            'body' => [
+                'title' => '📖 <b>Body</b> has been changed',
+                'message' => 'Please check the issue for more details',
+            ],
+        ],
+    ],
+    'locked' => [
+        'title' => '🔒 <b>Issue Locked</b> form 🦑 :issue by :user',
+    ],
+    'opened' => [
+        'title' => '⚠️ <b>New Issue</b> to 🦑 :issue by :user',
+    ],
+    'pinned' => [
+        'title' => '📌 <b>Issue Pinned</b> form 🦑 :issue by :user',
+    ],
+    'reopened' => [
+        'title' => '⚠️ <b>Issue has been reopened</b> ⚠️ to 🦑 :issue by :user',
+    ],
+    'unlocked' => [
+        'title' => '🔐 <b>Issue Unlocked</b> form 🦑 :issue by :user',
+    ],
+    'unpinned' => [
+        'title' => '🔔 <b>Issue Unpinned</b> form 🦑 :issue by :user',
+    ],
+];
diff --git a/lang/ja/events/github/ping.php b/lang/ja/events/github/ping.php
new file mode 100644
index 0000000..7d9d2b9
--- /dev/null
+++ b/lang/ja/events/github/ping.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '♻️ <b>Connection Successful</b>',
+        'organization' => '🏢 Organization: <b>:organization</b>',
+        'full_name' => '📦 Repository: 🦑<b>:full_name</b>',
+        'sender' => '👤 Sender (triggered the event): <b>:sender</b>',
+    ],
+];
diff --git a/lang/ja/events/github/pull_request.php b/lang/ja/events/github/pull_request.php
new file mode 100644
index 0000000..8fdcf31
--- /dev/null
+++ b/lang/ja/events/github/pull_request.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'review' => '👥 Reviewers: ',
+    'closed' => [
+        'title' => ':title - 🦑:issue by :user',
+        'title_merged' => '✅ <b>Pull Request Merged</b>',
+        'title_closed' => '❌ <b>Pull Request Closed</b>',
+    ],
+    'opened' => [
+        'title' => '👷‍♂️🛠️ <b>New Pull Request</b> - 🦑:issue by :user',
+    ],
+    'reopened' => [
+        'title' => '👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑:issue by :user',
+    ],
+];
diff --git a/lang/ja/events/github/pull_request_review.php b/lang/ja/events/github/pull_request_review.php
new file mode 100644
index 0000000..da3b25c
--- /dev/null
+++ b/lang/ja/events/github/pull_request_review.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'dismissed' => [
+        'title' => '👷‍♂️🛠️ <b>Dismissed Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'submitted' => [
+        'title' => '👷‍♂️‍🛠️ <b>New Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'link' => '🔗 Link: :review',
+];
diff --git a/lang/ja/events/github/push.php b/lang/ja/events/github/push.php
new file mode 100644
index 0000000..cf34b67
--- /dev/null
+++ b/lang/ja/events/github/push.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
+        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'pushed' => '👤 Pushed by : <b>:name</b>',
+    ],
+];
diff --git a/lang/ja/events/github/watch.php b/lang/ja/events/github/watch.php
new file mode 100644
index 0000000..706de28
--- /dev/null
+++ b/lang/ja/events/github/watch.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'started' => [
+        'title' => '🎉 <b>New Started</b> form 🦑:user',
+        'watcher' => '👤 Watcher: <b>:sender_login</b> 👀',
+    ],
+];
diff --git a/lang/ja/events/github/workflow_job.php b/lang/ja/events/github/workflow_job.php
new file mode 100644
index 0000000..67462ec
--- /dev/null
+++ b/lang/ja/events/github/workflow_job.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'completed' => [
+        'completed' => '🎉 <b>Action Completed</b> form :user',
+        'done' => 'Done action: 🎉 <b>:runner_name</b> ✨',
+
+        'canceled' => '🚫 <b>Canceled Action</b> form 🦑:user',
+        'failed' => 'Failed action: 🚫 <b>:runner_name</b> ❌',
+    ],
+    'in_progress' => [
+        'progress' => '🔧 <b>Action in progress</b> form🦑:user',
+        'running' => 'Running action: 💥 <b>:runner_name</b> ⏳',
+    ],
+    'queued' => [
+        'title' => ' <b>Action Queued</b> form 🦑:user',
+        'body' => 'Queued action: 💥 <b>:runner_name</b> ⏰',
+    ],
+    'link' => '🔗 Workflow job link: :link',
+];
diff --git a/lang/ja/events/github/workflow_run.php b/lang/ja/events/github/workflow_run.php
new file mode 100644
index 0000000..4e895d4
--- /dev/null
+++ b/lang/ja/events/github/workflow_run.php
@@ -0,0 +1,27 @@
+<?php
+
+return [
+    'completed' => [
+        'success' => [
+            'title' => '🎉 <b>Workflow Completed</b> form 🦑 :user',
+            'body' => 'Done workflow: 🎉 <b>:name</b> ✨ ',
+        ],
+        'failure' => [
+            'title' => '🚫 <b>Workflow Failed</b> form 🦑:user',
+            'body' => 'Failed workflow: 🚫 <b>:name</b> ❌',
+        ],
+        'cancelled' => [
+            'title' => '❌ <b>Workflow Cancelled</b> form 🦑 :user',
+            'body' => 'Cancelled workflow: 🚨 <b>:name</b> ❌ ',
+        ],
+        'default' => [
+            'title' => "🚨 <b>Workflow Can't Success</b> form 🦑:user",
+            'body' => "Can't Success workflow: 🚨 <b>:name</b> ❌",
+        ],
+    ],
+    'requested' => [
+        'title' => ' <b>Workflow Requested</b> form 🦑:user',
+        'body' => 'Running workflow: 💥 <b>:name</b> ⏳',
+    ],
+    'link' => '🔗 Link: :link',
+];
diff --git a/lang/ja/events/shared/github.php b/lang/ja/events/shared/github.php
new file mode 100644
index 0000000..ce3f29f
--- /dev/null
+++ b/lang/ja/events/shared/github.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    '_body' => [
+        'title' => '📖 <b>Content:</b>',
+    ],
+    '_assignee' => [
+        'title' => '🙋 Assignee: ',
+    ],
+];
diff --git a/lang/vi/app.php b/lang/vi/app.php
new file mode 100644
index 0000000..63a8747
--- /dev/null
+++ b/lang/vi/app.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'by' => 'by',
+];
diff --git a/lang/vi/events/github/issue_comment.php b/lang/vi/events/github/issue_comment.php
new file mode 100644
index 0000000..5f972d7
--- /dev/null
+++ b/lang/vi/events/github/issue_comment.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'issue_comment_title' => '📢',
+    'created' => [
+        'title' => '💬 <b>New Issue Comment</b> ⚠️ to 🦑 :issue by :user',
+    ],
+    'deleted' => [
+        'title' => '🗑 <b>Issue Comment Deleted</b> 💬 from 🦑 :issue by :user',
+    ],
+    'edited' => [
+        'title' => '📝 <b>Issue Comment Edited</b> 💬 in 🦑 :issue by :user',
+    ],
+];
diff --git a/lang/vi/events/github/issues.php b/lang/vi/events/github/issues.php
new file mode 100644
index 0000000..87cff4a
--- /dev/null
+++ b/lang/vi/events/github/issues.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'issue_title' => '📢',
+    'closed' => [
+        'title' => '🚫 <b>Issue Closed </b> to 🦑 :issue by :user',
+    ],
+    'deleted' => [
+        'title' => '🗑 <b>Issue Deleted</b> form 🦑 :issue by :user',
+    ],
+    'edited' => [
+        'title' => '⚠️ <b>Issue has been edited</b> to 🦑 :issue by :user',
+        'changes' => [
+            'title' => [
+                'name' => '📖 <b>Title</b> has been changed',
+                'from' => '📝 <b>From:</b> :title_from',
+                'to' => '🏷 <b>To:</b> :title_to',
+            ],
+            'body' => [
+                'title' => '📖 <b>Body</b> has been changed',
+                'message' => 'Please check the issue for more details',
+            ],
+        ],
+    ],
+    'locked' => [
+        'title' => '🔒 <b>Issue Locked</b> form 🦑 :issue by :user',
+    ],
+    'opened' => [
+        'title' => '⚠️ <b>New Issue</b> to 🦑 :issue by :user',
+    ],
+    'pinned' => [
+        'title' => '📌 <b>Issue Pinned</b> form 🦑 :issue by :user',
+    ],
+    'reopened' => [
+        'title' => '⚠️ <b>Issue has been reopened</b> ⚠️ to 🦑 :issue by :user',
+    ],
+    'unlocked' => [
+        'title' => '🔐 <b>Issue Unlocked</b> form 🦑 :issue by :user',
+    ],
+    'unpinned' => [
+        'title' => '🔔 <b>Issue Unpinned</b> form 🦑 :issue by :user',
+    ],
+];
diff --git a/lang/vi/events/github/ping.php b/lang/vi/events/github/ping.php
new file mode 100644
index 0000000..7d9d2b9
--- /dev/null
+++ b/lang/vi/events/github/ping.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '♻️ <b>Connection Successful</b>',
+        'organization' => '🏢 Organization: <b>:organization</b>',
+        'full_name' => '📦 Repository: 🦑<b>:full_name</b>',
+        'sender' => '👤 Sender (triggered the event): <b>:sender</b>',
+    ],
+];
diff --git a/lang/vi/events/github/pull_request.php b/lang/vi/events/github/pull_request.php
new file mode 100644
index 0000000..8fdcf31
--- /dev/null
+++ b/lang/vi/events/github/pull_request.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'review' => '👥 Reviewers: ',
+    'closed' => [
+        'title' => ':title - 🦑:issue by :user',
+        'title_merged' => '✅ <b>Pull Request Merged</b>',
+        'title_closed' => '❌ <b>Pull Request Closed</b>',
+    ],
+    'opened' => [
+        'title' => '👷‍♂️🛠️ <b>New Pull Request</b> - 🦑:issue by :user',
+    ],
+    'reopened' => [
+        'title' => '👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑:issue by :user',
+    ],
+];
diff --git a/lang/vi/events/github/pull_request_review.php b/lang/vi/events/github/pull_request_review.php
new file mode 100644
index 0000000..da3b25c
--- /dev/null
+++ b/lang/vi/events/github/pull_request_review.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'dismissed' => [
+        'title' => '👷‍♂️🛠️ <b>Dismissed Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'submitted' => [
+        'title' => '👷‍♂️‍🛠️ <b>New Pull Request Review Comment</b> 💬 - 🦑:issue by :user',
+    ],
+    'link' => '🔗 Link: :review',
+];
diff --git a/lang/vi/events/github/push.php b/lang/vi/events/github/push.php
new file mode 100644
index 0000000..cf34b67
--- /dev/null
+++ b/lang/vi/events/github/push.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
+        'commit' => ':commit: :commit_message - by <i>:commit_name</i>',
+        'pushed' => '👤 Pushed by : <b>:name</b>',
+    ],
+];
diff --git a/lang/vi/events/github/watch.php b/lang/vi/events/github/watch.php
new file mode 100644
index 0000000..706de28
--- /dev/null
+++ b/lang/vi/events/github/watch.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'started' => [
+        'title' => '🎉 <b>New Started</b> form 🦑:user',
+        'watcher' => '👤 Watcher: <b>:sender_login</b> 👀',
+    ],
+];
diff --git a/lang/vi/events/github/workflow_job.php b/lang/vi/events/github/workflow_job.php
new file mode 100644
index 0000000..67462ec
--- /dev/null
+++ b/lang/vi/events/github/workflow_job.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'completed' => [
+        'completed' => '🎉 <b>Action Completed</b> form :user',
+        'done' => 'Done action: 🎉 <b>:runner_name</b> ✨',
+
+        'canceled' => '🚫 <b>Canceled Action</b> form 🦑:user',
+        'failed' => 'Failed action: 🚫 <b>:runner_name</b> ❌',
+    ],
+    'in_progress' => [
+        'progress' => '🔧 <b>Action in progress</b> form🦑:user',
+        'running' => 'Running action: 💥 <b>:runner_name</b> ⏳',
+    ],
+    'queued' => [
+        'title' => ' <b>Action Queued</b> form 🦑:user',
+        'body' => 'Queued action: 💥 <b>:runner_name</b> ⏰',
+    ],
+    'link' => '🔗 Workflow job link: :link',
+];
diff --git a/lang/vi/events/github/workflow_run.php b/lang/vi/events/github/workflow_run.php
new file mode 100644
index 0000000..4e895d4
--- /dev/null
+++ b/lang/vi/events/github/workflow_run.php
@@ -0,0 +1,27 @@
+<?php
+
+return [
+    'completed' => [
+        'success' => [
+            'title' => '🎉 <b>Workflow Completed</b> form 🦑 :user',
+            'body' => 'Done workflow: 🎉 <b>:name</b> ✨ ',
+        ],
+        'failure' => [
+            'title' => '🚫 <b>Workflow Failed</b> form 🦑:user',
+            'body' => 'Failed workflow: 🚫 <b>:name</b> ❌',
+        ],
+        'cancelled' => [
+            'title' => '❌ <b>Workflow Cancelled</b> form 🦑 :user',
+            'body' => 'Cancelled workflow: 🚨 <b>:name</b> ❌ ',
+        ],
+        'default' => [
+            'title' => "🚨 <b>Workflow Can't Success</b> form 🦑:user",
+            'body' => "Can't Success workflow: 🚨 <b>:name</b> ❌",
+        ],
+    ],
+    'requested' => [
+        'title' => ' <b>Workflow Requested</b> form 🦑:user',
+        'body' => 'Running workflow: 💥 <b>:name</b> ⏳',
+    ],
+    'link' => '🔗 Link: :link',
+];
diff --git a/lang/vi/events/shared/github.php b/lang/vi/events/shared/github.php
new file mode 100644
index 0000000..ce3f29f
--- /dev/null
+++ b/lang/vi/events/shared/github.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    '_body' => [
+        'title' => '📖 <b>Content:</b>',
+    ],
+    '_assignee' => [
+        'title' => '🙋 Assignee: ',
+    ],
+];