aboutsummaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mastodon-tl.el12
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index f400cc1..ea67f89 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -837,7 +837,8 @@ TIMESTAMP is assumed to be in the past."
(let* ((time-difference (time-subtract current-time timestamp))
(seconds-difference (float-time time-difference))
(tmp (mastodon-tl--human-duration (max 0 seconds-difference))))
- (cons (concat (car tmp) " ago")
+ ;; revert to old just now style for < 1 min
+ (cons (concat (car tmp) (if (string= "just now" (car tmp)) "" " ago"))
(time-add current-time (cdr tmp)))))
(defun mastodon-tl--relative-time-description (timestamp &optional current-time)
@@ -1337,8 +1338,10 @@ displayed when the duration is smaller than a minute)."
(if n2 (setq n2 (truncate n2)))
(cond
((null n2)
- (cons (format "%d %s%s" n1 unit1 (if (> n1 1) "s" ""))
- (max resolution res1)))
+ ;; revert to old just now style for < 1 min:
+ (cons "just now" 60))
+ ;; (cons (format "%d %s%s" n1 unit1 (if (> n1 1) "s" ""))
+ ;; (max resolution res1)))
((< (* res2 n2) resolution)
(cons (format "%d %s%s" n1 unit1 (if (> n1 1) "s" ""))
(max resolution res2)))
@@ -2610,7 +2613,8 @@ ACCOUNT-ID, COMMENT, ITEM-ID, FORWARD-P, CAT, and RULES are all from
,(when item-id `("status_ids[]" . ,item-id))
,(when forward-p `("forward" . ,forward-p))
,(when cat `("category" . ,cat))))))
- (when rules
+ (if (not rules)
+ params
(let ((alist
(mastodon-http--build-array-params-alist "rule_ids[]" rules)))
(append alist params)))))