diff options
| author | marty hiatt <martianhiatus@riseup.net> | 2024-10-11 10:05:28 +0200 |
|---|---|---|
| committer | marty hiatt <martianhiatus@riseup.net> | 2024-10-11 10:05:28 +0200 |
| commit | c714d1524d2f369228252d265f0a23fe1c166b14 (patch) | |
| tree | 5e2175fe070f37c94cbedec20ee7e2a79b336f7d /lisp/mastodon-notifications.el | |
| parent | 64fa8d9066b3a58895e595fc3ca44249edada5df (diff) | |
fix foll_reqs, add group/accounts props to notifs
Diffstat (limited to 'lisp/mastodon-notifications.el')
| -rw-r--r-- | lisp/mastodon-notifications.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el index a2c0453..a67ec0f 100644 --- a/lisp/mastodon-notifications.el +++ b/lisp/mastodon-notifications.el @@ -214,14 +214,13 @@ JSON is the full notifications JSON." (let* ((type .type) (type-sym (intern .type)) (profile-note - (when (eq type-sym 'follow-request) - (let ((str (mastodon-tl--field - 'note - (car accounts)))) + (when (eq type-sym 'follow_request) + (let ((str (mastodon-tl--field 'note (car accounts)))) (if mastodon-notifications--profile-note-in-foll-reqs-max-length (string-limit str mastodon-notifications--profile-note-in-foll-reqs-max-length) str)))) (follower (car .sample_account_ids)) + (follower-name (mastodon-tl--field 'username (car accounts))) (filtered (mastodon-tl--field 'filtered status)) ;;toot)) (filters (when filtered (mastodon-tl--current-filters filtered)))) @@ -242,17 +241,17 @@ JSON is the full notifications JSON." (mastodon-tl--clean-tabs-and-nl (if (mastodon-tl--has-spoiler status) (mastodon-tl--spoiler status) - (if (eq type 'follow-request) + (if (eq type-sym 'follow_request) (mastodon-tl--render-text profile-note) (mastodon-tl--content status))))))) (cond ((eq type-sym 'follow) (propertize "Congratulations, you have a new follower!" 'face 'default)) - ((eq type-sym 'follow-request) + ((eq type-sym 'follow_request) (concat (propertize (format "You have a follow request from... %s" - follower) + follower-name) 'face 'default) (when mastodon-notifications--profile-note-in-foll-reqs (concat @@ -273,7 +272,7 @@ JSON is the full notifications JSON." (when (member type-sym '(favourite boost)) status) nil nil nil nil - nil group))))) ;; insert status still needs our group data + nil group accounts))))) ;; insert status still needs our group data ;; FIXME: REFACTOR with -tl--byline: ;; we provide account directly, rather than let-alisting toot |