kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 13:36:15 +00:00
Code Issues Projects Releases Wiki Activity

Better slack alert validation

Browse Source
This commit is contained in:
James Cole
2023-09-16 08:44:20 +02:00
parent 7cf7c5fcef
commit 241ad25e2f
9 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Notifications/Admin/TestNotification.php
View File

@@ -99,9 +99,7 @@ class TestNotification extends Notification
*/
public function via($notifiable)
{
/** @var User|null $user */
$user = auth()->user();
$slackUrl = null === $user ? '' : (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
$slackUrl = app('fireflyconfig')->get('slack_webhook_url', '')->data;
if (UrlValidator::isValidWebhookURL($slackUrl)) {
return ['mail', 'slack'];
}

4
app/Notifications/Admin/UserInvitation.php
View File

@@ -102,9 +102,7 @@ class UserInvitation extends Notification
*/
public function via($notifiable)
{
/** @var User|null $user */
$user = auth()->user();
$slackUrl = null === $user ? '' : (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
$slackUrl = app('fireflyconfig')->get('slack_webhook_url', '')->data;
if (UrlValidator::isValidWebhookURL($slackUrl)) {
return ['mail', 'slack'];
}

4
app/Notifications/Admin/UserRegistration.php
View File

@@ -99,9 +99,7 @@ class UserRegistration extends Notification
*/
public function via($notifiable)
{
/** @var User|null $user */
$user = auth()->user();
$slackUrl = null === $user ? '' : (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
$slackUrl = app('fireflyconfig')->get('slack_webhook_url', '')->data;
if (UrlValidator::isValidWebhookURL($slackUrl)) {
return ['mail', 'slack'];
}

4
app/Notifications/Admin/VersionCheckResult.php
View File

@@ -103,9 +103,7 @@ class VersionCheckResult extends Notification
*/
public function via($notifiable)
{
/** @var User|null $user */
$user = auth()->user();
$slackUrl = null === $user ? '' : (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
$slackUrl = app('fireflyconfig')->get('slack_webhook_url', '')->data;
if (UrlValidator::isValidWebhookURL($slackUrl)) {
return ['mail', 'slack'];
}

1
app/Notifications/User/UserLogin.php
View File

@@ -33,6 +33,7 @@ use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\Log;
use Illuminate\Notifications\Messages\SlackMessage;
/**
* Class UserLogin
*/