Skip to content

Commit

Permalink
fix: update view template for some events
Browse files Browse the repository at this point in the history
  • Loading branch information
@tanhongit
tanhongit committed Nov 23, 2023
1 parent 81cebcf commit 62aa76d
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 21 deletions.
8 changes: 4 additions & 4 deletions lang/en/events/github/pull_request.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
return [
'review' => '👥 Reviewers: ',
'closed' => [
'title' => ':title - 🦑:issue by :user',
'title' => ':title - 🦑:repo by :user',
'title_merged' => '✅ <b>Pull Request Merged</b>',
'title_closed' => '❌ <b>Pull Request Closed</b>',
'title_closed' => '🚫 <b>Pull Request Closed</b>',
],
'opened' => [
'title' => '👷‍♂️🛠️ <b>New Pull Request</b> - 🦑:issue by :user',
'title' => '👷‍♂️🛠️ <b>New Pull Request</b> - 🦑:repo by :user',
],
'reopened' => [
'title' => '👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑:issue by :user',
'title' => '👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑:repo by :user',
],
];
17 changes: 10 additions & 7 deletions lang/en/events/gitlab/merge_request.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,30 @@
return [
'review' => '👥 Reviewers: ',
'closed' => [
'title' => '❌ <b>Merge Request Closed</b> - 🦊:repo by :user',
'title' => '🚫 <b>Merge Request Closed</b> - 🦊:repo by :user',
],
'merged' => [
'title' => '✅ <b>Merge Request Merged</b> - 🦊:repo by :user',
],
'opened' => [
'title' => '👷‍♂️🛠️ <b>New Merge Request</b> - 🦊:issue by :user',
'title' => '👷‍♂️🛠️ <b>New Merge Request</b> - 🦊:repo by :user',
],
'reopened' => [
'title' => '👷‍♂️🛠️ <b>Merge Request Reopened</b> - 🦊:issue by :user',
'title' => '👷‍♂️🛠️ <b>Merge Request Reopened</b> - 🦊:repo by :user',
],
'approved' => [
'title' => '👍 <b>Merge Request Approved</b> ✅ - 🦊:issue by :user',
'title' => '👍 <b>Merge Request Approved</b> ✅ - 🦊:repo by :user',
],
'unapproved' => [
'title' => '👎 <b>Merge Request Unapproved</b> ❌ - 🦊:issue by :user',
'title' => '👎 <b>Merge Request Unapproved</b> ❌ - 🦊:repo by :user',
],
'approval' => [
'title' => '👍 <b>Merge Request Approval</b> ✅ - 🦊:issue by :user',
'title' => '👍 <b>Merge Request Approval</b> ✅ - 🦊:repo by :user',
],
'unapproval' => [
'title' => '👎 <b>Merge Request Unapproval</b> ❌ - 🦊:issue by :user',
'title' => '👎 <b>Merge Request Unapproval</b> ❌ - 🦊:repo by :user',
],
'update' => [
'title' => '🛠️ <b>Merge Request Updated</b> - 🦊:repo by :user',
],
];
2 changes: 1 addition & 1 deletion lang/en/events/gitlab/tag_push.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

return [
'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
'tag_name' => '🔖 <b>Tag Name</b>: :tag_name',
'name' => '🔖 <b>Tag Name</b>: :tag_name',
'pusher' => '👤 Pushed by: <b>:pusher</b>',
];
9 changes: 4 additions & 5 deletions resources/views/events/github/pull_request/closed.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
?>

{!! __('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>"
]
) !!}
'title' => $message,
'repo' => "<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>"
]) !!}

📢 <b>{{ $pull_request->title }}</b>

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/pull_request/opened.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
?>

{!! __('tg-notifier::events/github/pull_request.opened.title', [
'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
'repo' => "<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>"
]
) !!}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/pull_request/reopened.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
?>

{!! __('tg-notifier::events/github/pull_request.reopened.title', [
'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
'repo' => "<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>"
]
) !!}
Expand Down
1 change: 0 additions & 1 deletion resources/views/events/gitlab/merge_request/partials/_reviewers.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
$reviewers[] = "<b>{$reviewer->name}</b>";
}
$textReviewers .= "👥 Reviewers: " . implode(', ', $reviewers) . "\n";
$textReviewers .= __('tg-notifier::events/gitlab/merge_request.review') . implode(', ', $reviewers);
}
?>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/gitlab/merge_request/reopen.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
?>
{!! __('tg-notifier::events/gitlab/merge_request.opened.title', [
{!! __('tg-notifier::events/gitlab/merge_request.reopened.title', [
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->iid}</a>",
'user' => "<b>{$payload->user->name}</b>"
]) !!}
Expand Down
1 change: 1 addition & 0 deletions resources/views/events/gitlab/wiki_page/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @var $event string
*/
?>
{!! __('tg-notifier::events/gitlab/wiki_page.title.create', [
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
'user' => "<b>{$payload->user->name}</b>"
Expand Down
1 change: 1 addition & 0 deletions resources/views/events/gitlab/wiki_page/delete.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @var $event string
*/
?>
{!! __('tg-notifier::events/gitlab/wiki_page.title.delete', [
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
'user' => "<b>{$payload->user->name}</b>"
Expand Down
1 change: 1 addition & 0 deletions resources/views/events/gitlab/wiki_page/update.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @var $event string
*/
?>
{!! __('tg-notifier::events/gitlab/wiki_page.title.update', [
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
'user' => "<b>{$payload->user->name}</b>"
Expand Down

0 comments on commit 62aa76d

Please sign in to comment.