diff options
| -rw-r--r-- | lisp/mastodon-notifications.el | 12 | ||||
| -rw-r--r-- | lisp/mastodon-tl.el | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el index 862f2a2..9ff8413 100644 --- a/lisp/mastodon-notifications.el +++ b/lisp/mastodon-notifications.el @@ -236,9 +236,9 @@ JSON is a list of alists." nil (mastodon-notifications--insert-note ;; toot - (if (member type '(follow follow_request)) - note ;; full notif, not just follower acct? - status) + ;; should always be note, otherwise notif data not avail + ;; later on: + note ;; body (mastodon-notifiations--body-arg type filters status profile-note follower-name) @@ -253,10 +253,8 @@ JSON is a list of alists." (t (mastodon-tl--byline-handle note nil follower-name 'mastodon-display-name-face))) - ;; base toot - (when (or (eq type 'favourite) - (eq type 'boost)) - status) + ;; base toot (always provide) + status nil nil nil type)))) (defun mastodon-notifications--format-group-note (group status accounts) diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 6f510b3..7e37b00 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -860,7 +860,10 @@ TS is a timestamp from the server, if any." ;; NB: action-byline (boost) is now added in insert-status, so no ;; longer part of the byline. ;; (base) author byline: - (mastodon-tl--byline-author toot nil domain :base) + ;; we use base-toot if poss for fave/boost notifs that need to show + ;; base item in author byline + (mastodon-tl--byline-author (or base-toot toot) + nil domain :base) ;; visibility: (cond ((string= visibility "direct") (propertize (concat " " (mastodon-tl--symbol 'direct)) |