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

fix: notifications

Browse Source
This commit is contained in:
James Cole
2023-07-17 20:33:26 +02:00
parent 2bb4cc7954
commit 788dae1477
34 changed files with 192 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,10 @@ class TestNotification extends Notification
*/
public function via($notifiable)
{
return ['mail', 'slack'];
$slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
return ['mail', 'slack'];
}
return ['mail'];
}
}

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

@@ -100,6 +100,10 @@ class UserInvitation extends Notification
*/
public function via($notifiable)
{
return ['mail', 'slack'];
$slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
return ['mail', 'slack'];
}
return ['mail'];
}
}

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

@@ -98,6 +98,10 @@ class UserRegistration extends Notification
*/
public function via($notifiable)
{
return ['mail', 'slack'];
$slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
return ['mail', 'slack'];
}
return ['mail'];
}
}

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

@@ -87,14 +87,14 @@ class VersionCheckResult extends Notification
public function toSlack($notifiable)
{
// return (new SlackMessage())->text($this->message)
// ->sectionBlock(function (SectionBlock $block) {
// $button = new ButtonElement('Button');
// $button->url('https://github.com/firefly-iii/firefly-iii/releases');
// $block->accessory($button);
// });
//// ->attachment(function ($attachment) {
//// $attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases');
//// });
// ->sectionBlock(function (SectionBlock $block) {
// $button = new ButtonElement('Button');
// $button->url('https://github.com/firefly-iii/firefly-iii/releases');
// $block->accessory($button);
// });
//// ->attachment(function ($attachment) {
//// $attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases');
//// });
return (new SlackMessage())->content($this->message)
@@ -112,6 +112,10 @@ class VersionCheckResult extends Notification
*/
public function via($notifiable)
{
return ['mail', 'slack'];
$slackUrl = (string)app('preferences')->getForUser(auth()->user(), 'slack_webhook_url', '')->data;
if (str_starts_with($slackUrl, 'https://hooks.slack.com/services/')) {
return ['mail', 'slack'];
}
return ['mail'];
}
}