Merge pull request 'thread-link-bugfix' (#29) from thread-link-bugfix into stable

Reviewed-on: https://git.treebrary.org/Treebrary.org/rss-thread-watcher/pulls/29

project.clj

@@ -1,4 +1,4 @@
-(defproject rss-thread-watch "0.4.1-SNAPSHOT"
+(defproject rss-thread-watch "0.4.2-SNAPSHOT"
   :description "RSS based thread watcher"
   :url "http://example.com/FIXME"
   :license {:name "AGPL-3.0-only"

src/rss_thread_watch/core.clj

@@ -23,7 +23,7 @@
             [rss-thread-watch.utils :as u])
   (:gen-class))
 
-(def VERSION "0.4.1")
+(def VERSION "0.4.2")
 
 ;; Internal default config
 (def CONFIG-DEFAULT
@@ -83,7 +83,7 @@
                        '(:boards-enabled)
                        (fn [mp]
                          (u/fmap (fn [k v]
-                                   (u/map-apply-defaults v defaults))
+                                   (assoc (u/map-apply-defaults v defaults) :name k))
                                  mp)))
             :boards-defaults)))
 

src/rss_thread_watch/feed_generator.clj

@@ -84,10 +84,9 @@
     (map guid-fn actuall-matches)))
 
 (defn thread-to-rss-item
-  "If I wasnt retarded I could have made the cached version look like
-  rss item already but what can you do. I'll refactor I promise, I just need this done ASAP" ;Todo: do what the docstring says
-  [t]                                                                                        ;TODO: oh Luna the hardcodes ;;RESUME
-  (let [link-url (str "https://boards.4chan.org/mlp/thread/" (:no t))] ; jesus, well I said only /mlp/ is supported now so fuck it
+  "Converts cached thread item to feed item which can be serialized into RSS"
+  [t host board]
+  (let [link-url (str host board (:no t))]
   {:title (format "%.2f%% - %s" (:chod t) (:title t))                  ;TODO: Generate link from the target somehow, or just include it from API response
    ;; :url link-url <- this is supposed to be for images according to: https://cyber.harvard.edu/rss/rss.html
    :description (format "The thread: '%s' has %.2f%% chance of dying" (:title t) (:chod t))
@@ -96,13 +95,16 @@
 
 (defn generate-feed
   "Generates feed from matching items"
-  [query-vec chod-treshold repeat? cache]
+  [query-vec chod-treshold repeat? cache board-config]
   (let [items (filter-chod-posts query-vec chod-treshold repeat? cache)
-        head {:title "RSS Thread watcher v0.4.1" ;TODO: hardcoded string here, remake to reference to config.clj
+        head {:title "RSS Thread watcher v0.4.2" ;TODO: hardcoded string here, remake to reference to config.clj
               :link "https://tools.treebrary.org/thread-watcher/feed.xml"
               :feed-url "https://tools.treebrary.org/thread-watcher/feed.xml"
               :description "RSS based thread watcher"}
-        body (map thread-to-rss-item items)]
+        body (map #(thread-to-rss-item
+                    %1
+                    (get board-config :target)
+                    (get board-config :name)) items)]
     (rss/channel-xml head body)))
 
 (defn http-handler
@@ -130,6 +132,7 @@
                              60 (Integer/parseInt chod))
                            (catch Exception e
                              94)))
+             board-config (get-in @watcher/GLOBAL-CONFIG [:boards-enabled board])
              cache @watcher/chod-threads-cache]
          (println "\n\nRCVD: " rqst)
          ;; (println rqst)
@@ -166,7 +169,7 @@
           ;; There shouldn't be any problems with this mime type but if there are
           ;; replace with "text/xml", or even better, get RSS reader that is not utter shit
           :header {"Content-Type" "application/rss+xml"}
-          :body (generate-feed queries real-chod repeat? (watcher/get-thread-data board @watcher/GLOBAL-CONFIG))})
+          :body (generate-feed queries real-chod repeat? (watcher/get-thread-data board @watcher/GLOBAL-CONFIG) board-config)})
        (catch Exception e
          ;; Ex-info has been crafted to match HTTP response body so we can send it
          (if-let [caught (ex-data e)]

src/rss_thread_watch/watcher.clj

@@ -47,6 +47,8 @@
        (recur (rest remaining-threads)
               threads-total
               (inc index)
+              ;; We have to somehow include URL which is a problem since the catalog does not contain any
+              ;; I of course know how to craft it but the result will be kind of 4chan specific
               (conj! ret {:title (or (:sub thread) ;We use thread title if thread has it
                                      (:com thread) ;we use body if thread has it
                                      "")           ;Thread has neither, this prevents null pointer