Skip to content

update view and lang for pull request and fix icon in lang #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2023
Merged

update view and lang for pull request and fix icon in lang #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa28728
feat: update view and lang for pull request
pxthinh Nov 19, 2023
475ffc1
fix: remove icon for lang
pxthinh Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions lang/en/events/github/pull_request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

return [
'review' => '👥 Reviewers: ',
'closed' => [
'title' => ':title - 🦑:issue by :user',
'title_merged' => '✅ <b>Pull Request Merged</b>',
'title_closed' => '❌ <b>Pull Request Closed</b>',
],
'opened' => [
'title' => '👷‍♂️🛠️ <b>New Pull Request</b> - 🦑:issue by :user',
],
'reopened' => [
'title' => '👷‍♂️🛠️ <b>Reopened Pull Request</b> - 🦑:issue by :user',
],
];
2 changes: 1 addition & 1 deletion resources/views/events/github/issue_comment/created.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issue_comment.issue_comment_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issue_comment/deleted.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issue_comment.issue_comment_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issue_comment/edited.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issue_comment.issue_comment_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/closed.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/deleted.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/edited.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
@if(isset($payload->changes->title))
Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/locked.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/opened.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/pinned.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/reopened.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/unlocked.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
2 changes: 1 addition & 1 deletion resources/views/events/github/issues/unpinned.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]
) !!}

{!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
📢 <b>{{ $issue->title }}</b>

@include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))

Expand Down
28 changes: 17 additions & 11 deletions resources/views/events/github/pull_request/closed.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
<?php
/**
* @var $payload mixed
* @var $event string
*/

$message = '✅ <b>Pull Request Merged';
$pull_request = $payload->pull_request;

$message = __('tg-notifier::events/github/pull_request.closed.title_merged');
if (!isset($payload->pull_request->merged) || $payload->pull_request->merged !== true) {
$message = '❌ <b>Pull Request Closed';
$message = __('tg-notifier::events/github/pull_request.closed.title_closed');
}
?>

$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";

$message .= "🛠 <b>{$payload->pull_request->title}</b> \n\n";

$message .= "🌳 {$payload->pull_request->head->ref} -> {$payload->pull_request->base->ref} 🎯 \n";
{!! __('tg-notifier::events/github/pull_request.closed.title', [
'title' => $message,
'issue' => "<a href='$pull_request->html_url'>{$payload->repository->full_name}#$pull_request->number</a>",
'user' => "<a href='{$pull_request->user->html_url}'>@{$pull_request->user->login}</a>"
]
) !!}

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

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

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

echo $message;
@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
21 changes: 13 additions & 8 deletions resources/views/events/github/pull_request/opened.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
<?php
/**
* @var $payload mixed
* @var $event string
*/

$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";
$pull_request = $payload->pull_request;
?>

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

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

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

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

$message .= require __DIR__ . '/../../shared/partials/github/_body.php';

echo $message;
@include('tg-notifier::events.shared.partials.github._body', compact('payload', 'event'))
6 changes: 3 additions & 3 deletions resources/views/events/github/pull_request/partials/_reviewers.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
$reviewers[] = "<b>{$reviewer->login}</b>";
}

$textReviewers .= "👥 Reviewers: " . implode(', ', $reviewers) . "\n";
$textReviewers .= __('tg-notifier::events/github/pull_request.review') . implode(', ', $reviewers);
}

return $textReviewers;
?>
{!! $textReviewers !!}
21 changes: 13 additions & 8 deletions resources/views/events/github/pull_request/reopened.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
<?php
/**
* @var $payload mixed
* @var $event string
*/

$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";
$pull_request = $payload->pull_request;
?>

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

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

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

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

$message .= require __DIR__ . '/../../shared/partials/github/_body.php';

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