add lobster http client

Author: ranfdev

src/main/lobjur/state.cljs

@@ -6,4 +6,4 @@
 (defonce curr-view (atom (init-stories :hottest)))
 
 ;; To test a comment-heavy story, open a story, then evaluate this line
-(swap! curr-view assoc :short_id "jclvos")
+;; (swap! curr-view assoc-in [:story :short_id] "jclvos")

src/main/lobjur/utils/common.cljs

@@ -1,7 +1,5 @@
 (ns lobjur.utils.common
-  (:require
-   ["gjs.gi.GLib" :as GLib]))
+  )
 
 (defn parse-json [t] (-> t (js/JSON.parse) (js->clj :keywordize-keys true)))
-(def base-url-lobster (GLib/Uri.parse "https://lobste.rs/" GLib/UriFlags.NONE))
 

src/main/lobjur/utils/http.cljs

@@ -8,13 +8,21 @@
 (js* "~{}._promisify(~{}.Session.prototype, 'send_and_read_async', 'send_and_read_finish')", Gio, Soup)
 
 (def session (new Soup/Session #js {:user-agent "lobjur"}))
-(defn get [url]
+(defn get [url & {:as options}]
   (-> (.send_and_read_async
        session
-       (Soup/Message.new "GET", url)
+       (if (:params options)
+         (Soup/Message.new_from_encoded_form
+          "GET",
+          url,
+          (Soup/form_encode_hash (clj->js
+                                  (into {}
+                                        (map
+                                         (fn [[k v]] [(name k) (str v)])
+                                         (:params options))))))
+         (Soup/Message.new "GET", url))
        0
        nil)
       (.then (comp
               ByteArray/toString
-              ByteArray/fromGBytes))
-      (.catch println)))
+              ByteArray/fromGBytes))))

src/main/lobjur/widgets/comments.cljs

@@ -4,7 +4,8 @@
    [lobjur.state :refer [curr-view]]
    [rollui.core :as rollui]
    [lobjur.utils.http :as http]
-   [lobjur.utils.common :refer [parse-json base-url-lobster]]
+   [lobjur.utils.common :refer [parse-json]]
+   [lobster.core :as lobster]
    [lobjur.widgets.shared :refer [upvote-btn back-to-home-btn]]
    ["gjs.gi.GLib" :as GLib]
    ["gjs.gi.Gio" :as Gio]
@@ -67,14 +68,13 @@
                   (.connect "bind" list-bind))]
     (Gtk/ListView.new selection-model factory)))
 
