diff --git a/README.md b/README.md index c889406c..257d5cd8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 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. diff --git a/app/Listeners/SpeedtestCompleteListener.php b/app/Listeners/SpeedtestCompleteListener.php index 47323746..b8a329c9 100644 --- a/app/Listeners/SpeedtestCompleteListener.php +++ b/app/Listeners/SpeedtestCompleteListener.php @@ -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 { config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value) diff --git a/app/Listeners/SpeedtestFailedListener.php b/app/Listeners/SpeedtestFailedListener.php index 8175d7b0..f6a52a07 100644 --- a/app/Listeners/SpeedtestFailedListener.php +++ b/app/Listeners/SpeedtestFailedListener.php @@ -31,7 +31,7 @@ class SpeedtestFailedListener */ public function handle($event) { - if(SettingsHelper::get('slack_webhook')) { + if(SettingsHelper::get('slack_webhook')->value == true) { try { Notification::route('slack', SettingsHelper::get('slack_webhook')->value) ->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 { config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value) diff --git a/app/Listeners/SpeedtestOverviewListener.php b/app/Listeners/SpeedtestOverviewListener.php index 7a67857b..660a1316 100644 --- a/app/Listeners/SpeedtestOverviewListener.php +++ b/app/Listeners/SpeedtestOverviewListener.php @@ -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 { config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_chat_id')->value) diff --git a/app/Listeners/TestNotificationListener.php b/app/Listeners/TestNotificationListener.php index ba5a1f02..ac783ec6 100644 --- a/app/Listeners/TestNotificationListener.php +++ b/app/Listeners/TestNotificationListener.php @@ -52,7 +52,7 @@ class TestNotificationListener */ private function slackNotification() { - if(SettingsHelper::get('slack_webhook')) { + if(SettingsHelper::get('slack_webhook')->value == true) { try { Notification::route('slack', SettingsHelper::get('slack_webhook')->value) ->notify(new TestSlackNotification()); @@ -70,7 +70,7 @@ class TestNotificationListener */ 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 { config([ 'services.telegram-bot-api' => [ 'token' => SettingsHelper::get('telegram_bot_token')->value ] ]); Notification::route(TelegramChannel::class, SettingsHelper::get('telegram_bot_token')->value) diff --git a/changelog.json b/changelog.json index 406efa09..6580bb80 100644 --- a/changelog.json +++ b/changelog.json @@ -1,4 +1,10 @@ { + "1.7.10": [ + { + "description": "Fixed notifications bug.", + "link": "" + } + ], "1.7.9": [ { "description": "Added ability to delete speedtests from the database.", diff --git a/config/speedtest.php b/config/speedtest.php index a2449aef..7debdd99 100644 --- a/config/speedtest.php +++ b/config/speedtest.php @@ -7,7 +7,7 @@ return [ |-------------------------------------------------------------------------- */ - 'version' => '1.7.9', + 'version' => '1.7.10', /* |--------------------------------------------------------------------------