Merge pull request #26 from pxthinh/feature/view_template

tanhongit · web-flow · commit d477dda234bf · 2023-11-19T11:08:08.000+07:00
update view and lang for pull request and fix icon in lang
diff --git a/lang/en/events/github/pull_request.php b/lang/en/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/resources/views/events/github/issue_comment/created.blade.php b/resources/views/events/github/issue_comment/created.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issue_comment.issue_comment_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', 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
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issue_comment.issue_comment_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', 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
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issue_comment.issue_comment_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/closed.blade.php b/resources/views/events/github/issues/closed.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/deleted.blade.php b/resources/views/events/github/issues/deleted.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/edited.blade.php b/resources/views/events/github/issues/edited.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 @if(isset($payload->changes->title))
diff --git a/resources/views/events/github/issues/locked.blade.php b/resources/views/events/github/issues/locked.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/opened.blade.php b/resources/views/events/github/issues/opened.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/pinned.blade.php b/resources/views/events/github/issues/pinned.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/reopened.blade.php b/resources/views/events/github/issues/reopened.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/unlocked.blade.php b/resources/views/events/github/issues/unlocked.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
diff --git a/resources/views/events/github/issues/unpinned.blade.php b/resources/views/events/github/issues/unpinned.blade.php
@@ -13,7 +13,7 @@
         ]
     ) !!}
 
-{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
+📢 <b>{{ $issue->title }}</b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', 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
@@ -1,23 +1,29 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = '✅ <b>Pull Request Merged';
+$pull_request = $payload->pull_request;
+
+$message = __('tg-notifier::events/github/pull_request.closed.title_merged');
 if (!isset($payload->pull_request->merged) || $payload->pull_request->merged !== true) {
-    $message = '❌ <b>Pull Request Closed';
+    $message = __('tg-notifier::events/github/pull_request.closed.title_closed');
 }
+?>
 
-$message = $message . "</b> - 🦑<a href=\"{$payload->pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number}</a> by <a href=\"{$payload->pull_request->user->html_url}\">@{$payload->pull_request->user->login}</a>\n\n";
-
-$message .= "🛠 <b>{$payload->pull_request->title}</b> \n\n";
-
-$message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
+{!! __('tg-notifier::events/github/pull_request.closed.title', [
+            'title' => $message,
+            '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 .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+📢 <b>{{ $pull_request->title }}</b>
 
-$message .= require __DIR__ . '/partials/_reviewers.php';
+🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
+@include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
 
-echo $message;
+@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
@@ -1,18 +1,23 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "👷‍♂️🛠️ <b>New Pull Request</b> - 🦑<a href=\"{$payload->pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number}</a> create by <a href=\"{$payload->pull_request->user->html_url}\">@{$payload->pull_request->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.opened.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 .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
+📢 <b>{{ $pull_request->title }}</b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-$message .= require __DIR__ . '/partials/_reviewers.php';
+@include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
-
-echo $message;
+@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
@@ -10,7 +10,7 @@
         $reviewers[] = "<b>{$reviewer->login}</b>";
     }
 
-    $textReviewers .= "👥 Reviewers: " . implode(', ', $reviewers) . "\n";
+    $textReviewers .= __('tg-notifier::events/github/pull_request.review') . implode(', ', $reviewers);
 }
-
-return $textReviewers;
+?>
+{!! $textReviewers !!}
diff --git a/resources/views/events/github/pull_request/reopened.blade.php b/resources/views/events/github/pull_request/reopened.blade.php
@@ -1,18 +1,23 @@
 <?php
 /**
  * @var $payload mixed
+ * @var $event string
  */
 
-$message = "👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑<a href=\"{$payload->pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number}</a> by <a href=\"{$payload->pull_request->user->html_url}\">@{$payload->pull_request->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.reopened.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 .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
+📢 <b>{{ $pull_request->title }}</b>
 
-$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
+🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
+@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
 
-$message .= require __DIR__ . '/partials/_reviewers.php';
+@include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
 
-$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
-
-echo $message;
+@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`]`
`14`	`14`	`) !!}`
`15`	`15`
`16`		`-{!! __('tg-notifier::events/github/issue_comment.issue_comment_title') !!} <b><?= $issue->title; ?></b>`
	`16`	`+📢 <b>{{ $issue->title }}</b>`
`17`	`17`
`18`	`18`	`@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))`
`19`	`19`