[back/refactor] fetch and build post

src/main/backend/handlers.clj

@@ -11,10 +11,7 @@
   (generate-string content))
 
 (defn clean-html
-  [docs hugo]
-  (let [replace-str (if hugo
-                      "/hp/"
-                      "#/item/")]
+  [docs replace-str]
   (-> (.select docs "style[data-emotion-css~=^[a-z0-9]*$]")
       (.remove))
   (doseq [a (.select docs "a")]
@@ -22,7 +19,7 @@
            (-> (.attr a "href")
                (str/replace "https://link.zhihu.com/?target=" "")
                (str/replace "https://zhuanlan.zhihu.com/p/" replace-str)
-                 (url-decode))))))
+               (url-decode)))))
 
 (defn clean-images
   [docs]
@@ -53,38 +50,39 @@
     (apply str (mapv build-catalog-item catalog))))
 
 (defn process-hu-post
-  [page hugo]
+  [page {:keys [content-type replace-str wrap-fn]}]
   (let [post-content  (.getElementsByClass page "Post-RichTextContainer")
         title         (.getElementsByClass page "Post-Title")
         post-time     (.getElementsByClass page "ContentItem-time")]
 
-    (clean-html post-content hugo)
+    (clean-html post-content replace-str)
     (clean-images post-content)
     (render-linkcard post-content)
 
     {:status 200
-     :body {:content (.toString post-content)
+     :headers content-type
+     :body (wrap-fn
+            {:content (.toString post-content)
              :title   (.text title)
              :time    (first (str/split (.text post-time) #"・"))
-            :catalog (build-catalog post-content)}}))
-
+             :catalog (build-catalog post-content)})}))
 
 (defn fetch-hu-post
-  [post-id & {:keys [hugo]}]
+  [post-id params]
   (let [post-url   (str/join ["https://zhuanlan.zhihu.com/p/" post-id])
         page       (-> (client/get post-url) :body Jsoup/parse)
         docs       (.getElementsByClass page "Post-RichTextContainer")]
-
     (if (empty? docs)
       {:status  404
+       :headers (:content-type params)
        :body    {:content "Not Found"
                  :title   "Not Found"}}
-      (process-hu-post page hugo))))
+      (process-hu-post page params))))
 
 (defn build-api-hu-post
   [request]
-  (let [post-id  (-> request   :path-params :id)
-        content  (fetch-hu-post post-id)]
-    {:status  (:status content)
-     :headers {"Content-Type" "application/json; charset=utf-8"}
-     :body    (wrap-json (:body content))}))
+  (let [post-id  (-> request   :path-params :id)]
+    (fetch-hu-post post-id
+     {:content-type {"Content-Type" "application/json; charset=utf-8"}
+      :replace-str   "#/item/"
+      :wrap-fn       wrap-json})))

src/main/backend/hugo/site.clj

@@ -3,14 +3,9 @@
             [hiccup.page :as page]))
 
 
-(defn build-hugo-post
-  [request]
-  (let [post-id         (-> request :path-params :id)
-        result (handlers/fetch-hu-post post-id {:hugo true})
-        content (:body result)]
-    {:status    (:status result)
-     :headers   {"Content-Type" "text/html; charset=utf-8"}
-     :body      (page/html5 {:escape-strings? false}
+(def hugo-post-template
+  #(page/html5
+    {:escape-strings? false}
     [:html
      [:head
       [:meta {:name "viewport" :content "width=device-width, initial-scale=1.0"}]
@@ -22,10 +17,19 @@
         [:div {:class "flex flex-row flex-wrap py-4"}
          [:div {:class "w-full sm:w-1/3 md:w-1/4 px-2"}
           [:div {:class "sticky top-0 p-4 bg-slate-300 rounded-xl w-full"}
-                         [:div (:catalog content)]]]
+           [:div (:catalog %)]]]
          [:div {:class "w-full sm:w-2/3 md:w-3/4 pt-1 px-2"}
-                        [:h1 (:title content)]
-                        [:time (:time content)]
+          [:h1 (:title %)]
+          [:time (:time %)]
           [:hr]
           [:div
-                         (:content content)]]]]]]])}))
+           (:content %)]]]]]]]))
+
+(defn build-hugo-post
+  [request]
+  (let [post-id  (-> request   :path-params :id)]
+    (handlers/fetch-hu-post
+     post-id
+     {:content-type {"Content-Type" "text/html; charset=utf-8"}
+      :replace-str   "/hp/"
+      :wrap-fn       hugo-post-template})))