Merge branch 'master' into fix-api-accumulator-barf

Author: saada

src/yetibot/core/adapters/discord.clj

@@ -108,8 +108,8 @@
     (guild-channels)))
 
 (defn- generated-image-info [msg]
-  (when-let [[_ id ext] (re-matches #".*/generated-images/([^.]+)\.(png|gif|mp4)$" (str/trim msg))]
-    {:id id :ext ext}))
+  (when-let [[url id ext] (re-find #"https?://\S+?/generated-images/([^./\s]+)\.(png|gif|mp4)" msg)]
+    {:url url :id id :ext ext}))
 
 (def discord-max-message-length 2000)
 
@@ -119,13 +119,23 @@
 
 (defn- send-msg [{:keys [conn]} msg]
   (try
-    (if-let [{:keys [id ext]} (generated-image-info msg)]
-      (when-let [{:keys [data]} (get @images/image-store id)]
+    (if-let [{:keys [url id ext]} (generated-image-info msg)]
+      (if-let [{:keys [data]} (get @images/image-store id)]
         (let [bytes (.decode (Base64/getDecoder) ^String data)
-              stream (java.io.ByteArrayInputStream. bytes)]
-          @(messaging/create-message!
-            (:rest @conn) chat/*target*
-            :stream {:content stream :filename (str id "." ext)})))
+              stream (java.io.ByteArrayInputStream. bytes)
+              clean-msg (str/replace msg url "")]
+          (if (str/blank? clean-msg)
+            @(messaging/create-message!
+              (:rest @conn) chat/*target*
+              :stream {:content stream :filename (str id "." ext)})
+            @(messaging/create-message!
+              (:rest @conn) chat/*target*
+              :content clean-msg
+              :stream {:content stream :filename (str id "." ext)})))
+        (if (> (count msg) discord-max-message-length)
+          (doseq [chunk (chunk-message msg)]
+            @(messaging/create-message! (:rest @conn) chat/*target* :content chunk))
+          @(messaging/create-message! (:rest @conn) chat/*target* :content msg)))
       (if (> (count msg) discord-max-message-length)
         (doseq [chunk (chunk-message msg)]
           @(messaging/create-message! (:rest @conn) chat/*target* :content chunk))

src/yetibot/core/util/image_input.clj

@@ -7,9 +7,11 @@
   #"(https?://\S+\.(?:jpg|jpeg|png|gif|webp)(?:[?\#]\S*)?|https?://(?:cdn\.discordapp\.com|media\.discordapp\.net|i\.imgur\.com)/\S+)")
 
 (defn- discord-avatar-url [{:keys [id avatar]}]
-  (when (and id avatar)
-    (let [ext (if (str/starts-with? avatar "a_") "gif" "png")]
-      (format "https://cdn.discordapp.com/avatars/%s/%s.%s?size=256" id avatar ext))))
+  (cond
+    (= id "269292446041636866") "https://i.imgflip.com/4/9omh8s.jpg"
+    (and id avatar) (let [ext (if (str/starts-with? avatar "a_") "gif" "png")]
+                      (format "https://cdn.discordapp.com/avatars/%s/%s.%s?size=256" id avatar ext))
+    :else nil))
 
 (defn- replace-mentions [prompt mentions]
   (reduce (fn [p {:keys [id username]}]

test/yetibot/core/test/adapters/discord.clj

@@ -4,6 +4,7 @@
                         [yetibot.core.handler :as handler]
                         [yetibot.core.models.users :as users]
                         [yetibot.core.chat :as chat]
+                        [yetibot.core.webapp.routes.images :as images]
                         [midje.sweet :refer [fact facts anything => provided]]))
 
 (facts
@@ -62,4 +63,44 @@
   (provided (users/create-user "fake" {:id 999 :username "fake"}) => {:username "fake"}
             (chat/chat-source 456) => {:channel-id 456 :room "fake"}
             (handler/handle-raw anything anything anything anything anything) => "called handle-raw")))
+
+(facts
+ "about generated-image-info"
+ (fact
+  "returns nil for messages without generated image URLs"
+  (#'discord/generated-image-info "hello there!") => nil)
+ (fact
+  "extracts ID and extension when only URL is present"
+  (#'discord/generated-image-info "http://localhost:3003/generated-images/fc62974c-0c61-4be6-8241-d1f79cd1eac0.png")
+  => {:url "http://localhost:3003/generated-images/fc62974c-0c61-4be6-8241-d1f79cd1eac0.png"
+      :id "fc62974c-0c61-4be6-8241-d1f79cd1eac0"
+      :ext "png"})
+ (fact
+  "extracts ID and extension when URL is embedded in text"
+  (#'discord/generated-image-info "Check out the celebration: http://localhost:3003/generated-images/fc62974c-0c61-4be6-8241-d1f79cd1eac0.png ! Very cool!")
+  => {:url "http://localhost:3003/generated-images/fc62974c-0c61-4be6-8241-d1f79cd1eac0.png"
+      :id "fc62974c-0c61-4be6-8241-d1f79cd1eac0"
+      :ext "png"}))
+
+(facts
+ "about send-msg with generated images"
+ (fact
+  "sends message with attachment stream on discord and strips url"
+  (with-redefs [images/image-store (atom {"fc62974c-0c61-4be6-8241-d1f79cd1eac0" {:data "SGVsbG8gd29ybGQ="}})]
+    (binding [chat/*target* 456]
+      (#'discord/send-msg {:conn (atom {:rest :fake-rest})}
+                          "Check out the celebration: http://localhost:3003/generated-images/fc62974c-0c61-4be6-8241-d1f79cd1eac0.png ! Very cool!")))
+  => "created-message-result"
+  (provided (messaging/create-message! :fake-rest 456
+                                      :content "Check out the celebration:  ! Very cool!"
+                                      :stream anything) => (future "created-message-result")))
+ (fact
+  "sends message with attachment stream without content if text is blank"
+  (with-redefs [images/image-store (atom {"fc62974c-0c61-4be6-8241-d1f79cd1eac0" {:data "SGVsbG8gd29ybGQ="}})]
+    (binding [chat/*target* 456]
+      (#'discord/send-msg {:conn (atom {:rest :fake-rest})}
+                          "http://localhost:3003/generated-images/fc62974c-0c61-4be6-8241-d1f79cd1eac0.png")))
+  => "created-message-result"
+  (provided (messaging/create-message! :fake-rest 456
+                                      :stream anything) => (future "created-message-result"))))
 

test/yetibot/core/test/util/image_input.clj

@@ -0,0 +1,20 @@
+(ns yetibot.core.test.util.image-input
+  (:require
+   [midje.sweet :refer [fact facts =>]]
+   [yetibot.core.util.image-input :as img-input]))
+
+(facts
+  "about extracting user mentions with custom avatar mapping"
+  (fact
+    "a regular user mention extracts their discord avatar"
+    (img-input/extract-images
+      "<@123456789>"
+      {:raw-event {:mentions [{:id "123456789" :avatar "avatar123" :username "alice"}]}})
+    => {:prompt "@alice" :image-urls ["https://cdn.discordapp.com/avatars/123456789/avatar123.png?size=256"]})
+
+  (fact
+    "a hardcoded user mention extracts the custom mario death meme avatar"
+    (img-input/extract-images
+      "<@269292446041636866>"
+      {:raw-event {:mentions [{:id "269292446041636866" :avatar "someavatar" :username "bob"}]}})
+    => {:prompt "@bob" :image-urls ["https://i.imgflip.com/4/9omh8s.jpg"]}))