diff --git a/lang/en/events/github/pull_request.php b/lang/en/events/github/pull_request.php new file mode 100644 index 0000000..8fdcf31 --- /dev/null +++ b/lang/en/events/github/pull_request.php @@ -0,0 +1,16 @@ + '👥 Reviewers: ', + 'closed' => [ + 'title' => ':title - 🦑:issue by :user', + 'title_merged' => '✅ Pull Request Merged', + 'title_closed' => '❌ Pull Request Closed', + ], + 'opened' => [ + 'title' => '👷‍♂️🛠️ New Pull Request - 🦑:issue by :user', + ], + 'reopened' => [ + 'title' => '👷‍♂️🛠️ Reopened Pull Request - 🦑: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 index 903bd0a..604759a 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index e799881..52e8ebe 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index 749d1d9..c1c1c0e 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index 7f20b3d..5940c15 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index a04857d..b0dde6b 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index f3826ac..b487dd5 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index 7c2e722..3d521de 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index 41c4b73..bad7aa2 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index 5ef633d..f431c3b 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index c8ca1a2..629c01a 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index 7bc8759..11f2da9 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index 0a8e287..e2bbc83 100644 --- 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') !!} title; ?> +📢 {{ $issue->title }} @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 index c6c4bae..59722ab 100644 --- a/resources/views/events/github/pull_request/closed.blade.php +++ b/resources/views/events/github/pull_request/closed.blade.php @@ -1,23 +1,29 @@ 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 = '❌ Pull Request Closed'; + $message = __('tg-notifier::events/github/pull_request.closed.title_closed'); } +?> -$message = $message . " - 🦑pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number} by pull_request->user->html_url}\">@{$payload->pull_request->user->login}\n\n"; - -$message .= "🛠 {$payload->pull_request->title} \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' => "{$payload->repository->full_name}#$pull_request->number", + 'user' => "@{$pull_request->user->login}" + ] + ) !!} -$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php'; +📢 {{ $pull_request->title }} -$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 index 9657c84..9114c83 100644 --- a/resources/views/events/github/pull_request/opened.blade.php +++ b/resources/views/events/github/pull_request/opened.blade.php @@ -1,18 +1,23 @@ New Pull Request - 🦑pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number} create by pull_request->user->html_url}\">@{$payload->pull_request->user->login}\n\n"; +$pull_request = $payload->pull_request; +?> -$message .= "🛠 {$payload->pull_request->title} \n\n"; +{!! __('tg-notifier::events/github/pull_request.opened.title', [ + 'issue' => "{$payload->repository->full_name}#$pull_request->number", + 'user' => "@{$pull_request->user->login}" + ] + ) !!} -$message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n"; +📢 {{ $pull_request->title }} -$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 index bab3614..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[] = "{$reviewer->login}"; } - $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 index f03370c..5567a00 100644 --- a/resources/views/events/github/pull_request/reopened.blade.php +++ b/resources/views/events/github/pull_request/reopened.blade.php @@ -1,18 +1,23 @@ Reopened Pull Request - 🦑pull_request->html_url}\">{$payload->repository->full_name}#{$payload->pull_request->number} by pull_request->user->html_url}\">@{$payload->pull_request->user->login}\n\n"; +$pull_request = $payload->pull_request; +?> -$message .= "🛠 {$payload->pull_request->title} \n\n"; +{!! __('tg-notifier::events/github/pull_request.reopened.title', [ + 'issue' => "{$payload->repository->full_name}#$pull_request->number", + 'user' => "@{$pull_request->user->login}" + ] + ) !!} -$message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n"; +📢 {{ $pull_request->title }} -$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'))