-(defn comments-view [{:keys [title url score tags short_id comment_count]}]
+(defn comments-view [{:keys [title url score tags short_id]}]
   [Adw/Clamp
    :child
    [Gtk/Box
     :orientation Gtk/Orientation.VERTICAL
     :spacing 8
     :margin-top 8
-    :margin-bottom 8
     :margin-start 8
     :margin-end 8
     :.append
@@ -92,7 +92,7 @@
     [Gtk/Box
      :spacing 8
      :.append
-     (let [host (.get_host (.parse_relative base-url-lobster url GLib/UriFlags.NONE))]
+     (let [host (.get_host (.parse_relative lobster/base-url url GLib/UriFlags.NONE))]
        [Gtk/LinkButton
         :css_classes #js ["small" "button" "flat" "caption"]
         :halign Gtk/Align.START
@@ -106,13 +106,13 @@
         :valign Gtk/Align.CENTER
         :css_classes #js ["small" "button" "flat" "tag" "caption"]])]
     :.append
-    (-> (http/get (str "https://lobste.rs/s/" short_id ".json"))
-        (.then parse-json)
+    (-> (lobster/story short_id)
         (.then
          (fn [comments]
            (if (> (count (:comments comments)) 0)
              [Gtk/ScrolledWindow
               :propagate-natural-height true
+              :vexpand true
               :child
               (comments-list-view (:comments comments))]
              [Adw/StatusPage

src/main/lobjur/widgets/shared.cljs

@@ -1,7 +1,6 @@
 (ns lobjur.widgets.shared
   (:require
    [lobjur.state :refer [curr-view]]
-   [lobjur.utils.common :refer [base-url-lobster]]
    ["gjs.gi.GLib" :as GLib]
    ["gjs.gi.Gtk" :as Gtk]))
 

src/main/lobjur/widgets/stories_list_view.cljs

@@ -3,22 +3,15 @@
    [lobjur.widgets.shared :refer [upvote-btn back-to-home-btn]]
    [lobjur.state :as state :refer [curr-view]]
    [lobjur.utils.http :as http]
-   [lobjur.utils.common :refer [parse-json base-url-lobster]]
+   [lobjur.utils.common :refer [parse-json]]
+   [lobster.core :as lobster]
    [rollui.core :as rollui :refer-macros [defc]]
    ["gjs.gi.Adw" :as Adw]
    ["gjs.gi.GLib" :as GLib]
    ["gjs.gi.Gtk" :as Gtk]))
 
-(def stories-urls
-  {:active "https://lobste.rs/active.json"
-   :hottest "https://lobste.rs/hottest.json"
-   :recents "https://lobste.rs/recents.json"})
-
 (defn tagged-stories-url [tag page]
   (str "https://lobste.rs/t/" tag ".json" "?page=" page))
-(defn compute-stories-url [kw page]
-  (str (kw stories-urls) "?page=" page))
-
 
 ;;taken from https://stackoverflow.com/a/69122877/11189772
 (js* "function timeAgo(input) {
@@ -68,7 +61,7 @@ global.timeAgo = timeAgo")
        :spacing 8
        :selection-mode Gtk/SelectionMode.NONE
        :.append
-       (let [host (.get_host (.parse_relative base-url-lobster url GLib/UriFlags.NONE))]
+       (let [host (.get_host (.parse_relative lobster/base-url url GLib/UriFlags.NONE))]
          [Gtk/LinkButton
           :css_classes #js ["small" "button" "flat" "caption"]
           :halign Gtk/Align.START
@@ -145,14 +138,12 @@ global.timeAgo = timeAgo")
         :.add_css_class (list "small" "flat")
         :$clicked #(reset! curr-view {:name :search})])]])
 
-(defn stories-widget-provider [url]
-  (-> (http/get url)
-      (.then parse-json)
-      (.then
-       (partial map story-item-widget))
+(defn stories-widget-provider [prom]
+  (-> prom
+      (.then (partial map story-item-widget))
       (.catch println)))
 
-(defn stories-list-view [top-bar url]
+(defn stories-list-view [top-bar prom]
   [Gtk/ScrolledWindow
    :propagate_natural_height true
    :child
@@ -172,7 +163,7 @@ global.timeAgo = timeAgo")
      :.append
      [Gtk/ListBox
       :css_classes #js ["boxed-list"]
-      :.append (stories-widget-provider url)]
+      :.append (stories-widget-provider prom)]
      :.append
      [Gtk/Box
       :hexpand true

src/main/lobjur/widgets/user.cljs

@@ -4,7 +4,7 @@
    ["gjs.gi.Gtk" :as Gtk]
    ["gjs.gi.Pango" :as Pango]
    [lobjur.utils.common :refer [parse-json]]
-   [lobjur.utils.http :as http]))
+   [lobster.core :as lobster]))
 
 (defn user-view [username]
   [Adw/Clamp
@@ -16,8 +16,7 @@
    [Gtk/ScrolledWindow
     :propagate-natural-height true
     :child
-    (-> (http/get (str "https://lobste.rs/u/" username ".json"))
-        (.then parse-json)
+    (-> (lobster/user username)
         (.then
          (fn [user]
            (let [grid (Gtk/Grid. #js {:row_spacing 8

src/main/lobjur/widgets/window.cljs

@@ -1,8 +1,9 @@
 (ns lobjur.widgets.window
   (:require
    [lobjur.widgets.comments :refer [comments-view]]
-   [lobjur.widgets.stories-list-view :refer [top-bar stories-list-view compute-stories-url tagged-stories-url]]
+   [lobjur.widgets.stories-list-view :refer [top-bar stories-list-view tagged-stories-url]]
    [lobjur.widgets.user :refer [user-view]]
+   [lobster.core :as lobster]
    [rollui.core :as rollui :refer [derived-atom] :refer-macros [defc]]
    [lobjur.state :refer [curr-view]]
    ["gjs.gi.Gtk" :as Gtk]
@@ -15,7 +16,10 @@
    (fn [v]
      (println v)
      (case (:name v)
-       :stories (stories-list-view top-bar (compute-stories-url (:stories-kw v) (:page v)))
+       :stories (stories-list-view top-bar
+                                   (case (:stories-kw v)
+                                     :hottest (lobster/hottest (select-keys v [:page]))
+                                     :active (lobster/active (select-keys v [:page]))))
        :comments (comments-view (:story v))
        :user (user-view (:username v))
        :tag (stories-list-view
@@ -26,9 +30,8 @@
                 :label (str "Tagged with: " (:tag v))
                 :xalign 0.0
                 :.add_css_class "title-2"])
-             (tagged-stories-url (:tag v)
-                                 (:page v)))
-       (stories-list-view top-bar (compute-stories-url :hottest 0))))))
+             (lobster/tagged (:tag v) (select-keys v [:page])))
+       (stories-list-view top-bar (lobster/hottest))))))
 
 (declare header-bar)
 (defc header-bar []

src/main/lobster/core.cljs

@@ -0,0 +1,38 @@
+(ns lobster.core
+  (:require
+   [lobjur.utils.http :as http]
+   [lobjur.utils.common :refer [parse-json]]
+   ["gjs.gi.GLib" :as GLib]))
+
+(def base-url (GLib/Uri.parse "https://lobste.rs/" GLib/UriFlags.NONE))
+
+(defn- rel [& urls]
+  (.to_string (reduce
+               (fn [base url]
+                 (.parse_relative base url GLib/UriFlags.NONE))
+               base-url urls)))
+
+(defn hottest [& {:as params}]
+  (.then
+   (http/get (rel "hottest.json") {:params params})
+   parse-json))
+
+(defn active [& {:as params}]
+  (.then
+   (http/get (rel "active.json") {:params params})
+   parse-json))
+
+(defn story [id & {:as params}]
+  (.then
+   (http/get (rel "s/" (str id ".json")) {:params params})
+   parse-json))
+
+(defn tagged [tag & {:as params}]
+  (.then
+   (http/get (rel "t/" (str tag ".json")) {:params params})
+   parse-json))
+
+(defn user [username & {:as params}]
+  (.then
+   (http/get (rel "u/" (str username ".json")) {:params params})
+   parse-json))