From dcf0747052ce07a368292fd45f75b21502fded90 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Fri, 2 Aug 2024 18:52:35 +0200 Subject: toot: re-write --reply --- lisp/mastodon-toot.el | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'lisp/mastodon-toot.el') diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el index 7358316..00f7ce7 100644 --- a/lisp/mastodon-toot.el +++ b/lisp/mastodon-toot.el @@ -1177,26 +1177,19 @@ prefixed by >." (alist-get 'account toot))))) (mastodon-toot--compose-buffer (when user - (if booster - (if (and (not (equal user booster)) - (not (member booster mentions))) - ;; different booster, user and mentions: - (mastodon-toot--mentions-to-string (append (list user booster) mentions nil)) - ;; booster is either user or in mentions: - (if (not (member user mentions)) - ;; user not already in mentions: - (mastodon-toot--mentions-to-string (append (list user) mentions nil)) - ;; user already in mentions: - (mastodon-toot--mentions-to-string (copy-sequence mentions)))) - ;; ELSE no booster: + (if (and booster + ;; (if + (and (not (equal user booster)) + (not (member booster mentions)))) + ;; different booster, user and mentions: + (mastodon-toot--mentions-to-string (append (list user booster) mentions nil)) + ;; booster is either user or in mentions or nil: (if (not (member user mentions)) - ;; user not in mentions: + ;; user not already in mentions: (mastodon-toot--mentions-to-string (append (list user) mentions nil)) - ;; user in mentions already: + ;; user already in mentions: (mastodon-toot--mentions-to-string (copy-sequence mentions))))) - id - toot - quote)))) + id toot quote)))) ;;; COMPOSE TOOT SETTINGS -- cgit v1.2.3