Skip to content

[Feature] Add markdown content type for gotify notification #1712

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
alexjustesen merged 15 commits into from
Nov 20, 2024
Merged

[Feature] Add markdown content type for gotify notification #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
abc1275
Add-Markdown-feature-for-Gotify
chiragkrishna Sep 17, 2024
8c95803
Add-Markdown-feature-for-Gotify
chiragkrishna Sep 17, 2024
21713fd
Add-Markdown-feature-for-Gotify
chiragkrishna Sep 17, 2024
50f0fd1
Add-Markdown-feature-for-Gotify
chiragkrishna Sep 17, 2024
7f93e45
Merge branch 'main' into Add-Markdown-feature-for-Gotify
chiragkrishna Sep 17, 2024
f4a7040
Corrected format for URL's
chiragkrishna Sep 18, 2024
7f63147
Corrected format for URL's
chiragkrishna Sep 18, 2024
043a1ce
Merge branch 'main' into Add-Markdown-feature-for-Gotify
alexjustesen Oct 9, 2024
650485e
Merge branch 'main' into Add-Markdown-feature-for-Gotify
alexjustesen Oct 9, 2024
ee63876
Merge branch 'main' into Add-Markdown-feature-for-Gotify
chiragkrishna Oct 11, 2024
5e519dd
Merge branch 'main' into Add-Markdown-feature-for-Gotify
alexjustesen Nov 20, 2024
c290cb6
Merge branch 'main' into Add-Markdown-feature-for-Gotify
alexjustesen Nov 20, 2024
cfb44ff
fixed array nest
alexjustesen Nov 20, 2024
db5f3f8
fixed lint issue
alexjustesen Nov 20, 2024
4b36cdc
fixed lint issue
alexjustesen Nov 20, 2024
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
5 changes: 5 additions & 0 deletions app/Listeners/Gotify/SendSpeedtestCompletedNotification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ public function handle(SpeedtestCompleted $event): void
'speedtest_url' => $event->result->result_url,
'url' => url('/admin/results'),
])->render(),
'extras' => [
'client::display' => [
'contentType' => 'text/markdown',
],
],
];

foreach ($notificationSettings->gotify_webhooks as $url) {
Expand Down
5 changes: 5 additions & 0 deletions app/Listeners/Gotify/SendSpeedtestThresholdNotification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ public function handle(SpeedtestCompleted $event): void
'speedtest_url' => $event->result->result_url,
'url' => url('/admin/results'),
])->render(),
'extras' => [
'client::display' => [
'contentType' => 'text/markdown',
],
],
];

foreach ($notificationSettings->gotify_webhooks as $url) {
Expand Down
22 changes: 11 additions & 11 deletions resources/views/gotify/speedtest-completed.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Speedtest Completed - #{{ $id }}
**Speedtest Completed - #{{ $id }}**

A new speedtest was completed using {{ $service }}.
A new speedtest was completed using **{{ $service }}**.

- Server name: {{ $serverName }}
- Server ID: {{ $serverId }}
- ISP: {{ $isp }}
- Ping: {{ $ping }}
- Download: {{ $download }}
- Upload: {{ $upload }}
- Packet Loss: {{ $packetLoss }} %
- Ookla Speedtest:{{ $speedtest_url }}
- URL: {{ $url }}
- **Server name:** {{ $serverName }}
- **Server ID:** {{ $serverId }}
- **ISP:** {{ $isp }}
- **Ping:** {{ $ping }}
- **Download:** {{ $download }}
- **Upload:** {{ $upload }}
- **Packet Loss:** {{ $packetLoss }} **%**
- **Ookla Speedtest:** [{{ $speedtest_url }}]({{ $speedtest_url }})
- **URL:** [{{ $url }}]({{ $url }})
10 changes: 5 additions & 5 deletions resources/views/gotify/speedtest-threshold.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Speedtest Threshold Breached - #{{ $id }}
**Speedtest Threshold Breached - #{{ $id }}**

A new speedtest was completed using {{ $service }} on {{ $isp }} but a threshold was breached.
A new speedtest was completed using **{{ $service }}** on **{{ $isp }}** but a threshold was breached.

@foreach ($metrics as $item)
- {{ $item['name'] }} {{ $item['threshold'] }}: {{ $item['value'] }}
- {{ $item['name'] }} {{ $item['threshold'] }}: **{{ $item['value'] }}**
@endforeach
- Ookla Speedtest: {{ $speedtest_url }}
- URL: {{ $url }}
- **Ookla Speedtest:** [{{ $speedtest_url }}]({{ $speedtest_url }})
- **URL:** [{{ $url }}]({{ $url }})