Skip to content

Commit 16a25bd

Browse files
committed
fix: error workflow run messages
1 parent c9a071f commit 16a25bd

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

lang/en/events/github/workflow_job.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
'completed' => [
55
'completed' => '🎉 <b>Action Completed</b> form :user',
66
'done' => 'Done action: 🎉 <b>:runner_name</b> ✨',
7+
78
'canceled' => '🚫 <b>Canceled Action</b> form 🦑:user',
89
'failed' => 'Failed action: 🚫 <b>:runner_name</b> ❌',
910
],

resources/views/events/github/workflow_run/completed.blade.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,29 @@
66

77
@switch($payload->workflow_run->conclusion)
88
@case('success')
9-
{!! __('tg-notifier::events/github/workflow_run.completed.success.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
9+
{!! __('tg-notifier::events/github/workflow_run.completed.success.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
1010

11-
{!! __('tg-notifier::events/github/workflow_run.completed.success.body', ['name' => $payload->workflow_run->runner_name]) !!}
11+
{!! __('tg-notifier::events/github/workflow_run.completed.success.body', ['name' => $payload->workflow_run->name]) !!}
1212

1313
@break
1414
@case('failure')
15-
{!! __('tg-notifier::events/github/workflow_run.completed.failure.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
15+
{!! __('tg-notifier::events/github/workflow_run.completed.failure.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
1616

17-
{!! __('tg-notifier::events/github/workflow_run.completed.failure.body', ['name' => $payload->workflow_run->runner_name]) !!}
17+
{!! __('tg-notifier::events/github/workflow_run.completed.failure.body', ['name' => $payload->workflow_run->name]) !!}
1818

1919
@break
2020
@case('cancelled')
21-
{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
21+
{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
2222

23-
{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.body', ['name' => $payload->workflow_run->runner_name]) !!}
23+
{!! __('tg-notifier::events/github/workflow_run.completed.cancelled.body', ['name' => $payload->workflow_run->name]) !!}
2424

2525
@break
2626
@default
27-
{!! __('tg-notifier::events/github/workflow_run.completed.default.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
27+
{!! __('tg-notifier::events/github/workflow_run.completed.default.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
2828

29-
{!! __('tg-notifier::events/github/workflow_run.completed.default.body', ['name' => $payload->workflow_run->runner_name]) !!}
29+
{!! __('tg-notifier::events/github/workflow_run.completed.default.body', ['name' => $payload->workflow_run->name]) !!}
30+
31+
@break
3032
@endswitch
3133

3234
{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}

resources/views/events/github/workflow_run/requested.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55
?>
66

7-
{!! __('tg-notifier::events/github/workflow_run.requested.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->html_url}</a>"]) !!}
7+
{!! __('tg-notifier::events/github/workflow_run.requested.title', ['user' => "<a href='{$payload->repository->html_url}'>{$payload->repository->full_name}</a>"]) !!}
88

9-
{!! __('tg-notifier::events/github/workflow_run.requested.body', ['name' => $payload->workflow_run->runner_name]) !!}
9+
{!! __('tg-notifier::events/github/workflow_run.requested.body', ['name' => $payload->workflow_run->name]) !!}
1010

1111
{!! __('tg-notifier::events/github/workflow_run.link', ['link' => "<a href='{$payload->workflow_run->html_url}'>{$payload->workflow_run->html_url}</a>"]) !!}

resources/views/events/shared/partials/github/_body.blade.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
$body = substr($body, 0, 50).'...';
1212
}
1313
14-
$html = __('tg-notifier::events/shared/github._body.title', ['body' => $body])."\n{$body}";
14+
$html = __('tg-notifier::events/shared/github._body.title', ['body' => $body])
15+
."\n"
16+
.htmlentities($body);
1517
}
1618
?>
17-
{!! htmlentities($html) !!}
19+
{!! $html !!}

0 commit comments

Comments
 (0)