Simplify slack channel regexp and allow private (no # prefix) channel…

…s and direct messages (@ prefix) (#6699)
snipe · Feb 8, 2019 · 3530603 · 3530603
1 parent 4fd469e
commit 3530603
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
@@ -65,7 +65,7 @@ class Setting extends Model
           'default_currency'                    => 'required',
           'locale'                              => 'required',
           'slack_endpoint'                      => 'url|required_with:slack_channel|nullable',
-          'slack_channel'                       => 'regex:/(?<!\w)#\w+/|required_with:slack_endpoint|nullable',
+          'slack_channel'                       => 'regex:/^[\#\@]?\w+/|required_with:slack_endpoint|nullable',
           'slack_botname'                       => 'string|nullable',
           'labels_per_page'                     => 'numeric',
           'labels_width'                        => 'numeric',