fix: update view template for push events

Author: tanhongit

lang/en/events/github/push.php

@@ -2,8 +2,8 @@
 
 return [
     'default' => [
-        'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:user:<code>:branch</code></b>',
+        'title' => '👷⚙️ <b>:count</b> new :noun to 🦊<b>:repo:<code>:branch</code></b>',
         'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
-        'pushed' => '👤 Pushed by : <b>:name</b>',
+        'pusher' => '👤 Pushed by : <b>:name</b>',
     ],
 ];

lang/en/events/gitlab/push.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'default' => [
+        'title' => '👷⚙️ <b>:count</b> new :noun to 🦑<b>:repo:<code>:branch</code></b>',
+        'commit' => '[:commit] :commit_message - by <i>:commit_by</i>',
+        'pusher' => '👤 Pushed by : <b>:name</b>',
+    ],
+];

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

@@ -13,7 +13,7 @@
 {!! __('tg-notifier::events/github/push.default.title', [
             'count' => $count,
             'noun' => $noun,
-            'user' => $payload->repository->full_name,
+            'repo' => $payload->repository->full_name,
             'branch' => $branch,
         ]
     ) !!}
@@ -30,4 +30,4 @@
 ) !!}
 @endforeach
 
-{!! __('tg-notifier::events/github/push.default.pushed', ['name' => $payload->pusher->name]) !!}
+{!! __('tg-notifier::events/github/push.default.pusher', ['name' => $payload->pusher->name]) !!}

resources/views/events/gitlab/push/default.blade.php

@@ -8,14 +8,26 @@
 
 $ref = explode('/', $payload->ref);
 $branch = implode('/', array_slice($ref, 2));
+?>
 
-$message = "⚙️ <b>{$count}</b> new {$noun} to 🦊<b>{$payload->project->path_with_namespace}:<code>{$branch}</code></b>\n\n";
+{!! __('tg-notifier::events/gitlab/push.default.title', [
+            'count' => $count,
+            'noun' => $noun,
+            'repo' => $payload->project->path_with_namespace,
+            'branch' => $branch,
+        ]
+    ) !!}
 
-foreach ($payload->commits as $commit) {
+@foreach($payload->commits as $commit)
+@php
     $commitId = substr($commit->id, -7);
-    $message .= "<a href=\"{$commit->url}\">{$commitId}</a>: {$commit->message} - by <i>{$commit->author->name}</i>\n";
-}
+@endphp
+{!! __('tg-notifier::events/gitlab/push.default.commit', [
+       'commit' => "<a href='$commit->url'>$commitId</a>",
+       'commit_message' => $commit->message,
+       'commit_by' => $commit->author->name,
+   ]
+) !!}
+@endforeach
 
-$message .= "\n👤 Pushed by : <b>{$payload->user_name}</b>\n";
-
-echo $message;
+{!! __('tg-notifier::events/gitlab/push.default.pusher', ['name' => $payload->user_name]) !!}