Bladeren bron

fix: scheduled using local timezone

Tienson Qin 1 jaar geleden
bovenliggende
commit
780b2007a7

+ 1 - 1
deps/outliner/src/logseq/outliner/pipeline.cljs

@@ -146,7 +146,7 @@
 
 (defn ^:api get-journal-day-from-long
   [db v]
-  (when-let [date (tc/from-long v)]
+  (when-let [date (t/to-default-time-zone (tc/from-long v))]
     (let [day (js/parseInt
                (str (t/year date)
                     (t/month date)

+ 3 - 7
src/main/frontend/components/property.cljs

@@ -700,10 +700,6 @@
            (let [properties (->> (:logseq.property.class/properties block)
                                  (map (fn [e] [(:db/ident e)])))
                  opts' (assoc opts :class-schema? true)]
-             [:<>
-              [:div.mt-2
-               [:div.text-sm.text-muted-foreground.mb-2 {:style {:margin-left 10}}
-                "Tagged node properties:"]
-               [:div
-                (properties-section block properties opts')
-                (rum/with-key (new-property block opts') (str id "-class-add-property"))]]]))]))))
+             [:div
+              (properties-section block properties opts')
+              (rum/with-key (new-property block opts') (str id "-class-add-property"))]))]))))

+ 8 - 10
src/main/frontend/date.cljs

@@ -34,7 +34,7 @@
   [input]
   (try
     (->> (cond->> input
-          (string? input) (tf/parse (tf/formatters :date-time-no-ms)))
+           (string? input) (tf/parse (tf/formatters :date-time-no-ms)))
          (t/to-default-time-zone)
          (tf/unparse (tf/formatter "MMM do, yyyy")))
     (catch :default _e
@@ -58,12 +58,12 @@
   ([date]
    (let [formatter (state/get-date-formatter)]
      (try
-      (date-time-util/format date formatter)
-      (catch :default e
-        (log/error :parse-journal-date {:message  "Failed to parse date to journal name."
-                                        :date date
-                                        :format formatter})
-        (throw e))))))
+       (date-time-util/format date formatter)
+       (catch :default e
+         (log/error :parse-journal-date {:message  "Failed to parse date to journal name."
+                                         :date date
+                                         :format formatter})
+         (throw e))))))
 
 (defn journal-name-s [s]
   (try
@@ -170,7 +170,7 @@
 
 (defn js-date->journal-title
   [date]
-  (journal-name (tc/to-local-date date)))
+  (journal-name (t/to-default-time-zone date)))
 
 (defn js-date->goog-date
   [d]
@@ -214,8 +214,6 @@
    "Next Saturday"
    "Next Sunday"])
 
-
-
 (comment
   (def default-formatter (tf/formatter "MMM do, yyyy"))
   (def zh-formatter (tf/formatter "YYYY年MM月dd日"))

+ 1 - 3
src/main/frontend/template.cljs

@@ -40,8 +40,6 @@
                         (get (variable-rules) (string/lower-case match))
                         :else
                         (if-let [nld (date/nld-parse match)]
-                          (let [;; NOTE: This following cannot handle timezones
-                               ;; date (tc/to-local-date-time nld)
-                                date (doto (goog.date.DateTime.) (.setTime (.getTime nld)))]
+                          (let [date (doto (goog.date.DateTime.) (.setTime (.getTime nld)))]
                             (page-ref/->page-ref (date/journal-name date)))
                           match))))))