lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #14187 from Godmartinz/general-hook_fix

Browse source 
Fixed the general webhook not notifying anymore
This commit is contained in:
snipe 2024-02-08 23:01:36 +00:00 • committed by GitHub
commit 849ba02516
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Listeners/CheckoutableListener.php
View file

@ -60,8 +60,10 @@ class CheckoutableListener
if ($this->shouldSendWebhookNotification()) { if ($this->shouldSendWebhookNotification()) {
//slack doesn't include the url in its messaging format so this is needed to hit the endpoint //slack doesn't include the url in its messaging format so this is needed to hit the endpoint
if(Setting::getSettings()->webhook_selected =='slack' || Setting::getSettings()->webhook_selected =='general') { if(Setting::getSettings()->webhook_selected =='slack' || Setting::getSettings()->webhook_selected =='general') {
Notification::route('slack', Setting::getSettings()->webhook_endpoint) Notification::route('slack', Setting::getSettings()->webhook_endpoint)
->notify($this->getCheckoutNotification($event)); ->notify($this->getCheckoutNotification($event));
} }

2
app/Notifications/CheckinAccessoryNotification.php
View file

@ -53,7 +53,7 @@ class CheckinAccessoryNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'slack') { if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack'; $notifyBy[] = 'slack';
} }

2
app/Notifications/CheckinAssetNotification.php
View file

@ -60,7 +60,7 @@ class CheckinAssetNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'slack') { if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
\Log::debug('use webhook'); \Log::debug('use webhook');
$notifyBy[] = 'slack'; $notifyBy[] = 'slack';
} }

2
app/Notifications/CheckinLicenseSeatNotification.php
View file

@ -57,7 +57,7 @@ class CheckinLicenseSeatNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'slack') { if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack'; $notifyBy[] = 'slack';
} }

2
app/Notifications/CheckoutAccessoryNotification.php
View file

@ -52,7 +52,7 @@ class CheckoutAccessoryNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'slack') { if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack'; $notifyBy[] = 'slack';
} }

4
app/Notifications/CheckoutAssetNotification.php
View file

@ -72,7 +72,9 @@ class CheckoutAssetNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }
if ((Setting::getSettings()->webhook_selected == 'slack') || (Setting::getSettings()->webhook_selected == '')) {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
\Log::debug('use webhook'); \Log::debug('use webhook');
$notifyBy[] = 'slack'; $notifyBy[] = 'slack';
} }

2
app/Notifications/CheckoutConsumableNotification.php
View file

@ -59,7 +59,7 @@ class CheckoutConsumableNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'slack') { if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack'; $notifyBy[] = 'slack';
} }

2
app/Notifications/CheckoutLicenseSeatNotification.php
View file

@ -59,7 +59,7 @@ class CheckoutLicenseSeatNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'slack') { if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack'; $notifyBy[] = 'slack';
} }