diff options
author | mousebot <mousebot@riseup.net> | 2022-02-15 19:49:28 +0100 |
---|---|---|
committer | mousebot <mousebot@riseup.net> | 2022-02-17 09:45:45 +0100 |
commit | f37c97de8b192caf68d4b39c3830e85b5aa09d2e (patch) | |
tree | 8abe2df9119c0a52f11a717b09951cf37fc98958 /lisp | |
parent | 5ae600a4431f7d3f0b2b6c93999465f1c75391e2 (diff) |
Revert "move faves count help-echo propertize into tl--byline"
This reverts commit 48a89e518d0a84d4b81c223c9e8cf151df619b1f.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/mastodon-tl.el | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 8fa4813..d82a0a5 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -346,10 +346,11 @@ Used on initializing a timeline or thread." 'face 'mastodon-display-name-face ;; enable playing of videos when point is on byline: 'attachments (mastodon-tl--get-attachments-for-byline toot) - 'keymap mastodon-tl--byline-link-keymap) - ;; help-echo propertized moved to `mastodon-tl--byline - ;; 'help-echo - ;; (mastodon-tl--format-faves-count toot)) + 'keymap mastodon-tl--byline-link-keymap + ;; echo faves count when point on post author name: + ;; which is where --goto-next-toot puts point. + 'help-echo + (mastodon-tl--format-faves-count toot)) " (" (propertize (concat "@" handle) 'face 'mastodon-handle-face @@ -517,34 +518,32 @@ By default it is `mastodon-tl--byline-boosted'" (when faved (mastodon-tl--format-faved-or-boosted-byline "F"))) (propertize - ;; echo faves count when point on - ;; author byline, which is where --goto-next-toot puts - ;; point. - (concat (propertize - (funcall author-byline toot) - 'help-echo (mastodon-tl--format-faves-count toot)) - (cond ((equal visibility "direct") - (if (fontp (char-displayable-p #10r128274)) - " ✉" - " [direct]")) - ((equal visibility "private") - (if (fontp (char-displayable-p #10r9993)) - " 🔒" - " [followers]"))) - (funcall action-byline toot) - " " - ;; TODO: Once we have a view for toot (responses etc.) make - ;; this a tab stop and attach an action. - (propertize - (format-time-string mastodon-toot-timestamp-format parsed-time) - 'timestamp parsed-time - 'display (if mastodon-tl--enable-relative-timestamps - (mastodon-tl--relative-time-description parsed-time) - parsed-time)) - (propertize "\n ------------\n" 'face 'default)) - 'favourited-p faved - 'boosted-p boosted - 'byline t)))) + (concat + ;; we propertize help-echo format faves for author name + ;; in `mastodon-tl--byline-author' + (funcall author-byline toot) + (cond ((equal visibility "direct") + (if (fontp (char-displayable-p #10r128274)) + " ✉" + " [direct]")) + ((equal visibility "private") + (if (fontp (char-displayable-p #10r9993)) + " 🔒" + " [followers]"))) + (funcall action-byline toot) + " " + ;; TODO: Once we have a view for toot (responses etc.) make + ;; this a tab stop and attach an action. + (propertize + (format-time-string mastodon-toot-timestamp-format parsed-time) + 'timestamp parsed-time + 'display (if mastodon-tl--enable-relative-timestamps + (mastodon-tl--relative-time-description parsed-time) + parsed-time)) + (propertize "\n ------------\n" 'face 'default)) + 'favourited-p faved + 'boosted-p boosted + 'byline t)))) (defun mastodon-tl--format-faved-or-boosted-byline (letter) "Format the byline marker for a boosted or favorited status. |