diff options
| author | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2023-08-30 09:00:49 +0200 |
|---|---|---|
| committer | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2023-08-30 09:00:49 +0200 |
| commit | 756096757d13f13f7262ad616e4206ded538566d (patch) | |
| tree | 40a13c1cf8a47182f7294503c9f511d395117819 /lisp/mastodon-tl.el | |
| parent | 5640de5f2ee5875313e239c0f4237454e027913c (diff) | |
| parent | db685c21edcb2eb7f686a9e38e204d3e333f902b (diff) | |
Merge branch 'scratch/mastodon' of git://git.sv.gnu.org/emacs/nongnu into scratch/mastodon
Diffstat (limited to 'lisp/mastodon-tl.el')
| -rw-r--r-- | lisp/mastodon-tl.el | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 7a02a03..c921ba9 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -709,6 +709,7 @@ The descriptive string is a human readable version relative to the current time while the next change timestamp give the first time that this description will change in the future. TIMESTAMP is assumed to be in the past." + ;; FIXME: Use `mastodon-tl--human-duration'! (let* ((now (or current-time (current-time))) (time-difference (time-subtract now timestamp)) (seconds-difference (float-time time-difference)) @@ -1157,8 +1158,13 @@ LONGEST-OPTION is the option whose length determines the formatting." "Convert poll expiry TIMESTAMP into a descriptive string." ;; FIXME: Could we document the format of TIMESTAMP here? (let* ((ts (encode-time (parse-time-string timestamp))) - (seconds (time-to-seconds (time-subtract nil ts))) - (units mastodon-tl--time-units) + (seconds (time-to-seconds (time-subtract ts nil)))) + (concat (mastodon-tl--human-duration (max 0 seconds)) " left"))) + +(defun mastodon-tl--human-duration (seconds) + "Return a string describing SECONDS in a more human-friendly way." + (cl-assert (>= seconds 0)) + (let* ((units mastodon-tl--time-units) (n1 seconds) (unit1 (pop units)) n2 unit2 next) (while (and units (> (truncate (setq next (/ n1 (car units)))) 0)) @@ -1170,8 +1176,8 @@ LONGEST-OPTION is the option whose length determines the formatting." (setq n1 (truncate n1)) (if n2 (setq n2 (truncate n2))) (if (memq n2 '(nil 0)) - (format "%d %s%s left" n1 unit1 (if (> n1 1) "s" "")) - (format "%d %s%s, %d %s%s left" + (format "%d %s%s" n1 unit1 (if (> n1 1) "s" "")) + (format "%d %s%s, %d %s%s" n1 unit1 (if (> n1 1) "s" "") n2 unit2 (if (> n2 1) "s" ""))))) |