From 33dd32d33b769bb5a3c97df192a4c9fb981944da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=BA=20T=E1=BB=91ng?= Date: Wed, 22 May 2024 12:02:58 +0700 Subject: [PATCH 1/3] feat: using laravel helper to set limit content message --- resources/views/events/github/label/edited.blade.php | 5 +++-- resources/views/events/github/pull_request/labeled.blade.php | 3 ++- .../views/events/github/pull_request/unlabeled.blade.php | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/resources/views/events/github/label/edited.blade.php b/resources/views/events/github/label/edited.blade.php index 58bbd1f..3d7e39f 100644 --- a/resources/views/events/github/label/edited.blade.php +++ b/resources/views/events/github/label/edited.blade.php @@ -2,12 +2,13 @@ /** * @var object $payload */ +use Illuminate\Support\Str; $changes = $payload->changes; $label = $payload->label; -$description = strlen($label->description) < 100 ? $label->description : substr($label->description, 0, 100).'...'; +$description = Str::limit($label->description); if (isset($changes->description->from)) { - $description_changes = strlen($changes->description->from) < 100 ? $changes->description->from : substr($changes->description->from, 0, 100).'...'; + $description_changes = Str::limit($changes->description->from); } ?> diff --git a/resources/views/events/github/pull_request/labeled.blade.php b/resources/views/events/github/pull_request/labeled.blade.php index 3646c4f..53aa857 100644 --- a/resources/views/events/github/pull_request/labeled.blade.php +++ b/resources/views/events/github/pull_request/labeled.blade.php @@ -2,9 +2,10 @@ /** * @var object $payload */ +use Illuminate\Support\Str; $pull_request = $payload->pull_request; -$description = strlen($payload->label->description) > 100 ? $payload->label->description : substr($payload->label->description, 0, 100).'...'; +$description = Str::limit($payload->label->description); ?> ‍👷‍♂️🛠️ {!! __('tg-notifier::events/github/pull_request.labeled.title', [ diff --git a/resources/views/events/github/pull_request/unlabeled.blade.php b/resources/views/events/github/pull_request/unlabeled.blade.php index 6183952..02c3942 100644 --- a/resources/views/events/github/pull_request/unlabeled.blade.php +++ b/resources/views/events/github/pull_request/unlabeled.blade.php @@ -2,9 +2,10 @@ /** * @var object $payload */ +use Illuminate\Support\Str; $pull_request = $payload->pull_request; -$description = strlen($payload->label->description) > 100 ? $payload->label->description : substr($payload->label->description, 0, 100).'...'; +$description = Str::limit($payload->label->description); ?> ‍👷‍♂️🛠️ {!! __('tg-notifier::events/github/pull_request.unlabeled.title', [ From bca6010255de35f64dcaafb519b2799dc3d5bc06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=BA=20T=E1=BB=91ng?= Date: Wed, 22 May 2024 14:21:18 +0700 Subject: [PATCH 2/3] fix: delete variables, optimize memory --- resources/views/events/github/pull_request/labeled.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/events/github/pull_request/labeled.blade.php b/resources/views/events/github/pull_request/labeled.blade.php index 53aa857..bc404b8 100644 --- a/resources/views/events/github/pull_request/labeled.blade.php +++ b/resources/views/events/github/pull_request/labeled.blade.php @@ -5,7 +5,6 @@ use Illuminate\Support\Str; $pull_request = $payload->pull_request; -$description = Str::limit($payload->label->description); ?> ‍👷‍♂️🛠️ {!! __('tg-notifier::events/github/pull_request.labeled.title', [ @@ -15,4 +14,4 @@ ) !!} 🔖 {!! __('tg-notifier::events/github/pull_request.labeled.name') !!}: {{ $payload->label->name }} -📑 {!! __('tg-notifier::events/github/pull_request.labeled.description') !!}: {{ $description }} +📑 {!! __('tg-notifier::events/github/pull_request.labeled.description') !!}: {{ Str::limit($payload->label->description) }} From 0660eb3d089203c108c92a9c0c1756a3cc5e0cf2 Mon Sep 17 00:00:00 2001 From: tongthanhphu Date: Wed, 22 May 2024 07:21:50 +0000 Subject: [PATCH 3/3] Fix styling --- resources/views/events/github/pull_request/labeled.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/events/github/pull_request/labeled.blade.php b/resources/views/events/github/pull_request/labeled.blade.php index bc404b8..3f41ac5 100644 --- a/resources/views/events/github/pull_request/labeled.blade.php +++ b/resources/views/events/github/pull_request/labeled.blade.php @@ -2,7 +2,6 @@ /** * @var object $payload */ -use Illuminate\Support\Str; $pull_request = $payload->pull_request; ?>