mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2025-12-21 21:33:08 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue with notifications being attempted every time

Browse Source
This commit is contained in:
Henry Whitaker
2020-07-22 11:50:39 +01:00
parent a14849c16f
commit 0b5a4736e4
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,6 +1,6 @@
# Speedtest Tracker # Speedtest Tracker
[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.7.9-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) [![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.7.10-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results. This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results.

2
app/Listeners/SpeedtestCompleteListener.php
View File

@@ -44,7 +44,7 @@ class SpeedtestCompleteListener
} }
} }
if(SettingsHelper::get('telegram_bot_token') && SettingsHelper::get('telegram_chat_id')) { if(SettingsHelper::get('telegram_bot_token')->value == true && SettingsHelper::get('telegram_chat_id')->value == true) {
try { try {
config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]);
Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value) Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value)

4
app/Listeners/SpeedtestFailedListener.php
View File

@@ -31,7 +31,7 @@ class SpeedtestFailedListener
*/ */
public function handle($event) public function handle($event)
{ {
if(SettingsHelper::get('slack_webhook')) { if(SettingsHelper::get('slack_webhook')->value == true) {
try { try {
Notification::route('slack', SettingsHelper::get('slack_webhook')->value) Notification::route('slack', SettingsHelper::get('slack_webhook')->value)
->notify(new SpeedtestFailedSlack()); ->notify(new SpeedtestFailedSlack());
@@ -41,7 +41,7 @@ class SpeedtestFailedListener
} }
} }
if(SettingsHelper::get('telegram_bot_token') && SettingsHelper::get('telegram_chat_id')) { if(SettingsHelper::get('telegram_bot_token')->value == true && SettingsHelper::get('telegram_chat_id')->value == true) {
try { try {
config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]);
Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value) Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value)

2
app/Listeners/SpeedtestOverviewListener.php
View File

@@ -45,7 +45,7 @@ class SpeedtestOverviewListener
} }
} }
if(SettingsHelper::get('telegram_bot_token') && SettingsHelper::get('telegram_chat_id')) { if(SettingsHelper::get('telegram_bot_token')->value == true && SettingsHelper::get('telegram_chat_id')->value == true) {
try { try {
config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]);
Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value) Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value)

4
app/Listeners/TestNotificationListener.php
View File

@@ -52,7 +52,7 @@ class TestNotificationListener
*/ */
private function slackNotification() private function slackNotification()
{ {
if(SettingsHelper::get('slack_webhook')) { if(SettingsHelper::get('slack_webhook')->value == true) {
try { try {
Notification::route('slack', SettingsHelper::get('slack_webhook')->value) Notification::route('slack', SettingsHelper::get('slack_webhook')->value)
->notify(new TestSlackNotification()); ->notify(new TestSlackNotification());
@@ -70,7 +70,7 @@ class TestNotificationListener
*/ */
private function telegramNotification() private function telegramNotification()
{ {
if(SettingsHelper::get('telegram_bot_token') && SettingsHelper::get('telegram_chat_id')) { if(SettingsHelper::get('telegram_bot_token')->value == true && SettingsHelper::get('telegram_chat_id')->value == true) {
try { try {
config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]);
Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_bot_token')->value) Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_bot_token')->value)

6
changelog.json
View File

@@ -1,4 +1,10 @@
{ {
"1.7.10": [
{
"description": "Fixed notifications bug.",
"link": ""
}
],
"1.7.9": [ "1.7.9": [
{ {
"description": "Added ability to delete speedtests from the database.", "description": "Added ability to delete speedtests from the database.",

2
config/speedtest.php
View File

@@ -7,7 +7,7 @@ return [
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
'version' => '1.7.9', 'version' => '1.7.10',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------