Skip to content

Commit 852d69e

Browse files
tanhongittanhongit
authored
Merge pull request #72 from tanhongit/fix/update-gitlab-event-template
Fix/update Gitlab event template
2 parents 06dc1b9 + 7dbb1d1 commit 852d69e

File tree

23 files changed

+64
-74
lines changed

23 files changed

+64
-74
lines changed

‎README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## 📝 Introduction
1818

19-
Laravel Telegram Git Notifier is a package that allows you to create a Telegram bot to receive notifications from GitHub
19+
Laravel Telegram Git Notifier is a Laravel package that allows you to create a Telegram bot to receive notifications from GitHub
2020
or GitLab events and manage customization through messages and buttons on Telegram.
2121

2222
- Send notifications of your GitHub/GitLab repositories to Telegram Bots, Groups, Super Groups (Multiple Topics), and
@@ -58,13 +58,12 @@ information.
5858
- [x] Issue Comment
5959
- [x] Pull Request
6060
- [x] Pull Request Review
61-
- [x] Pull Request Review Comment
6261
- [x] Fork
6362
- [x] Commit Comment
6463
- [x] Deployment
6564
- [x] Deployment Status
6665
- [x] Fork
67-
- [x] Gollum
66+
- [x] Workflow
6867
- [x] Watch
6968

