Refactor to simplicity

Hng-X · Feb 3, 2017 · 501023a · 501023a
1 parent d2ca5a7
commit 501023a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/app/Custom/CustomWorker.php b/app/Custom/CustomWorker.php
diff --git a/app/Jobs/HandleSlackEvent.php b/app/Jobs/HandleSlackEvent.php
@@ -45,6 +45,7 @@ public function handle()
         } else {
             $rawText = $this->request['event']['text'];
             $mustMention = !(preg_match('/^D/', $this->request['event']['channel']));
+
             $parsedText = $this->parseText($rawText, $mustMention);
             if (isset($parsedText["type"])) {
                 if ($parsedText["type"] == "gitlab-add") {

diff --git a/config/bot.php b/config/bot.php
@@ -46,11 +46,13 @@
              * "containsType" can only be one of the following:
              * "{email}",
              *
+             * The rules are all joined by ANDs
+             *
              * To extract a parenthesized regex pattern into a variable,
-             * put the name of the variable (in order) in square bracket
+             * put the name of the variable (in order) after the type (space-separated)
             */
             "parse" => array(
-                "containsAll[username]" => array(
+                "containsAll username" => array(
                     "/gitlab/i",
                     "/username\s*:\s*([^@\s]+)/i"
                 ),
@@ -74,10 +76,10 @@
                 "containsAll" => array(
                     "/pivotal/i"
                 ),
-                "containsType[email]" => array(
+                "containsType email" => array(
                     "{email}",
                 ),
-                "canContain[project]" => array(
+                "canContain project" => array(
                     "/project\s*:\s*([^@\s]+)/"
                 )
             ),