diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index 7f88d7a5f9..c28394140e 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -32,12 +32,12 @@ class SlackSettingsForm extends Component "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX", "link" => 'https://api.slack.com/messaging/webhooks', ), - "Discord" => array( - "name" => "Discord", - "icon" => 'fab fa-discord', - "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX", - "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page', - ), +// "Discord" => array( +// "name" => "Discord", +// "icon" => 'fab fa-discord', +// "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX", +// "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page', +// ), "General"=> array( "name" => "General", "icon" => "fab fa-hashtag", @@ -108,7 +108,7 @@ class SlackSettingsForm extends Component } catch (\Exception $e) { $this->isDisabled= 'disabled'; - return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage()])); + return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage(), 'app' => $this->webhook_name])); } //} diff --git a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php index 02d7f5e4e9..9e7a27872f 100644 --- a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php +++ b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php @@ -14,7 +14,7 @@ class AddsWebhookOptionToSettingsTable extends Migration public function up() { Schema::table('settings', function (Blueprint $table) { - $table->string('webhook_selected')->after('slack_botname')->default('Slack');nullable(); + $table->string('webhook_selected')->after('slack_botname')->default('Slack')->nullable(); $table->renameColumn('slack_botname', 'webhook_botname'); $table->renameColumn('slack_endpoint', 'webhook_endpoint'); $table->renameColumn('slack_channel', 'webhook_channel'); diff --git a/resources/lang/en/admin/settings/message.php b/resources/lang/en/admin/settings/message.php index a4aba73ff7..48b42d1202 100644 --- a/resources/lang/en/admin/settings/message.php +++ b/resources/lang/en/admin/settings/message.php @@ -34,11 +34,11 @@ return [ 'authentication_success' => 'User authenticated against LDAP successfully!' ], 'webhook' => [ - 'sending' => 'Sending Slack test message...', + 'sending' => 'Sending :app test message...', 'success_pt1' => 'Success! Check the ', 'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.', '500' => '500 Server Error.', - 'error' => 'Something went wrong. Slack responded with: :error_message', + 'error' => 'Something went wrong. :app responded with: :error_message', 'error_misc' => 'Something went wrong. :( ', ] ]; diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index ea8262e1c5..e15cdf0954 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -63,7 +63,7 @@ class="form-control " > - +{{-- --}} @@ -83,10 +83,12 @@
{{ trans('general.feature_disabled') }}
+ placeholder="{{$webhook_placeholder}}" + value="{{old('webhook_endpoint', $webhook_endpoint)}}"> @else + placeholder="{{$webhook_placeholder}}" + value="{{old('webhook_endpoint', $webhook_endpoint)}}"> @endif {!! $errors->first('webhook_endpoint', ' ') !!}