Skip to content

Commit aa28728

Browse files
pxthinhpxthinh
committed
feat: update view and lang for pull request
1 parent e641f78 commit aa28728

File tree

5 files changed

+62
-30
lines changed

5 files changed

+62
-30
lines changed

‎lang/en/events/github/pull_request.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
return [
4+
'review' => '👥 Reviewers: ',
5+
'closed' => [
6+
'title' => ':title - 🦑:issue by :user',
7+
'title_merged' => '✅ <b>Pull Request Merged</b>',
8+
'title_closed' => '❌ <b>Pull Request Closed</b>',
9+
],
10+
'opened' => [
11+
'title' => '👷‍♂️🛠️ <b>New Pull Request</b> - 🦑:issue by :user',
12+
],
13+
'reopened' => [
14+
'title' => '👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑:issue by :user',
15+
],
16+
];

‎resources/views/events/github/pull_request/closed.blade.php‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
<?php
22
/**
33
* @var $payload mixed
4+
* @var $event string
45
*/
56
6-
$message = '✅ <b>Pull Request Merged';
7+
$pull_request = $payload->pull_request;
8+
9+
$message = __('tg-notifier::events/github/pull_request.closed.title_merged');
710
if (!isset($payload->pull_request->merged) || $payload->pull_request->merged !== true) {
8-
$message = '❌ <b>Pull Request Closed';
11+
$message = __('tg-notifier::events/github/pull_request.closed.title_closed');
912
}
13+
?>
1014

11-
$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";
12-
13-
$message .= "🛠 <b>{$payload->pull_request->title}</b> \n\n";
14-
15-
$message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
15+
{!! __('tg-notifier::events/github/pull_request.closed.title', [
16+
'title' => $message,
17+
'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
18+
'user' => "<a href='{$pull_request->user->html_url}'>@{$pull_request->user->login}</a>"
19+
]
20+
) !!}
1621

17-
$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
22+
📢 <b>{{ $pull_request->title }}</b>
1823

19-
$message .= require __DIR__ . '/partials/_reviewers.php';
24+
🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
25+
@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
2026

21-
$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
27+
@include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
2228

23-
echo $message;
29+
@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))

‎resources/views/events/github/pull_request/opened.blade.php‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
<?php
22
/**
33
* @var $payload mixed
4+
* @var $event string
45
*/
56
6-
$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";
7+
$pull_request = $payload->pull_request;
8+
?>
79

8-
$message .= "🛠 <b>{$payload->pull_request->title}</b> \n\n";
10+
{!! __('tg-notifier::events/github/pull_request.opened.title', [
11+
'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
12+
'user' => "<a href='{$pull_request->user->html_url}'>@{$pull_request->user->login}</a>"
13+
]
14+
) !!}
915

10-
$message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
16+
📢 <b>{{ $pull_request->title }}</b>
1117

12-
$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
18+
🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
19+
@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
1320

14-
$message .= require __DIR__ . '/partials/_reviewers.php';
21+
@include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
1522

16-
$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
17-
18-
echo $message;
23+
@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))

‎resources/views/events/github/pull_request/partials/_reviewers.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
$reviewers[] = "<b>{$reviewer->login}</b>";
1111
}
1212
13-
$textReviewers .= "👥 Reviewers: " . implode(', ', $reviewers) . "\n";
13+
$textReviewers .= __('tg-notifier::events/github/pull_request.review') . implode(', ', $reviewers);
1414
}
15-
16-
return $textReviewers;
15+
?>
16+
{!! $textReviewers !!}

‎resources/views/events/github/pull_request/reopened.blade.php‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
<?php
22
/**
33
* @var $payload mixed
4+
* @var $event string
45
*/
56
6-
$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";
7+
$pull_request = $payload->pull_request;
8+
?>
79

8-
$message .= "🛠 <b>{$payload->pull_request->title}</b> \n\n";
10+
{!! __('tg-notifier::events/github/pull_request.reopened.title', [
11+
'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
12+
'user' => "<a href='{$pull_request->user->html_url}'>@{$pull_request->user->login}</a>"
13+
]
14+
) !!}
915

10-
$message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
16+
📢 <b>{{ $pull_request->title }}</b>
1117

12-
$message .= require __DIR__ . '/../../shared/partials/github/_assignees.php';
18+
🌳 {{ $pull_request->head->ref }} -> {{ $pull_request->base->ref }} 🎯
19+
@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
1320

14-
$message .= require __DIR__ . '/partials/_reviewers.php';
21+
@include('tg-notifier::events.github.pull_request.partials._reviewers', compact('payload'))
1522

16-
$message .= require __DIR__ . '/../../shared/partials/github/_body.php';
17-
18-
echo $message;
23+
@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))

0 commit comments

Comments
 (0)