7069
... and more events can be seen in the [all GitHub events available](https://docs.cslant.com/telegram-git-notifier/prologue/event-availability/github)

‎lang/de/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
return [
44
'by' => 'by',
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
6-
'invalid_request' => '🤨 Invalid Request!',
6+
'invalid_request' => 'Invalid Request!',
77
];

‎lang/de/events/gitlab/tag_push.php

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

33
return [
4-
'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
5-
'name' => '🔖 <b>Tag Name</b>: :tag_name',
6-
'pusher' => '👤 Pushed by: <b>:pusher</b>',
4+
'title' => '<b>A new tag has been pushed to the project</b> :repo',
5+
'name' => '<b>Tag Name</b>: :tag_name',
6+
'pusher' => ' Pushed by',
77
];

‎lang/de/events/gitlab/wiki_page.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
return [
44
'title' => [
5-
'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
6-
'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
7-
'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
5+
'create' => '<b>Wiki Page Created</b> - :repo by :user',
6+
'update' => '<b>Wiki Page Updated</b> - :repo by :user',
7+
'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
88
],
9-
'name' => '📝 Page Name: <b>:name</b>',
9+
'name' => 'Page Name',
1010
];

‎lang/de/events/shared/gitlab.php

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

33
return [
44
'_body' => [
5-
'title' => '📖 <b>Content:</b>',
5+
'title' => 'Content',
66
],
77
'_assignee' => [
88
'title' => '🙋 Assignee: ',

‎lang/en/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
return [
44
'by' => 'by',
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
6-
'invalid_request' => '🤨 Invalid Request!',
6+
'invalid_request' => 'Invalid Request!',
77
];

‎lang/en/events/gitlab/tag_push.php

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

33
return [
4-
'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
5-
'name' => '🔖 <b>Tag Name</b>: :tag_name',
6-
'pusher' => '👤 Pushed by: <b>:pusher</b>',
4+
'title' => '<b>A new tag has been pushed to the project</b> :repo',
5+
'name' => '<b>Tag Name</b>: :tag_name',
6+
'pusher' => ' Pushed by',
77
];

‎lang/en/events/gitlab/wiki_page.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
return [
44
'title' => [
5-
'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
6-
'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
7-
'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
5+
'create' => '<b>Wiki Page Created</b> - :repo by :user',
6+
'update' => '<b>Wiki Page Updated</b> - :repo by :user',
7+
'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
88
],
9-
'name' => '📝 Page Name: <b>:name</b>',
9+
'name' => 'Page Name',
1010
];

‎lang/en/events/shared/gitlab.php

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

33
return [
44
'_body' => [
5-
'title' => '📖 <b>Content:</b>',
5+
'title' => 'Content',
66
],
77
'_assignee' => [
88
'title' => '🙋 Assignee: ',

‎lang/ja/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
return [
44
'by' => 'by',
55
'unknown_callback' => 'Unknown Callback. Something went wrong!',
6-
'invalid_request' => '🤨 Invalid Request!',
6+
'invalid_request' => 'Invalid Request!',
77
];

‎lang/ja/events/gitlab/tag_push.php

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

33
return [
4-
'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
5-
'name' => '🔖 <b>Tag Name</b>: :tag_name',
6-
'pusher' => '👤 Pushed by: <b>:pusher</b>',
4+
'title' => '<b>A new tag has been pushed to the project</b> :repo',
5+
'name' => '<b>Tag Name</b>: :tag_name',
6+
'pusher' => ' Pushed by',
77
];

‎lang/ja/events/gitlab/wiki_page.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
return [
44
'title' => [
5-
'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
6-
'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
7-
'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
5+
'create' => '<b>Wiki Page Created</b> - :repo by :user',
6+
'update' => '<b>Wiki Page Updated</b> - :repo by :user',
7+
'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
88
],
9-
'name' => '📝 Page Name: <b>:name</b>',
9+
'name' => 'Page Name',
1010
];

‎lang/ja/events/shared/gitlab.php

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

33
return [
44
'_body' => [
5-
'title' => '📖 <b>Content:</b>',
5+
'title' => 'Content',
66
],
77
'_assignee' => [
88
'title' => '🙋 Assignee: ',

‎lang/vi/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
return [
44
'by' => 'bởi',
55
'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ệ!',
6+
'invalid_request' => 'Yêu cầu không hợp lệ!',
77
];

‎lang/vi/events/gitlab/tag_push.php

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

33
return [
4-
'title' => '⚙️ <b>A new tag has been pushed to the project</b> 🦊:repo',
5-
'name' => '🔖 <b>Tag Name</b>: :tag_name',
6-
'pusher' => '👤 Pushed by: <b>:pusher</b>',
4+
'title' => '<b>A new tag has been pushed to the project</b> :repo',
5+
'name' => '<b>Tag Name</b>: :tag_name',
6+
'pusher' => ' Pushed by',
77
];

‎lang/vi/events/gitlab/wiki_page.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
return [
44
'title' => [
5-
'create' => '📒 <b>Wiki Page Created</b> - 🦊:repo by :user',
6-
'update' => '📝 <b>Wiki Page Updated</b> - 🦊:repo by :user',
7-
'delete' => '🗑 <b>Wiki Page Deleted</b> - 🦊:repo by :user',
5+
'create' => '<b>Wiki Page Created</b> - :repo by :user',
6+
'update' => '<b>Wiki Page Updated</b> - :repo by :user',
7+
'delete' => '<b>Wiki Page Deleted</b> - :repo by :user',
88
],
9-
'name' => '📝 Page Name: <b>:name</b>',
9+
'name' => 'Page Name',
1010
];

‎lang/vi/events/shared/gitlab.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
return [
44
'_body' => [
5-
'title' => '📖 <b>Nội dung:</b>',
5+
'title' => 'Content',
66
],
77
'_assignee' => [
8-
'title' => '🙋 Người được giao: ',
8+
'title' => '🙋 Assignee: ',
99
],
1010
];

‎resources/views/events/gitlab/tag_push/default.blade.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@
88
$tagUrl = $payload->project->web_url.'/tags/'.$tag;
99
?>
1010

11-
{!! __('tg-notifier::events/gitlab/tag_push.title', [
12-
'repo' => "<a href='{$payload->project->web_url}'>{$payload->project->path_with_namespace}</a>",
11+
⚙️ {!! __('tg-notifier::events/gitlab/tag_push.title', [
12+
'repo' => "🦊<a href='{$payload->project->web_url}'>{$payload->project->path_with_namespace}</a>",
1313
]) !!}
1414

15-
{!! __('tg-notifier::events/gitlab/tag_push.name', [
16-
'tag_name' => "<a href='{$tagUrl}'>{$tag}</a>",
17-
]) !!}
18-
19-
{!! __('tg-notifier::events/gitlab/tag_push.pusher', [
20-
'pusher' => "<b>{$payload->user_name}</b>",
21-
]) !!}
15+
🔖 <b>{!! __('tg-notifier::events/gitlab/tag_push.name') !!}</b>: <a href='{{ $tagUrl }}'>{{ $tag }}</a>
16+
👤 {!! __('tg-notifier::events/gitlab/tag_push.pusher') !!}: <code>{{ $payload->user_name }}</code>

‎resources/views/events/gitlab/wiki_page/create.blade.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/wiki_page.title.create', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
10-
'user' => "<b>{$payload->user->name}</b>"
8+
📒 {!! __('tg-notifier::events/gitlab/wiki_page.title.create', [
9+
'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
10+
'user' => "<code>{$payload->user->name}</code>"
1111
]) !!}
1212

13-
{!! __('tg-notifier::events/gitlab/wiki_page.name', [
14-
'name' => "<b>{$payload->object_attributes->title}</b>"
15-
]) !!}
13+
📝 {!! __('tg-notifier::events/gitlab/wiki_page.name') !!}: <code>{{ $payload->object_attributes->title }}</code>
1614

1715
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/wiki_page/delete.blade.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/wiki_page.title.delete', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
10-
'user' => "<b>{$payload->user->name}</b>"
8+
🗑 {!! __('tg-notifier::events/gitlab/wiki_page.title.delete', [
9+
'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
10+
'user' => "<code>{$payload->user->name}</code>"
1111
]) !!}
1212

13-
{!! __('tg-notifier::events/gitlab/wiki_page.name', [
14-
'name' => "<b>{$payload->object_attributes->title}</b>"
15-
]) !!}
13+
📝 {!! __('tg-notifier::events/gitlab/wiki_page.name') !!}: <code>{{ $payload->object_attributes->title }}</code>
1614

1715
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/gitlab/wiki_page/update.blade.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
*/
66
77
?>
8-
{!! __('tg-notifier::events/gitlab/wiki_page.title.update', [
9-
'repo' => "<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
10-
'user' => "<b>{$payload->user->name}</b>"
8+
📝 {!! __('tg-notifier::events/gitlab/wiki_page.title.update', [
9+
'repo' => "🦊<a href='{$payload->object_attributes->url}'>{$payload->project->path_with_namespace}#{$payload->object_attributes->slug}</a>",
10+
'user' => "<code>{$payload->user->name}</code>"
1111
]) !!}
1212

13-
{!! __('tg-notifier::events/gitlab/wiki_page.name', [
14-
'name' => "<b>{$payload->object_attributes->title}</b>"
15-
]) !!}
13+
📝 {!! __('tg-notifier::events/gitlab/wiki_page.name') !!}: <code>{{ $payload->object_attributes->title }}</code>
1614

1715
@include('tg-notifier::events.shared.partials.gitlab._body', compact('payload', 'event'))

‎resources/views/events/shared/partials/gitlab/_body.blade.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
} else {
2020
return '';
2121
}
22-
if (strlen($body) > 50) {
23-
$body = substr($body, 0, 50) . '...';
22+
if (strlen($body) > 100) {
23+
$body = substr($body, 0, 100) . '...';
2424
}
2525
26-
$html = __('tg-notifier::events/shared/gitlab._body.title', ['body' => $body])
27-
."\n"
28-
.htmlentities($body);
26+
$html = htmlentities($body);
2927
}
3028
?>
31-
{!! $html !!}
29+
@if(!empty($html))
30+
📖 <b>{!! __('tg-notifier::events/shared/gitlab._body.title') !!}:</b>
31+
<pre>{!! $html !!}</pre>
32+
@endif
33+

‎src/Services/CommandService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function handle(): void
7777

7878
break;
7979
default:
80-
$this->bot->sendMessage(__('tg-notifier::app.invalid_request'));
80+
$this->bot->sendMessage('🤨 '.__('tg-notifier::app.invalid_request'));
8181
}
8282
}
8383

0 commit comments

Comments
 (0)