Skip to content

Commit b52b36d

Browse files
hokhacminhtrihokhacminhtri
committed
Merge branch 'main' into feature/team
2 parents 4c4e69b + 8f7d665 commit b52b36d

File tree

11 files changed

+29
-17
lines changed

11 files changed

+29
-17
lines changed

‎lang/de/app.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
'by' => 'by',
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
66
'invalid_request' => 'Invalid Request!',
7+
'branch' => 'Branch',
78
];

‎lang/de/events/github/push.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
return [
44
'default' => [
5-
'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
5+
'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
66
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
77
'pusher' => 'Pushed by',
88
],

‎lang/en/app.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
'by' => 'by',
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
66
'invalid_request' => 'Invalid Request!',
7+
'branch' => 'Branch',
78
];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
return [
44
'default' => [
5-
'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
5+
'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
66
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
77
'pusher' => 'Pushed by',
88
],

‎lang/ja/app.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
'by' => 'by',
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
66
'invalid_request' => 'Invalid Request!',
7+
'branch' => 'Branch',
78
];

‎lang/ja/events/github/push.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
return [
44
'default' => [
5-
'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
5+
'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
66
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
77
'pusher' => 'Pushed by',
88
],

‎lang/vi/app.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

33
return [
4-
'by' => 'bởi',
5-
'unknown_callback' => 'Callback không xác định. Đã xảy ra lỗi!',
6-
'invalid_request' => 'Yêu cầu không hợp lệ!',
4+
'by' => 'by',
5+
'unknown_callback' => 'Unknown Callback. Something went wrong!',
6+
'invalid_request' => 'Invalid Request!',
7+
'branch' => 'Branch',
78
];

‎lang/vi/events/github/push.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
return [
44
'default' => [
5-
'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
5+
'title' => '<b>:count</b> new :noun to <b>:repo:<code>:branch</code></b>',
66
'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
77
'pusher' => 'Pushed by',
88
],

‎resources/views/events/github/push/default.blade.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,26 @@
88
99
$ref = explode('/', $payload->ref);
1010
$branch = implode('/', array_slice($ref, 2));
11+
12+
if (empty($payload->commits)) {
13+
return '';
14+
}
1115
?>
1216

13-
{!! __('tg-notifier::events/github/push.default.title', [
17+
👷⚙️ {!! __('tg-notifier::events/github/push.default.title', [
1418
'count' => $count,
1519
'noun' => $noun,
16-
'repo' => $payload->repository->full_name,
20+
'repo' => "🦑<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>",
1721
'branch' => $branch,
1822
]
1923
) !!}
2024

2125
@foreach($payload->commits as $commit)
2226
@php
2327
$commitId = substr($commit->id, -7);
28+
29+
$commit->message = $commit->message ?? '';
30+
$commit->message = explode("\n", $commit->message)[0];
2431
@endphp
2532
{!! __('tg-notifier::events/github/push.default.commit', [
2633
'commit' => "<a href='$commit->url'>$commitId</a>",
@@ -30,4 +37,5 @@
3037
) !!}
3138
@endforeach
3239

40+
🌲 {{ __('tg-notifier::app.branch') }}: <code>{{ $branch }}</code>
3341
👤 {!! __('tg-notifier::events/github/push.default.pusher') !!}: <code>{{ $payload->pusher->name }}</code>

‎resources/views/events/github/workflow_job/completed.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
{{ $icon }} {!! __("tg-notifier::events/github/workflow_job.completed.$status", ['repo' => "🦑<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
2323

2424
🚀 {!! __('tg-notifier::events/github/workflow_job.name') !!}: {{ $icon }} <code>{{ $payload->workflow_job->name }}</code> {{ $last }}
25-
🚨 {!! __('tg-notifier::events/github/workflow_job.status.title') !!}: <code>{!! __('tg-notifier::events/github/workflow_job.status.'.$status) !!}</code> 🕓 <code>{{ $allSeconds }}s</code>
25+
🚨 {!! __('tg-notifier::events/github/workflow_job.status.title') !!}: <code>{!! __('tg-notifier::events/github/workflow_job.status.'.$status) !!}</code> ⏱️ <code>{{ $allSeconds }}s</code>
2626
🔗 {!! __('tg-notifier::events/github/workflow_job.link', ['link' => "<a href='{$payload->workflow_job->html_url}'>{$payload->workflow_job->workflow_name}</a>"]) !!}

0 commit comments

Comments
 (0)