mv chop tail

src/main/mastodon_bot/core.cljs

@@ -35,10 +35,7 @@
 (defn in [needle haystack]
   (some (partial = needle) haystack))
 
-; If the text ends in a link to the media (which is uploaded anyway),
-; chop it off instead of including the link in the toot
-(defn chop-tail-media-url [text media]
-  (string/replace text #" (\S+)$" #(if (in (%1 1) (map :url media)) "" (%1 0))))
+
 
 (defn parse-tweet [{created-at            :created_at
                     text                  :full_text
@@ -47,7 +44,7 @@
   {:created-at (js/Date. created-at)
    :text (transform/trim-text 
           (mastodon-config config)
-          (str (chop-tail-media-url text media)
+          (str (twitter/chop-tail-media-url text media)
                (if (masto/append-screen-name? (mastodon-config config))
                  (str "\n - " screen_name) "")))
    :media-links (keep #(when (= (:type %) "photo") (:media_url_https %)) media)})

src/main/mastodon_bot/twitter_api.cljs

@@ -21,9 +21,6 @@
 (s/def ::accounts (s/* ::account))
 (def twitter-config?  (s/keys :req-un [::access-keys ::include-rts? ::include-replies?]))
 
-(defn strip-utm [news-link]
-  (first (string/split news-link #"\?utm")))
-
 (defn-spec twitter-client any?
   [twitter-config twitter-config?]
   (let [{:keys [access-keys]} twitter-config]
@@ -33,6 +30,14 @@
         (infra/exit-with-error
          (str "failed to connect to Twitter: " (.-message e)))))))
 
+(defn strip-utm [news-link]
+  (first (string/split news-link #"\?utm")))
+
+; If the text ends in a link to the media (which is uploaded anyway),
+; chop it off instead of including the link in the toot
+(defn chop-tail-media-url [text media]
+  (string/replace text #" (\S+)$" #(if (in (%1 1) (map :url media)) "" (%1 0))))
+
 (defn-spec user-timeline any?
   [twitter-config twitter-config?
    account ::account