Pirate punctuation (#770)

* Fixed Docker Compose env var Slack example * Fixed pirate suffixing for final punctuation followed by white-space
yetibot · Oct 26, 2018 · af46d36 · af46d36
1 parent 1e5f55a
commit af46d36
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/yetibot/commands/pirate.clj b/src/yetibot/commands/pirate.clj
@@ -73,8 +73,9 @@
   [s]
   (let [flavor (rand-nth flavor)]
     (str/replace-first s
-                       #"[.!?]*$"
-                       #(format ", %s%s" flavor %))))
+                       #"([.!?]*)\s*$"
+                       (fn [[_ punc]]
+                         (format ", %s%s" flavor punc)))))
 
 (def slur-re #"[alr](?![alr])")
 

diff --git a/test/yetibot/test/commands/pirate.clj b/test/yetibot/test/commands/pirate.clj
@@ -24,8 +24,10 @@
       (to-pirate "hello world   admin")    => "ahoy world   helm")
 
 (fact "suffix-flavor suffixes something"
-      (suffix-flavor "foo")  => #"^foo,\s+[^\s]+"
-      (suffix-flavor "foo.") => #"^foo,\s+.+\.$")
+      (suffix-flavor "foo bar")    => #"^foo bar,\s+[^\s]+"
+      (suffix-flavor "foo bar.")   => #"^foo bar,\s+.+\.$"
+      (suffix-flavor "foo bar. ")  => #"^foo bar,\s+.+\.$"
+      (suffix-flavor "foo bar.. ") => #"^foo bar,\s+.+\.\.$")
 
 (def test-str "the quick brown fox jumps over the lazy dog")