From 9987d32bcf0c920cebdd99e26c135295351bb259 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Fri, 2 Aug 2024 18:51:04 +0200
Subject: audit first 1000 loc of toot.el. these are the uncontroversial edits

---
 lisp/mastodon-toot.el | 202 +++++++++++++++++++++++++-------------------------
 1 file changed, 99 insertions(+), 103 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 1269516..75b0f28 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -268,6 +268,12 @@ data about the item boosted or favourited."
   (or (mastodon-tl--property 'base-toot :no-move) ; fave/boost notifs
       (mastodon-tl--property 'item-json)))
 
+(defun mastodon-toot--inc-or-dec (count subtract)
+  "If SUBTRACT, decrement COUNT, else increment."
+  (if subtract
+      (1- count)
+    (1+ count)))
+
 
 ;;; MACRO
 
@@ -349,12 +355,12 @@ JSON is added to the string as its item-json."
   (let ((inhibit-read-only t)
         (bol (car byline-region))
         (eol (cdr byline-region))
-        (at-byline-p (eq (mastodon-tl--property 'byline :no-move) t)))
+        (at-byline-p (eq t (mastodon-tl--property 'byline :no-move))))
     (save-excursion
       (when remove
         (goto-char bol)
         (beginning-of-line) ;; The marker is not part of the byline
-        (if (search-forward (format "(%s) " marker) eol t)
+        (if (search-forward (format "(%s) " marker) eol :no-error)
             (replace-match "")
           (user-error "Oops: could not find marker '(%s)'" marker)))
       (unless remove
@@ -415,9 +421,10 @@ ACTION is a symbol, either `favourite' or `boost.'"
                        (get-text-property (car byline-region) 'favourited-p)))
               (str-api (if boost-p "reblog" action-str))
               (action-str-api (mastodon-toot--str-negify str-api faved boosted))
-              (action-pp (concat (mastodon-toot--str-negify action-str faved boosted)
-                                 (if boost-p "ed" "d")))
-              (remove (if boost-p (when boosted t) (when faved t))))
+              (action-pp (concat
+                          (mastodon-toot--str-negify action-str faved boosted)
+                          (if boost-p "ed" "d")))
+              (remove-p (if boost-p boosted faved)))
          (mastodon-toot--action
           action-str-api
           (lambda (_)
@@ -427,9 +434,9 @@ ACTION is a symbol, either `favourite' or `boost.'"
                                    (if boost-p
                                        (list 'boosted-p (not boosted))
                                      (list 'favourited-p (not faved))))
-              (mastodon-toot--update-stats-on-action action remove)
+              (mastodon-toot--update-stats-on-action action remove-p)
               (mastodon-toot--action-success (mastodon-tl--symbol action)
-                                             byline-region remove item-json))
+                                             byline-region remove-p item-json))
             (message "%s #%s" action-pp id)))))))))
 
 (defun mastodon-toot--str-negify (str faved boosted)
@@ -438,33 +445,29 @@ ACTION is a symbol, either `favourite' or `boost.'"
       (concat "un" str)
     str))
 
-(defun mastodon-toot--inc-or-dec (count subtract)
-  "If SUBTRACT, decrement COUNT, else increment."
-  (if subtract
-      (1- count)
-    (1+ count)))
-
 (defun mastodon-toot--update-stats-on-action (action &optional subtract)
   "Increment the toot stats display upon ACTION.
 ACTION is a symbol, either `favourite' or `boost'.
 SUBTRACT means we are un-favouriting or unboosting, so we decrement."
-  (let* ((count-prop (if (eq action 'favourite)
-                         'favourites-count
-                       'boosts-count))
-         (count-prop-range (mastodon-tl--find-property-range count-prop (point)))
-         (count (get-text-property (car count-prop-range) count-prop))
-         (inhibit-read-only 1))
-    ;; TODO another way to implement this would be to async fetch counts again
-    ;;  and re-display from count-properties
-    (add-text-properties (car count-prop-range)
-                         (cdr count-prop-range)
-                         (list 'display
-                               (number-to-string
-                                (mastodon-toot--inc-or-dec count subtract))
-                               ;; update the count prop
-                               ;; we rely on this for any subsequent actions:
-                               count-prop
-                               (mastodon-toot--inc-or-dec count subtract)))))
+  (if (not (symbolp action))
+      (error "Invalid argument: symbolp %s" action)
+    (let* ((count-prop (if (eq action 'favourite)
+                           'favourites-count
+                         'boosts-count))
+           (count-range (mastodon-tl--find-property-range count-prop (point)))
+           (count (get-text-property (car count-range) count-prop))
+           (inhibit-read-only 1))
+      ;; TODO another way to implement this would be to async fetch counts again
+      ;;  and re-display from count-properties
+      (add-text-properties (car count-range)
+                           (cdr count-range)
+                           (list 'display
+                                 (number-to-string
+                                  (mastodon-toot--inc-or-dec count subtract))
+                                 ;; update the count prop
+                                 ;; we rely on this for any subsequent actions:
+                                 count-prop
+                                 (mastodon-toot--inc-or-dec count subtract))))))
 
 (defun mastodon-toot--toggle-boost ()
   "Boost/unboost toot at `point'."
@@ -508,17 +511,17 @@ SUBTRACT means we are un-favouriting or unboosting, so we decrement."
                                                   byline-region bookmarked-p item-json)
                    (message "%s #%s" message id))))))))))
 
-(defun mastodon-toot--list-toot-boosters ()
+(defun mastodon-toot--list-boosters ()
   "List the boosters of toot at point."
   (interactive)
-  (mastodon-toot--list-toot-boosters-or-favers))
+  (mastodon-toot--list-boosters-or-favers))
 
-(defun mastodon-toot--list-toot-favouriters ()
+(defun mastodon-toot--list-favouriters ()
   "List the favouriters of toot at point."
   (interactive)
-  (mastodon-toot--list-toot-boosters-or-favers :favourite))
+  (mastodon-toot--list-boosters-or-favers :favourite))
 
-(defun mastodon-toot--list-toot-boosters-or-favers (&optional favourite)
+(defun mastodon-toot--list-boosters-or-favers (&optional favourite)
   "List the favouriters or boosters of toot at point.
 With FAVOURITE, list favouriters, else list boosters."
   (mastodon-toot--with-toot-item
@@ -598,13 +601,12 @@ Uses `lingva.el'."
   (interactive)
   (let* ((toot (mastodon-toot--base-toot-or-item-json))
          (pinnable-p (mastodon-toot--own-toot-p toot))
-         (pinned-p (equal (alist-get 'pinned toot) t))
+         (pinned-p (eq t (alist-get 'pinned toot)))
          (action (if pinned-p "unpin" "pin"))
-         (msg (if pinned-p "unpinned" "pinned"))
-         (msg-y-or-n (if pinned-p "Unpin" "Pin")))
+         (msg (if pinned-p "unpinned" "pinned")))
     (if (not pinnable-p)
         (user-error "You can only pin your own toots")
-      (when (y-or-n-p (format "%s this toot? " msg-y-or-n))
+      (when (y-or-n-p (format "%s this toot? " (capitalize action)))
         (mastodon-toot--action action
                                (lambda (_)
                                  (when mastodon-tl--buffer-spec
@@ -627,28 +629,26 @@ NO-REDRAFT means delete toot only."
   (let* ((toot (mastodon-toot--base-toot-or-item-json))
          (id (mastodon-tl--as-string (mastodon-tl--item-id toot)))
          (url (mastodon-http--api (format "statuses/%s" id)))
-         (toot-cw (alist-get 'spoiler_text toot))
-         (toot-visibility (alist-get 'visibility toot))
-         (reply-id (alist-get 'in_reply_to_id toot))
          (pos (point)))
-    (if (not (mastodon-toot--own-toot-p toot))
-        (user-error "You can only delete (and redraft) your own toots")
-      (when (y-or-n-p (if no-redraft
-                          (format "Delete this toot? ")
-                        (format "Delete and redraft this toot? ")))
-        (let* ((response (mastodon-http--delete url)))
-          (mastodon-http--triage
-           response
-           (lambda (_)
-             (if no-redraft
-                 (progn
-                   (when mastodon-tl--buffer-spec
-                     (mastodon-tl--reload-timeline-or-profile pos))
-                   (message "Toot deleted!"))
-               (mastodon-toot--redraft response
-                                       reply-id
-                                       toot-visibility
-                                       toot-cw)))))))))
+    (let-alist toot
+      (if (not (mastodon-toot--own-toot-p toot))
+          (user-error "You can only delete (and redraft) your own toots")
+        (when (y-or-n-p (if no-redraft
+                            (format "Delete this toot? ")
+                          (format "Delete and redraft this toot? ")))
+          (let* ((response (mastodon-http--delete url)))
+            (mastodon-http--triage
+             response
+             (lambda (_)
+               (if no-redraft
+                   (progn
+                     (when mastodon-tl--buffer-spec
+                       (mastodon-tl--reload-timeline-or-profile pos))
+                     (message "Toot deleted!"))
+                 (mastodon-toot--redraft response
+                                         .in_reply_to_id
+                                         .visibility
+                                         .spoiler_text))))))))))
 
 (defun mastodon-toot--set-cw (&optional cw)
   "Set content warning to CW if it is non-nil."
@@ -659,12 +659,13 @@ NO-REDRAFT means delete toot only."
 
 ;;; REDRAFT
 
-(defun mastodon-toot--redraft (response &optional reply-id toot-visibility toot-cw)
+(defun mastodon-toot--redraft (response &optional reply-id toot-visibility
+                                        toot-cw)
   "Opens a new toot compose buffer using values from RESPONSE buffer.
 REPLY-ID, TOOT-VISIBILITY, and TOOT-CW of deleted toot are preseved."
   (with-current-buffer response
-    (let* ((json-response (mastodon-http--process-json))
-           (content (alist-get 'text json-response)))
+    (let* ((response (mastodon-http--process-json))
+           (content (alist-get 'text response)))
       (mastodon-toot--compose-buffer)
       (goto-char (point-max))
       (insert content)
@@ -726,11 +727,10 @@ CANCEL means the toot was not sent, so we save the toot text as a draft."
   "Kill new-toot buffer/window. Does not POST content.
 If toot is not empty, prompt to save text as a draft."
   (interactive)
-  (if (mastodon-toot--empty-p)
-      (mastodon-toot--kill)
-    (when (y-or-n-p "Save draft toot?")
-      (mastodon-toot--save-draft))
-    (mastodon-toot--kill)))
+  (when (and (not (mastodon-toot--empty-p))
+             (y-or-n-p "Save draft toot?"))
+    (mastodon-toot--save-draft))
+  (mastodon-toot--kill))
 
 (defun mastodon-toot--save-draft ()
   "Save the current compose toot text as a draft.
@@ -872,9 +872,9 @@ instance to edit a toot."
          (scheduled mastodon-toot--scheduled-for)
          (scheduled-id mastodon-toot--scheduled-id)
          (edit-id mastodon-toot--edit-item-id)
-         (endpoint (if edit-id ; we are sending an edit:
-                       (mastodon-http--api (format "statuses/%s" edit-id))
-                     (mastodon-http--api "statuses")))
+         (endpoint (mastodon-http--api (if edit-id ; we are sending an edit:
+                                           (format "statuses/%s" edit-id)
+                                         "statuses")))
          (args-no-media (append `(("status" . ,toot)
                                   ("in_reply_to_id" . ,mastodon-toot--reply-to-id)
                                   ("visibility" . ,mastodon-toot--visibility)
@@ -912,9 +912,10 @@ instance to edit a toot."
           ((mastodon-toot--empty-p)
            (user-error "Empty toot. Cowardly refusing to post this"))
           (t
-           (let ((response (if edit-id ; we are sending an edit:
-                               (mastodon-http--put endpoint args)
-                             (mastodon-http--post endpoint args))))
+           (let ((response (funcall (if edit-id ; we are sending an edit:
+                                        #'mastodon-http--put
+                                      #'mastodon-http--post)
+                                    endpoint args)))
              (mastodon-http--triage
               response
               (lambda (_)
@@ -927,13 +928,10 @@ instance to edit a toot."
                    scheduled-id :no-confirm))
                 ;; window config:
                 (mastodon-toot--restore-previous-window-config prev-window-config)
-                ;; reload previous view in certain cases:
-                ;; we reload: - when we have been editing
-                ;;            - when we are in thread view
-                ;;            - ?
-                ;; (we don't necessarily want to reload in every posting case
-                ;; as it can sometimes be slow and we may still lose our place
-                ;; in a timeline.)
+                ;; reload: - when we have been editing
+                ;;         - when we are in thread view
+                ;; (we don't reload in every case as it can be slow and we may
+                ;; lose our place in a timeline.)
                 (when (or edit-id
                           (equal 'thread (mastodon-tl--get-buffer-type)))
                   (let ((pos (marker-position (cadr prev-window-config))))
@@ -1003,7 +1001,6 @@ instance to edit a toot."
 (defun mastodon-toot--insert-toot-iter (it)
   "Insert iteration IT of toot."
   (let ((content (alist-get 'content it)))
-    ;; (account (alist-get 'account it))
     ;; TODO: handle polls, media
     (mastodon-tl--render-text content)))
 
@@ -1029,8 +1026,10 @@ eg. \"yourusername\" -> \"\"
 eg. \"feduser@fed.social\" -> \"@feduser@fed.social\"."
   (cond ((string-match-p "@" acct) (concat "@" acct)) ; federated acct
         ((string= (mastodon-auth--user-acct) acct) "") ; your acct
-        (t (concat "@" acct "@" ; local acct
-                   (cadr (split-string mastodon-instance-url "/" t))))))
+        (t
+         (concat "@" acct "@" ; local acct
+                 (cadr
+                  (split-string mastodon-instance-url "/" :omit-nulls))))))
 
 
 ;;; COMPLETION (TAGS, MENTIONS)
@@ -1066,19 +1065,19 @@ Federated user: `username@host.co`."
 The candidates are calculated according to currently active
 `emojify-emoji-styles'. Hacked off
 `emojify--get-completing-read-candidates'."
-  (let ((styles ;'("ascii" "unicode" "github")
-         (mapcar #'symbol-name emojify-emoji-styles)))
+  (let ((styles (mapcar #'symbol-name emojify-emoji-styles)))
     (let ((emojis '()))
-      (emojify-emojis-each (lambda (key value)
-                             (when (seq-position styles (ht-get value "style"))
-                               (push (cons key
-                                           (format "%s (%s)"
-                                                   (ht-get value "name")
-                                                   (ht-get value "style")))
-                                     emojis))))
+      (emojify-emojis-each
+       (lambda (key value)
+         (when (seq-position styles (ht-get value "style"))
+           (push (cons key
+                       (format "%s (%s)"
+                               (ht-get value "name")
+                               (ht-get value "style")))
+                 emojis))))
       emojis)))
 
-(defun mastodon-toot--fetch-completion-candidates (start end &optional type)
+(defun mastodon-toot--fetch-candidates (start end &optional type)
   "Search for a completion prefix from buffer positions START to END.
 Return a list of candidates.
 TYPE is the candidate type, it may be :tags, :handles, or :emoji."
@@ -1101,7 +1100,7 @@ TYPE is the candidate type, it may be :tags, :handles, or :emoji."
 (defun mastodon-toot--make-capf (regex annot-fun type)
   "Build a completion backend for `completion-at-point-functions'.
 REGEX is the regex to match preceding text.
-TYPE is a keyword symbol for `mastodon-toot--fetch-completion-candidates'.
+TYPE is a keyword symbol for `mastodon-toot--fetch-candidates'.
 ANNOT-FUN is a function returning an annotatation from a single
 arg, a candidate."
   (let* ((bounds (mastodon-toot--get-bounds regex))
@@ -1115,7 +1114,7 @@ arg, a candidate."
                ;; Interruptible candidate computation, from minad/d mendler, thanks!
                (let ((result
                       (while-no-input
-                        (mastodon-toot--fetch-completion-candidates
+                        (mastodon-toot--fetch-candidates
                          start end type))))
                  (and (consp result) result))))
             :exclusive 'no
@@ -1458,9 +1457,7 @@ Sets `mastodon-toot-poll' to nil."
                                 expiry-seconds-from-now))
            (expiry-human (car (mastodon-tl--human-duration expiry-seconds-from-now)))
            (options (mastodon-tl--map-alist 'title .options))
-           (multiple (if (eq :json-false .multiple)
-                         nil
-                       t)))
+           (multiple (if (eq :json-false .multiple) nil t)))
       (setq mastodon-toot-poll
             `( :options ,options :expiry-readable ,expiry-human
                :expiry ,expiry-str :multi ,multiple)))))
@@ -1677,7 +1674,8 @@ The default is given by `mastodon-toot--default-reply-visibility'."
     (let ((less-restrictive (member (intern mastodon-toot--default-reply-visibility)
 				    mastodon-toot-visibility-list)))
       (if (member (intern reply-visibility) less-restrictive)
-	  mastodon-toot--default-reply-visibility reply-visibility))))
+	  mastodon-toot--default-reply-visibility
+        reply-visibility))))
 
 (defun mastodon-toot--fill-buffer ()
   "Mark buffer, call `fill-region'."
@@ -1688,7 +1686,6 @@ The default is given by `mastodon-toot--default-reply-visibility'."
 (defun mastodon-toot--render-reply-region-str (str)
   "Refill STR and prefix all lines with >, as reply-quote text."
   (with-temp-buffer
-    ;; (switch-to-buffer (current-buffer))
     (insert str)
     ;; unfill first:
     (let ((fill-column (point-max)))
@@ -1699,8 +1696,7 @@ The default is given by `mastodon-toot--default-reply-visibility'."
     (save-match-data
       (while (re-search-forward "^" nil t)
         (replace-match " > ")))
-    (buffer-substring-no-properties (point-min)
-                                    (point-max))))
+    (buffer-substring-no-properties (point-min) (point-max))))
 
 (defun mastodon-toot--setup-as-reply (reply-to-user reply-to-id
                                                     reply-json reply-region)
-- 
cgit v1.2.3


From 7636931151fda918f5303e28aa75f22c12cbc354 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Fri, 2 Aug 2024 18:51:47 +0200
Subject: toot: re-write mentions-to-string

---
 lisp/mastodon-toot.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 75b0f28..7af0fa3 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1013,9 +1013,9 @@ Buffer-local variable `mastodon-toot-previous-window-config' holds the config."
 (defun mastodon-toot--mentions-to-string (mentions)
   "Apply `mastodon-toot--process-local' function to each mention in MENTIONS.
 Remove empty string (self) from result and joins the sequence with whitespace."
-  (mapconcat (lambda (mention) mention)
-	     (remove "" (mapcar #'mastodon-toot--process-local mentions))
-             " "))
+  (let ((mentions (remove ""
+                          (mapcar #'mastodon-toot--process-local mentions))))
+    (mapconcat #'identity mentions " ")))
 
 (defun mastodon-toot--process-local (acct)
   "Add domain to local ACCT and replace the curent user name with \"\".
-- 
cgit v1.2.3


From 0575324cd5ec2737b0a6fa9896d26d71362a3094 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Fri, 2 Aug 2024 18:52:01 +0200
Subject: toot: re-write --mentions

---
 lisp/mastodon-toot.el | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 7af0fa3..7358316 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1039,10 +1039,7 @@ eg. \"feduser@fed.social\" -> \"@feduser@fed.social\"."
 The mentioned users look like this:
 Local user (including the logged in): `username`.
 Federated user: `username@host.co`."
-  (let* ((boosted (mastodon-tl--field 'reblog status))
-         (mentions (if boosted
-	               (alist-get 'mentions (alist-get 'reblog status))
-	             (alist-get 'mentions status))))
+  (let* ((mentions (mastodon-tl--field 'mentions status)))
     ;; reverse does not work on vectors in 24.5
     (mastodon-tl--map-alist 'acct (reverse mentions))))
 
-- 
cgit v1.2.3


From dcf0747052ce07a368292fd45f75b21502fded90 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
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


From 1c1085a321a0885431e7eac5f720b6b0bedd797e Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Fri, 2 Aug 2024 18:53:09 +0200
Subject: toot: re-write view-toot-edits

---
 lisp/mastodon-toot.el | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 00f7ce7..166f08b 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -975,28 +975,29 @@ instance to edit a toot."
   "View editing history of the toot at point in a popup buffer."
   (interactive)
   (let ((id (mastodon-tl--property 'base-item-id))
-        (history (mastodon-tl--property 'edit-history))
+        (history (mastodon-tl--property 'edit-history)) ;; at byline
         (buf "*mastodon-toot-edits*"))
-    (with-mastodon-buffer buf #'special-mode :other-window
-      (let ((count 1))
-        (mapc (lambda (x)
-                (insert (propertize (if (= count 1)
-                                        (format "%s [original]:\n" count)
-                                      (format "%s:\n" count))
-                                    'face 'font-lock-comment-face)
-                        (mastodon-toot--insert-toot-iter x)
-                        "\n")
-                (cl-incf count))
-              history))
-      (setq-local header-line-format
-                  (propertize
-                   (format "Edits to toot by %s:"
-                           (alist-get 'username
-                                      (alist-get 'account (car history))))
-                   'face 'font-lock-comment-face))
-      (mastodon-tl--set-buffer-spec (buffer-name (current-buffer))
-                                    (format "statuses/%s/history" id)
-                                    nil))))
+    (if (not history)
+        (user-error "No editing history for this toot")
+      (with-mastodon-buffer buf #'special-mode :other-window
+        (cl-loop for count from 1
+                 for x in history
+                 do (insert (propertize (if (= count 1)
+                                            (format "%s [original]:\n" count)
+                                          (format "%s:\n" count))
+                                        'face 'font-lock-comment-face)
+                            (mastodon-toot--insert-toot-iter x)
+                            "\n"))
+        (goto-char (point-min))
+        (setq-local header-line-format
+                    (propertize
+                     (format "Edits to toot by %s:"
+                             (alist-get 'username
+                                        (alist-get 'account (car history))))
+                     'face 'font-lock-comment-face))
+        (mastodon-tl--set-buffer-spec (buffer-name (current-buffer))
+                                      (format "statuses/%s/history" id)
+                                      nil)))))
 
 (defun mastodon-toot--insert-toot-iter (it)
   "Insert iteration IT of toot."
-- 
cgit v1.2.3


From 731f7b5295e7169f51b2cebf767bb3acefbcda96 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Fri, 2 Aug 2024 20:38:11 +0200
Subject: re-write --reply again with a cond.

---
 lisp/mastodon-toot.el | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 166f08b..277b9c4 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1167,7 +1167,6 @@ prefixed by >."
    (let* ((quote (when (region-active-p)
                    (buffer-substring (region-beginning)
                                      (region-end))))
-          ;; no-move arg for base toot: don't try next toot
           (toot (mastodon-toot--base-toot-or-item-json))
           (account (mastodon-tl--field 'account toot))
           (user (alist-get 'acct account))
@@ -1175,22 +1174,20 @@ prefixed by >."
           (boosted (mastodon-tl--field 'reblog toot))
           (booster (when boosted
                      (alist-get 'acct
-                                (alist-get 'account toot)))))
-     (mastodon-toot--compose-buffer
-      (when user
-        (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 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)))))
-      id toot quote))))
+                                (alist-get 'account toot))))
+          (mentions
+           (cond ((and booster ;; different booster, user and mentions:
+                       (and (not (equal user booster))
+                            (not (member booster mentions))))
+	          (mastodon-toot--mentions-to-string
+                   (append (list user booster) mentions nil)))
+                 ((not (member user mentions)) ;; user not in mentions:
+	          (mastodon-toot--mentions-to-string
+                   (append (list user) mentions nil)))
+                 (t ;; user already in mentions:
+                  (mastodon-toot--mentions-to-string
+                   (copy-sequence mentions))))))
+     (mastodon-toot--compose-buffer mentions id toot quote))))
 
 
 ;;; COMPOSE TOOT SETTINGS
-- 
cgit v1.2.3


From 6dda2522d2a5ea57f88898e0f043760e68c7309d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Fri, 2 Aug 2024 21:31:59 +0200
Subject: toot: attach-media: get max attachments from instance, y-or-n-p

views: get-own-instance (for max attachs)
---
 lisp/mastodon-toot.el  | 47 +++++++++++++++++++++++++++++------------------
 lisp/mastodon-views.el |  8 ++++++--
 2 files changed, 35 insertions(+), 20 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 277b9c4..f7799c2 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -97,6 +97,7 @@
 (autoload 'mastodon-tl--get-buffer-type "mastodon-tl")
 (autoload 'mastodon-tl--human-duration "mastodon-tl")
 (autoload 'mastodon-profile--get-preferences-pref "mastodon-profile")
+(autoload 'mastodon-views--get-own-instance "mastodon-views")
 
 ;; for mastodon-toot--translate-toot-text
 (autoload 'mastodon-tl--content "mastodon-tl")
@@ -1245,33 +1246,43 @@ Return its two letter ISO 639 1 code."
   (mastodon-toot--refresh-attachments-display)
   (mastodon-toot--update-status-fields))
 
+(defun mastodon-toot--get-instance-max-attachments ()
+  "Return the maximum attachments from `mastodon-active-user's instance."
+  ;; FIXME: this likely various for other server types:
+  (let ((config (alist-get 'statuses
+                           (alist-get 'configuration
+                                      (mastodon-views--get-own-instance)))))
+    (alist-get 'max_media_attachments config)))
+
 (defun mastodon-toot--attach-media (file description)
   "Prompt for an attachment FILE with DESCRIPTION.
 A preview is displayed in the new toot buffer, and the file
 is uploaded asynchronously using `mastodon-toot--upload-attached-media'.
 File is actually attached to the toot upon posting."
   (interactive "fFilename: \nsDescription: ")
-  (when (>= (length mastodon-toot--media-attachments) 4)
-    ;; Only a max. of 4 attachments are allowed, so pop the oldest one.
-    (pop mastodon-toot--media-attachments))
-  (if (file-directory-p file)
-      (user-error "Looks like you chose a directory not a file")
-    (setq mastodon-toot--media-attachments
-          (nconc mastodon-toot--media-attachments
-                 `(((:contents . ,(mastodon-http--read-file-as-string file))
-                    (:description . ,description)
-                    (:filename . ,file)))))
-    (mastodon-toot--refresh-attachments-display)
-    ;; upload only most recent attachment:
-    (mastodon-toot--upload-attached-media
-     (car (last mastodon-toot--media-attachments)))))
+  (let ((max-attachments (mastodon-toot--get-instance-max-attachments)))
+    (when (>= (length mastodon-toot--media-attachments)
+              (or max-attachments 4))
+      ;; warn + pop the oldest one:
+      (when (y-or-n-p
+             (format "Maximum attachments (%s) reached: remove first one?"
+                     max-attachments))
+        (pop mastodon-toot--media-attachments)))
+    (if (file-directory-p file)
+        (user-error "Looks like you chose a directory not a file")
+      (setq mastodon-toot--media-attachments
+            (nconc mastodon-toot--media-attachments
+                   `(((:contents . ,(mastodon-http--read-file-as-string file))
+                      (:description . ,description)
+                      (:filename . ,file)))))
+      (mastodon-toot--refresh-attachments-display)
+      ;; upload only most recent attachment:
+      (mastodon-toot--upload-attached-media
+       (car (last mastodon-toot--media-attachments))))))
 
 (defun mastodon-toot--attachment-descriptions ()
   "Return a list of image descriptions for current attachments."
-  (mastodon-tl--map-alist :description
-                          ;; (mapcar (lambda (a)
-                          ;; (alist-get :description a))
-                          mastodon-toot--media-attachments))
+  (mastodon-tl--map-alist :description mastodon-toot--media-attachments))
 
 (defun mastodon-toot--attachment-from-desc (desc)
   "Return an attachment based on its description DESC."
diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el
index 775b96b..e956ccd 100644
--- a/lisp/mastodon-views.el
+++ b/lisp/mastodon-views.el
@@ -738,6 +738,11 @@ If INSTANCE is given, use that."
          (string-remove-suffix (concat "/@" username)
                                url))))
 
+(defun mastodon-views--get-own-instance ()
+  "Return JSON of `mastodon-active-user's instance."
+  (mastodon-http--get-json
+   (mastodon-http--api "instance" "v2") nil nil :vector))
+
 (defun mastodon-views--view-instance-description
     (&optional user brief instance misskey)
   "View the details of the instance the current post's author is on.
@@ -747,8 +752,7 @@ INSTANCE is an instance domain name.
 MISSKEY means the instance is a Misskey or derived server."
   (interactive)
   (if user
-      (let ((response (mastodon-http--get-json
-                       (mastodon-http--api "instance" "v2") nil nil :vector)))
+      (let ((response (mastodon-views--get-own-instance)))
         (mastodon-views--instance-response-fun response brief instance))
     (mastodon-tl--do-if-item
      (let* ((toot (if (mastodon-tl--profile-buffer-p)
-- 
cgit v1.2.3


From 72d4d0e77faa891bd249cefca1375c82b0e6dc62 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Fri, 2 Aug 2024 21:43:50 +0200
Subject: toot: re-write format-attachments

---
 lisp/mastodon-toot.el | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index f7799c2..3728bc8 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1320,30 +1320,30 @@ which is used to attach it to a toot when posting."
                              'toot-attachments (point-min)))
         (display-specs (mastodon-toot--format-attachments)))
     (dotimes (i (- (cdr attachments-region) (car attachments-region)))
-      (add-text-properties (+ (car attachments-region) i)
-                           (+ (car attachments-region) i 1)
+      (add-text-properties (+ i (car attachments-region))
+                           (+ i 1 (car attachments-region))
                            (list 'display (or (nth i display-specs) ""))))))
 
 (defun mastodon-toot--format-attachments ()
   "Format the attachment previews for display in toot draft buffer."
-  (or (let ((counter 0)
-            (image-options (when (or (image-type-available-p 'imagemagick)
-                                     (image-transforms-p))
-                             `(:height ,mastodon-toot--attachment-height))))
-        (mapcan (lambda (attachment)
-                  (let* ((data (alist-get :contents attachment))
-                         (image (apply #'create-image data
-                                       (if (version< emacs-version "27.1")
-                                           (when image-options 'imagemagick)
-                                         nil) ; inbuilt scaling in 27.1
-                                       t image-options))
-                         (description (alist-get :description attachment)))
-                    (setq counter (1+ counter))
-                    (list (format "\n    %d: " counter)
-                          image
-                          (format " \"%s\"" description))))
-                mastodon-toot--media-attachments))
-      (list "None")))
+  (or
+   (let ((image-options (when (or (image-type-available-p 'imagemagick)
+                                  (image-transforms-p))
+                          `(:height ,mastodon-toot--attachment-height))))
+     (cl-loop for count from 1
+              for att in mastodon-toot--media-attachments
+              nconc
+              (let* ((data (alist-get :contents att))
+                     (image (apply #'create-image data
+                                   (if (version< emacs-version "27.1")
+                                       (when image-options 'imagemagick)
+                                     nil) ; inbuilt scaling in 27.1
+                                   t image-options))
+                     (desc (alist-get :description att)))
+                (list (format "\n    %d: " count)
+                      image
+                      (format " \"%s\"" desc)))))
+   (list "None")))
 
 
 ;;; POLL
-- 
cgit v1.2.3


From fe7ae6ecb2445b84563debd5bb0ad9d37ee291b0 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Sat, 3 Aug 2024 10:07:44 +0200
Subject: max attachments: move fallback into our get max fun

---
 lisp/mastodon-toot.el | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 3728bc8..0b28538 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1247,12 +1247,17 @@ Return its two letter ISO 639 1 code."
   (mastodon-toot--update-status-fields))
 
 (defun mastodon-toot--get-instance-max-attachments ()
-  "Return the maximum attachments from `mastodon-active-user's instance."
+  "Return the maximum attachments from `mastodon-active-user's instance.
+If that fails, return 4 as a fallback"
   ;; FIXME: this likely various for other server types:
-  (let ((config (alist-get 'statuses
-                           (alist-get 'configuration
-                                      (mastodon-views--get-own-instance)))))
-    (alist-get 'max_media_attachments config)))
+  ;; pleroma doesn't advertise this on "api/v1/instance" (checked
+  ;; fe.disroot.org)
+  (or
+   (let ((config (alist-get 'statuses
+                            (alist-get 'configuration
+                                       (mastodon-views--get-own-instance)))))
+     (alist-get 'max_media_attachments config))
+   4)) ; mastodon default as fallback
 
 (defun mastodon-toot--attach-media (file description)
   "Prompt for an attachment FILE with DESCRIPTION.
@@ -1262,7 +1267,7 @@ File is actually attached to the toot upon posting."
   (interactive "fFilename: \nsDescription: ")
   (let ((max-attachments (mastodon-toot--get-instance-max-attachments)))
     (when (>= (length mastodon-toot--media-attachments)
-              (or max-attachments 4))
+              max-attachments)
       ;; warn + pop the oldest one:
       (when (y-or-n-p
              (format "Maximum attachments (%s) reached: remove first one?"
-- 
cgit v1.2.3


From 99c78081abce141e6eb950b5017f9da7a4ab60b6 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Sat, 3 Aug 2024 10:19:30 +0200
Subject: toot: audit poll code

---
 lisp/mastodon-toot.el | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 0b28538..521dbf8 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1403,10 +1403,11 @@ MAX is the maximum number set by their instance."
 (defun mastodon-toot--read-poll-options (count length)
   "Read a list of options for poll with COUNT options.
 LENGTH is the maximum character length allowed for a poll option."
-  (let* ((choices (cl-loop for x from 1 to count
-                           collect (read-string
-                                    (format "Poll option [%s/%s] [max %s chars]: "
-                                            x count length))))
+  (let* ((choices
+          (cl-loop for x from 1 to count
+                   collect (read-string
+                            (format "Poll option [%s/%s] [max %s chars]: "
+                                    x count length))))
          (longest (apply #'max (mapcar #'length choices))))
     (if (> longest length)
         (progn
@@ -1450,16 +1451,15 @@ Sets `mastodon-toot-poll' to nil."
 (defun mastodon-toot--server-poll-to-local (json)
   "Convert server poll data JSON to a `mastodon-toot-poll' plist."
   (let-alist json
-    (let* ((expiry-seconds-from-now
+    (let* ((expiry-seconds-rel
             (time-to-seconds
              (time-subtract
               (encode-time
                (parse-time-string .expires_at))
               (current-time))))
-           (expiry-str
-            (format-time-string "%s"
-                                expiry-seconds-from-now))
-           (expiry-human (car (mastodon-tl--human-duration expiry-seconds-from-now)))
+           (expiry-str (format-time-string "%s" expiry-seconds-rel))
+           (expiry-human (car
+                          (mastodon-tl--human-duration expiry-seconds-rel)))
            (options (mastodon-tl--map-alist 'title .options))
            (multiple (if (eq :json-false .multiple) nil t)))
       (setq mastodon-toot-poll
-- 
cgit v1.2.3


From 3c0099ff7da42b6a3ed2f1a9901a382e2f099abd Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Sat, 3 Aug 2024 10:23:24 +0200
Subject: toot: audit schedule code

---
 lisp/mastodon-toot.el | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 521dbf8..3095bb1 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1485,28 +1485,29 @@ With RESCHEDULE, reschedule the scheduled toot at point without editing."
                 (ts (when reschedule
                       (alist-get 'scheduled_at
                                  (mastodon-tl--property 'scheduled-json :no-move))))
-                (time-value (org-read-date t t nil "Schedule toot:"
-                                           ;; default to scheduled timestamp if already set:
-                                           (mastodon-toot--iso-to-org
-                                            ;; we are rescheduling without editing:
-                                            (or ts
-                                                ;; we are maybe editing the scheduled toot:
-                                                mastodon-toot--scheduled-for))))
+                (time-value
+                 (org-read-date t t nil "Schedule toot:"
+                                ;; default to scheduled timestamp if already set:
+                                (mastodon-toot--iso-to-org
+                                 ;; we are rescheduling without editing:
+                                 (or ts
+                                     ;; we are maybe editing the scheduled toot:
+                                     mastodon-toot--scheduled-for))))
                 (iso8601-str (format-time-string "%FT%T%z" time-value))
                 (msg-str (format-time-string "%d-%m-%y at %H:%M[%z]" time-value)))
            (if (not reschedule)
                (progn
                  (setq-local mastodon-toot--scheduled-for iso8601-str)
-                 (message (format "Toot scheduled for %s." msg-str)))
+                 (message "Toot scheduled for %s." msg-str))
              (let* ((args `(("scheduled_at" . ,iso8601-str)))
                     (url (mastodon-http--api (format "scheduled_statuses/%s" id)))
                     (response (mastodon-http--put url args)))
-               (mastodon-http--triage response
-                                      (lambda (_)
-                                        ;; reschedule means we are in scheduled toots view:
-                                        (mastodon-views--view-scheduled-toots)
-                                        (message
-                                         (format "Toot rescheduled for %s." msg-str))))))))))
+               (mastodon-http--triage
+                response
+                (lambda (_)
+                  ;; reschedule means we are in scheduled toots view:
+                  (mastodon-views--view-scheduled-toots)
+                  (message "Toot rescheduled for %s." msg-str)))))))))
 
 (defun mastodon-toot--iso-to-human (ts)
   "Format an ISO8601 timestamp TS to be more human-readable."
@@ -1516,8 +1517,9 @@ With RESCHEDULE, reschedule the scheduled toot at point without editing."
 
 (defun mastodon-toot--iso-to-org (ts)
   "Convert ISO8601 timestamp TS to something `org-read-date' can handle."
-  (when ts (let* ((decoded (iso8601-parse ts)))
-             (encode-time decoded))))
+  (when ts
+    (let* ((decoded (iso8601-parse ts)))
+      (encode-time decoded))))
 
 
 ;;; DISPLAY KEYBINDINGS
-- 
cgit v1.2.3


From b3a4709d5316d2c7322c49671a9f266db1708614 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Sun, 4 Aug 2024 09:36:45 +0200
Subject: toot: audit rest of file.

---
 lisp/mastodon-toot.el | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 3095bb1..f0895db 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1524,13 +1524,14 @@ With RESCHEDULE, reschedule the scheduled toot at point without editing."
 
 ;;; DISPLAY KEYBINDINGS
 
-(defun mastodon-toot--get-mode-kbinds ()
+(defun mastodon-toot--get-kbinds ()
   "Get a list of the keybindings in the `mastodon-toot-mode'."
   (let* ((binds (copy-tree mastodon-toot-mode-map))
          (prefix (car (cadr binds)))
-         (bindings (remove nil (mapcar (lambda (i)
-                                         (when (listp i) i))
-                                       (cadr binds)))))
+         (bindings (remove nil
+                           (mapcar (lambda (i)
+                                     (when (listp i) i))
+                                   (cadr binds)))))
     (mapcar (lambda (b)
               (setf (car b) (vector prefix (car b)))
               b)
@@ -1585,7 +1586,7 @@ LONGEST is the length of the longest binding."
     (mastodon-toot--formatted-kbinds-pairs (cddr kbinds-list) longest))
   (reverse mastodon-toot--kbinds-pairs))
 
-(defun mastodon-toot--formatted-kbinds-longest (kbinds-list)
+(defun mastodon-toot--kbinds-longest (kbinds-list)
   "Return the length of the longest item in KBINDS-LIST."
   (let ((lengths (mapcar #'length kbinds-list)))
     (car (sort lengths #'>))))
@@ -1594,19 +1595,20 @@ LONGEST is the length of the longest binding."
 ;;; DISPLAY DOCS
 
 (defun mastodon-toot--make-mode-docs ()
-  "Create formatted documentation text for the `mastodon-toot-mode'."
-  (let* ((kbinds (mastodon-toot--get-mode-kbinds))
-         (longest-kbind (mastodon-toot--formatted-kbinds-longest
-                         (mastodon-toot--format-kbinds kbinds))))
+  "Create formatted documentation text for `mastodon-toot-mode'."
+  (let* ((kbinds (mastodon-toot--get-kbinds))
+         (formatted (mastodon-toot--format-kbinds kbinds))
+         (longest-kbind (mastodon-toot--kbinds-longest
+                         formatted)))
     (concat
-     (mastodon-toot--comment " Compose a new toot here. The following keybindings are available:")
-     (mapconcat #'identity
-                (mastodon-toot--formatted-kbinds-pairs
-                 (mastodon-toot--format-kbinds kbinds)
-                 longest-kbind)
-                nil))))
-
-(defun mastodon-toot--format-reply-in-compose-string (reply-text)
+     (mastodon-toot--comment
+      " Compose a new toot here. The following keybindings are available:")
+     (mapconcat
+      #'identity
+      (mastodon-toot--formatted-kbinds-pairs formatted longest-kbind)
+      nil))))
+
+(defun mastodon-toot--format-reply-in-compose (reply-text)
   "Format a REPLY-TEXT for display in compose buffer docs."
   (let* ((rendered (mastodon-tl--render-text reply-text))
          (no-props (substring-no-properties rendered))
@@ -1662,7 +1664,7 @@ REPLY-TEXT is the text of the toot being replied to."
         "\n"
         (if reply-text
             (propertize
-             (mastodon-toot--format-reply-in-compose-string reply-text)
+             (mastodon-toot--format-reply-in-compose reply-text)
              'toot-reply t)
           "")
         divider)
@@ -1755,16 +1757,13 @@ REPLY-REGION is a string to be injected into the buffer."
       (mastodon-toot--apply-fields-props
        vis-region
        (format "%s"
-               (if (equal
-                    mastodon-toot--visibility
-                    "private")
+               (if (equal "private" mastodon-toot--visibility)
                    "followers-only"
                  mastodon-toot--visibility)))
       (mastodon-toot--apply-fields-props
        lang-region
        (if mastodon-toot--language
-           (format "Lang: %s ⋅"
-                   mastodon-toot--language)
+           (format "Lang: %s ⋅" mastodon-toot--language)
          ""))
       (mastodon-toot--apply-fields-props
        sched-region
@@ -1806,6 +1805,8 @@ REPLY-REGION is a string to be injected into the buffer."
 URLs always = 23, and domain names of handles are not counted.
 This is how mastodon does it.
 CW is the content warning, which contributes to the character count."
+  ;; FIXME: URL chars is avail at /api/v1/instance
+  ;; for masto, it's .statuses.characters_reserved_per_url
   (let* ((url-replacement (make-string 23 ?x))
          (count-str (replace-regexp-in-string ; handle @handles
                      mastodon-toot-handle-regex "\2"
@@ -1854,7 +1855,7 @@ Added to `after-change-functions' in new toot buffers."
   "Prompt for a draft toot and delete it."
   (interactive)
   (if (not (multisession-value mastodon-toot-draft-toots-list))
-      (message "No drafts to delete.")
+      (user-error "No drafts to delete")
     (let ((draft (completing-read
                   "Select draft to delete: "
                   (multisession-value mastodon-toot-draft-toots-list)
-- 
cgit v1.2.3


From 994b4e9a938d17d35462a8da3929fea267563c70 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Tue, 6 Aug 2024 17:53:47 +0200
Subject: re-write all (if x y "") clauses as (when x y), if poss.

we can use when inside concat, but not inside insert, nor in strings/args headed for
format or propertize.
---
 lisp/mastodon-media.el         |  5 ++--
 lisp/mastodon-notifications.el |  9 +++----
 lisp/mastodon-profile.el       | 14 +++++-----
 lisp/mastodon-search.el        |  7 +++--
 lisp/mastodon-tl.el            | 59 +++++++++++++++++++-----------------------
 lisp/mastodon-toot.el          | 10 +++----
 6 files changed, 47 insertions(+), 57 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 9dc8517..8f8937c 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -500,9 +500,8 @@ SENSITIVE is a flag from the item's JSON data."
           (substitute-command-keys
            (concat "\\`RET'/\\`i': load full image (prefix: copy URL), \\`+'/\\`-': zoom,\
  \\`r': rotate, \\`o': save preview"
-                   (if (not (eq sensitive :json-false))
-                       ", \\`S': toggle sensitive media"
-                     ""))))
+                   (when (not (eq sensitive :json-false))
+                     ", \\`S': toggle sensitive media"))))
          (help-echo (if caption
                         (concat help-echo-base
                                 "\n\"" caption "\"")
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index eca520b..070d23f 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -243,11 +243,10 @@ Status notifications are given when
                   (format "You have a follow request from... %s"
                           follower)
                   'face 'default)
-                 (if mastodon-notifications--profile-note-in-foll-reqs
-                     (concat
-                      ":\n"
-                      (mastodon-notifications--comment-note-text body))
-                   ""))))
+                 (when mastodon-notifications--profile-note-in-foll-reqs
+                   (concat
+                    ":\n"
+                    (mastodon-notifications--comment-note-text body))))))
              ((or (eq type 'favourite)
                   (eq type 'boost))
               (mastodon-notifications--comment-note-text body))
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 8249641..0a17a25 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -681,18 +681,16 @@ MAX-ID is a flag to include the max_id pagination parameter."
                        (mastodon-profile--render-roles .roles)))
              "\n"
              (propertize (concat "@" .acct) 'face 'default)
-             (if (eq .locked t)
-                 (concat " " (mastodon-tl--symbol 'locked))
-               "")
+             (when (eq .locked t)
+               (concat " " (mastodon-tl--symbol 'locked)))
              "\n " mastodon-tl--horiz-bar "\n"
              ;; profile note:
              (mastodon-tl--render-text .note account) ; account = tab-stops in profile
              ;; meta fields:
-             (if fields
-                 (concat "\n" (mastodon-tl--set-face
-                               (mastodon-profile--fields-insert fields)
-                               'success))
-               "")
+             (when fields
+               (concat "\n" (mastodon-tl--set-face
+                             (mastodon-profile--fields-insert fields)
+                             'success)))
              "\n"
              ;; Joined date:
              (propertize
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 00681c6..b54e8f3 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -134,7 +134,7 @@ Optionally add string TYPE after HEADING."
   (mastodon-tl--set-face
    (concat "\n " mastodon-tl--horiz-bar "\n "
            (upcase str) " "
-           (if type (upcase type) "") "\n"
+           (when type (upcase type)) "\n"
            " " mastodon-tl--horiz-bar (unless no-newline "\n"))
    'success))
 
@@ -266,9 +266,8 @@ If NOTE is non-nil, include user's profile note. This is also
                   'mastodon-handle (concat "@" (cadr user))
 		  'help-echo (concat "Browse user profile of @" (cadr user)))
       " : \n"
-      (if note
-          (mastodon-tl--render-text (cadddr user) acct)
-        "")
+      (when note
+        (mastodon-tl--render-text (cadddr user) acct))
       "\n")
      'item-json acct))) ; for compat w other processing functions
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 5e56dc3..6607bbd 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -614,11 +614,10 @@ When DOMAIN, force inclusion of user's domain in their handle."
      ;; handle:
      " ("
      (propertize (concat "@" .account.acct
-                         (if domain
-                             (concat "@"
-                                     (url-host
-                                      (url-generic-parse-url .account.url)))
-                           ""))
+                         (when domain
+                           (concat "@"
+                                   (url-host
+                                    (url-generic-parse-url .account.url)))))
                  'face 'mastodon-handle-face
                  'mouse-face 'highlight
 	         'mastodon-tab-stop 'user-handle
@@ -788,26 +787,24 @@ When DOMAIN, force inclusion of user's domain in their handle."
 		          'shr-url app-url
                           'help-echo app-url
 		          'keymap mastodon-tl--shr-map-replacement)))))
-       (if edited-time
-           (concat
-            " "
-            (mastodon-tl--symbol 'edited)
-            " "
-            (propertize
-             (format-time-string mastodon-toot-timestamp-format
-                                 edited-parsed)
-             'face 'font-lock-comment-face
-             'timestamp edited-parsed
-             'display (if mastodon-tl--enable-relative-timestamps
-                          (mastodon-tl--relative-time-description edited-parsed)
-                        edited-parsed)))
-         "")
+       (when edited-time
+         (concat
+          " "
+          (mastodon-tl--symbol 'edited)
+          " "
+          (propertize
+           (format-time-string mastodon-toot-timestamp-format
+                               edited-parsed)
+           'face 'font-lock-comment-face
+           'timestamp edited-parsed
+           'display (if mastodon-tl--enable-relative-timestamps
+                        (mastodon-tl--relative-time-description edited-parsed)
+                      edited-parsed))))
        (propertize (concat "\n  " mastodon-tl--horiz-bar)
                    'face 'default)
-       (if (and mastodon-tl--show-stats
-                (not (member type '("follow" "follow_request"))))
-           (mastodon-tl--toot-stats toot)
-         "")
+       (when (and mastodon-tl--show-stats
+                  (not (member type '("follow" "follow_request"))))
+         (mastodon-tl--toot-stats toot))
        "\n")
       'favourited-p faved
       'boosted-p    boosted
@@ -1149,7 +1146,8 @@ message is a link which unhides/hides the main body."
 ;;; MEDIA
 
 (defun mastodon-tl--media (toot)
-  "Retrieve a media attachment link for TOOT if one exists."
+  "Retrieve a media attachment link for TOOT if one exists.
+Else return an empty string."
   (let* ((media-attachments (mastodon-tl--field 'media_attachments toot))
          (sensitive (mastodon-tl--field 'sensitive toot))
          (media-string (mapconcat
@@ -1291,8 +1289,7 @@ LENGTH is of the longest option, for formatting."
                         (format "%s people | " .voters_count)))
                      (.vote_count
                       (format "%s votes | " .vote_count))
-                     (t
-                      ""))
+                     (t ""))
                'face 'font-lock-comment-face)
               (let ((str (if (eq .expired :json-false)
                              (if (eq .expires_at nil)
@@ -1547,10 +1544,9 @@ NO-BYLINE means just insert toot body, used for folding."
         (concat
          "\n"
          ;; relpy symbol (broken):
-         (if (and after-reply-status-p thread)
-             (concat (mastodon-tl--symbol 'replied)
-                     "\n")
-           "")
+         (when (and after-reply-status-p thread)
+           (concat (mastodon-tl--symbol 'replied)
+                   "\n"))
          ;; actual body:
          (let ((bar (mastodon-tl--symbol 'reply-bar))
                (body (if (and toot-foldable (not unfolded))
@@ -1564,8 +1560,7 @@ NO-BYLINE means just insert toot body, used for folding."
         'toot-body t) ;; includes newlines etc. for folding
        ;; byline:
        "\n"
-       (if no-byline
-           ""
+       (unless no-byline
          (mastodon-tl--byline toot author-byline action-byline
                               detailed-p domain base-toot)))
       'item-type    'toot
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index ae88d68..2232cc8 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1659,11 +1659,10 @@ REPLY-TEXT is the text of the toot being replied to."
         (propertize "None                  "
                     'toot-attachments t)
         "\n"
-        (if reply-text
-            (propertize
-             (mastodon-toot--format-reply-in-compose reply-text)
-             'toot-reply t)
-          "")
+        (when reply-text
+          (propertize
+           (mastodon-toot--format-reply-in-compose reply-text)
+           'toot-reply t))
         divider)
        'face 'mastodon-toot-docs-face
        'read-only "Edit your message below."
@@ -1757,6 +1756,7 @@ REPLY-REGION is a string to be injected into the buffer."
                (if (equal "private" mastodon-toot--visibility)
                    "followers-only"
                  mastodon-toot--visibility)))
+      ;; WHEN clauses don't work here, we need "" as display arg:
       (mastodon-toot--apply-fields-props
        lang-region
        (if mastodon-toot--language
-- 
cgit v1.2.3


From 881ee6ab4133e63c4debc1b6e716d5e4bdb446aa Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Thu, 8 Aug 2024 11:05:05 +0200
Subject: factor out image-trans-check.

---
 lisp/mastodon-media.el |  8 +++-----
 lisp/mastodon-tl.el    | 14 ++++++++------
 lisp/mastodon-toot.el  |  3 +--
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 8c035be..570be02 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -363,15 +363,14 @@ MEDIA-TYPE is a symbol and either `avatar' or `media-link'.
 START is the position where we start loading the image.
 REGION-LENGTH is the range from start to propertize."
   (let ((image-options
-         (when (or (image-type-available-p 'imagemagick)
-                   (image-transforms-p)) ; inbuilt scaling in 27.1
+         (when (mastodon-tl--image-trans-check)
            (cond ((eq media-type 'avatar)
                   `(:height ,mastodon-media--avatar-height))
                  ((eq media-type 'media-link)
                   `(:max-height ,mastodon-media--preview-max-height)))))
         (buffer (current-buffer))
         (marker (copy-marker start))
-	(url-show-status nil)) ; stop url.el from spamming us about connecting
+        (url-show-status nil)) ; stop url.el from spamming us about connecting
     (condition-case nil
         ;; catch errors in url-retrieve to not break our caller
         (if (and mastodon-media--enable-image-caching
@@ -469,8 +468,7 @@ START and END are the beginning and end of the media item to overlay."
   ;; We use just an empty space as the textual representation.
   ;; This is what a user will see on a non-graphical display
   ;; where not showing an avatar at all is preferable.
-  (let ((image-options (when (or (image-type-available-p 'imagemagick)
-                                 (image-transforms-p)) ; inbuilt scaling in 27.1
+  (let ((image-options (when (mastodon-tl--image-trans-check)
                          `(:height ,mastodon-media--avatar-height))))
     (concat
      (propertize " "
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 80c1e42..0c9670b 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -591,9 +591,7 @@ When DOMAIN, force inclusion of user's domain in their handle."
      (when (and avatar ; used by `mastodon-profile--format-user'
                 mastodon-tl--show-avatars
                 mastodon-tl--display-media-p
-                (if (version< emacs-version "27.1")
-                    (image-type-available-p 'imagemagick)
-                  (image-transforms-p)))
+                (mastodon-tl--image-trans-check))
        (mastodon-media--get-avatar-rendering .account.avatar))
      ;; username:
      (propertize (if (not (string-empty-p .account.display_name))
@@ -696,6 +694,12 @@ LETTER is a string, F for favourited, B for boosted, or K for bookmarked."
                         'help-echo (format "You have %s this status."
                                            help-string)))))
 
+(defun mastodon-tl--image-trans-check ()
+  "Call `image-transforms-p', or `image-type-available-p' 'imagemagick."
+  (if (version< emacs-version "27.1")
+      (image-type-available-p 'imagemagick)
+    (image-transforms-p)))
+
 (defun mastodon-tl--byline (toot author-byline action-byline
                                  &optional detailed-p domain base-toot)
   "Generate byline for TOOT.
@@ -748,9 +752,7 @@ When DOMAIN, force inclusion of user's domain in their handle."
      ;; with `mastodon-tl--goto-next-item':
      (when (and mastodon-tl--show-avatars
                 mastodon-tl--display-media-p
-                (if (version< emacs-version "27.1")
-                    (image-type-available-p 'imagemagick)
-                  (image-transforms-p)))
+                (mastodon-tl--image-trans-check))
        (mastodon-media--get-avatar-rendering avatar-url))
      (propertize
       (concat
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 2232cc8..7c5472b 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1329,8 +1329,7 @@ which is used to attach it to a toot when posting."
 (defun mastodon-toot--format-attachments ()
   "Format the attachment previews for display in toot draft buffer."
   (or
-   (let ((image-options (when (or (image-type-available-p 'imagemagick)
-                                  (image-transforms-p))
+   (let ((image-options (when (mastodon-tl--image-trans-check)
                           `(:height ,mastodon-toot--attachment-height))))
      (cl-loop for count from 1
               for att in mastodon-toot--media-attachments
-- 
cgit v1.2.3


From 7eb3e40bab8282b9f20522e466f02d505dca8200 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Tue, 13 Aug 2024 09:32:34 +0200
Subject: intent toot.el

---
 lisp/mastodon-toot.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 7c5472b..5f4116f 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -225,7 +225,7 @@ Takes its form from `window-configuration-to-register'.")
   "The text of the toot being composed.")
 
 (persist-defvar mastodon-toot-draft-toots-list nil
-                "A list of toots that have been saved as drafts.
+  "A list of toots that have been saved as drafts.
 For the moment we just put all composed toots in here, as we want
 to also capture toots that are \"sent\" but that don't successfully
 send.")
-- 
cgit v1.2.3


From beeb8f3b2ebe25e8e3fb92e6f030cec39b818cec Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Thu, 22 Aug 2024 11:06:07 +0200
Subject: eq for symbols, string= for strings

---
 lisp/mastodon-async.el         | 16 +++++++-------
 lisp/mastodon-auth.el          |  4 ++--
 lisp/mastodon-client.el        |  2 +-
 lisp/mastodon-http.el          |  2 +-
 lisp/mastodon-media.el         |  4 ++--
 lisp/mastodon-notifications.el | 40 ++++++++++++++++-----------------
 lisp/mastodon-profile.el       |  8 +++----
 lisp/mastodon-search.el        | 28 +++++++++++------------
 lisp/mastodon-tl.el            | 50 +++++++++++++++++++++---------------------
 lisp/mastodon-toot.el          | 34 ++++++++++++++--------------
 lisp/mastodon-views.el         |  8 +++----
 11 files changed, 98 insertions(+), 98 deletions(-)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 0c70560..317be93 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -88,7 +88,7 @@
     (delete-process (get-buffer-process mastodon-async--http-buffer))
     (kill-buffer mastodon-async--http-buffer)
     (setq mastodon-async--http-buffer "")
-    (when (not (equal "" mastodon-async--queue)) ; error handle on kill async buffer
+    (when (not (string= "" mastodon-async--queue)) ; error handle on kill async buffer
       (kill-buffer mastodon-async--queue))))
 
 (defun mastodon-async--stream-notifications ()
@@ -207,8 +207,8 @@ ENDPOINT is the endpoint for the stream and timeline."
         ;; if user stream, we need "timelines/home" not "timelines/user"
         ;; if notifs, we need "notifications" not "timelines/notifications"
         (endpoint (cond
-                   ((equal name "notifications") "notifications")
-                   ((equal name "home") "timelines/home")
+                   ((string= name "notifications") "notifications")
+                   ((string= name "home") "timelines/home")
                    (t (format "timelines/%s" endpoint)))))
     (mastodon-async--set-local-variables buffer-name http-buffer
                                          buffer-name queue-name)
@@ -218,7 +218,7 @@ ENDPOINT is the endpoint for the stream and timeline."
       (make-local-variable 'mastodon-tl--enable-relative-timestamps)
       (make-local-variable 'mastodon-tl--display-media-p)
       (message (mastodon-http--api endpoint))
-      (if (equal name "notifications")
+      (if (string= name "notifications")
           (mastodon-notifications--timeline
            (mastodon-http--get-json
             (mastodon-http--api "notifications")))
@@ -227,7 +227,7 @@ ENDPOINT is the endpoint for the stream and timeline."
       (mastodon-mode)
       (mastodon-tl--set-buffer-spec buffer-name
                                     endpoint
-                                    (if (equal name "notifications")
+                                    (if (string= name "notifications")
                                         'mastodon-notifications--timeline
                                       'mastodon-tl--timeline))
       (setq-local mastodon-tl--enable-relative-timestamps nil)
@@ -275,7 +275,7 @@ NAME is used for the queue and display buffer."
                          (car split-strings)))
             (data (replace-regexp-in-string
                    "^data: " "" (cadr split-strings))))
-        (when (equal "update" event-type)
+        (when (string= "update" event-type)
           ;; in some casses the data is not fully formed
           ;; for now return nil if malformed using `ignore-errors'
           (ignore-errors (json-read-from-string data)))))))
@@ -289,7 +289,7 @@ NAME is used for the queue and display buffer."
                       (car split-strings)))
          (data (replace-regexp-in-string
                 "^data: " "" (cadr split-strings))))
-    (when (equal "notification" event-type)
+    (when (string= "notification" event-type)
       ;; in some casses the data is not fully formed
       ;; for now return nil if malformed using `ignore-errors'
       (ignore-errors (json-read-from-string data)))))
@@ -324,7 +324,7 @@ NAME is used for the queue and display buffer."
                              mastodon-instance-url "*"))
               (mastodon-notifications--timeline (list toot))
 	    (mastodon-tl--timeline (list toot)))
-          (if (equal previous 1)
+          (if (eq previous 1)
 	      (goto-char 1)
             (goto-char (+ previous (- (point-max) old-max)))))))))
 
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 404dd57..3796b7e 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -173,13 +173,13 @@ When ASK is absent return nil."
 Generate/save token if none known yet."
   (cond (mastodon-auth--token-alist
          ;; user variables are known and initialised.
-         (alist-get mastodon-instance-url mastodon-auth--token-alist nil nil #'equal))
+         (alist-get mastodon-instance-url mastodon-auth--token-alist nil nil #'string=))
         ((plist-get (mastodon-client--active-user) :access_token)
          ;; user variables need to be read from plstore.
          (push (cons mastodon-instance-url
                      (plist-get (mastodon-client--active-user) :access_token))
                mastodon-auth--token-alist)
-         (alist-get mastodon-instance-url mastodon-auth--token-alist nil nil #'equal))
+         (alist-get mastodon-instance-url mastodon-auth--token-alist nil nil #'string=))
         ((null mastodon-active-user)
          ;; user not aware of 2FA-related changes and has not set
          ;; `mastodon-active-user'. Make user aware and error out.
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index 493f9df..6e55829 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -174,7 +174,7 @@ Otherwise return nil."
   (let ((username (mastodon-client--form-user-from-vars))
         (user-details (mastodon-client--general-read "active-user")))
     (when (and user-details
-               (equal (plist-get user-details :username) username))
+               (string= (plist-get user-details :username) username))
       user-details)))
 
 (defun mastodon-client--active-user ()
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 39c1036..fbae8a7 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -365,7 +365,7 @@ item uploaded, and `mastodon-toot--update-status-fields' is run."
                     ;; this is how the mangane akkoma web client does it
                     ;; and it seems easier than the other options!
                     (when (and caption
-                               (not (equal caption (alist-get 'description data))))
+                               (not (string= caption (alist-get 'description data))))
                       (let ((url (mastodon-http--api (format "media/%s" id))))
                         ;; (message "PUTting image description")
                         (mastodon-http--put url desc)))
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 620aa51..2ec498e 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -449,8 +449,8 @@ Replace them with the referenced image."
             (put-text-property start end 'media-state 'loading)
             (mastodon-media--load-image-from-url
              image-url media-type start (- end start))
-            (when (or (equal type "gifv")
-                      (equal type "video"))
+            (when (or (string= type "gifv")
+                      (string= type "video"))
               (mastodon-media--moving-image-overlay start end))))))))
 
 ;; (defvar-local mastodon-media--overlays nil
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 1b93f1b..1c2aad7 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -204,7 +204,7 @@ Status notifications are given when
   ;; FIXME: apply/refactor filtering as per/with `mastodon-tl--toot'
   (let* ((id (alist-get 'id note))
          (profile-note
-          (when (equal 'follow-request type)
+          (when (eq 'follow-request type)
             (let ((str (mastodon-tl--field
                         'note
                         (mastodon-tl--field 'account note))))
@@ -221,15 +221,15 @@ Status notifications are given when
         nil
       (mastodon-tl--insert-status
        ;; toot
-       (cond ((or (equal type 'follow)
-                  (equal type 'follow-request))
+       (cond ((or (eq type 'follow)
+                  (eq type 'follow-request))
               ;; Using reblog with an empty id will mark this as something
               ;; non-boostable/non-favable.
               (cons '(reblog (id . nil)) note))
              ;; reblogs/faves use 'note' to process their own json
              ;; not the toot's. this ensures following etc. work on such notifs
-             ((or (equal type 'favourite)
-                  (equal type 'boost))
+             ((or (eq type 'favourite)
+                  (eq type 'boost))
               note)
              (t
               status))
@@ -239,12 +239,12 @@ Status notifications are given when
                      (mastodon-tl--clean-tabs-and-nl
                       (if (mastodon-tl--has-spoiler status)
                           (mastodon-tl--spoiler status)
-                        (if (equal 'follow-request type)
+                        (if (eq 'follow-request type)
                             (mastodon-tl--render-text profile-note)
                           (mastodon-tl--content status)))))))
          (cond ((or (eq type 'follow)
                     (eq type 'follow-request))
-                (if (equal type 'follow)
+                (if (eq type 'follow)
                     (propertize "Congratulations, you have a new follower!"
                                 'face 'default)
                   (concat
@@ -261,35 +261,35 @@ Status notifications are given when
                 (mastodon-notifications--comment-note-text body))
                (t body)))
        ;; author-byline
-       (if (or (equal type 'follow)
-               (equal type 'follow-request)
-               (equal type 'mention))
+       (if (or (eq type 'follow)
+               (eq type 'follow-request)
+               (eq type 'mention))
            'mastodon-tl--byline-author
          (lambda (_status &rest _args) ; unbreak stuff
            (mastodon-tl--byline-author note)))
        ;; action-byline
        (lambda (_status)
          (mastodon-notifications--byline-concat
-          (cond ((equal type 'boost)
+          (cond ((eq type 'boost)
                  "Boosted")
-                ((equal type 'favourite)
+                ((eq type 'favourite)
                  "Favourited")
-                ((equal type 'follow-request)
+                ((eq type 'follow-request)
                  "Requested to follow")
-                ((equal type 'follow)
+                ((eq type 'follow)
                  "Followed")
-                ((equal type 'mention)
+                ((eq type 'mention)
                  "Mentioned")
-                ((equal type 'status)
+                ((eq type 'status)
                  "Posted")
-                ((equal type 'poll)
+                ((eq type 'poll)
                  "Posted a poll")
-                ((equal type 'edit)
+                ((eq type 'edit)
                  "Edited"))))
        id
        ;; base toot
-       (when (or (equal type 'favourite)
-                 (equal type 'boost))
+       (when (or (eq type 'favourite)
+                 (eq type 'boost))
          status)))))
 
 (defun mastodon-notifications--by-type (note)
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 5f33ce2..6410591 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -592,7 +592,7 @@ FIELDS means provide a fields vector fetched by other means."
   "T if you have any relationship with the accounts in LIST."
   (let (result)
     (dolist (x list result)
-      (when (not (equal :json-false x))
+      (when (not (eq :json-false x))
         (setq result x)))))
 
 (defun mastodon-profile--render-roles (roles)
@@ -735,7 +735,7 @@ MAX-ID is a flag to include the max_id pagination parameter."
           (setq mastodon-tl--update-point (point))
           (mastodon-media--inline-images (point-min) (point))
           ;; insert pinned toots first
-          (when (and pinned (equal endpoint-type "statuses"))
+          (when (and pinned (string= endpoint-type "statuses"))
             (mastodon-profile--insert-statuses-pinned pinned)
             (setq mastodon-tl--update-point (point))) ; updates after pinned toots
           (funcall update-function json))
@@ -767,7 +767,7 @@ MAX-ID is a flag to include the max_id pagination parameter."
   "Return a avatar image from ACCOUNT.
 IMG-TYPE is the JSON key from the account data."
   (let ((img (alist-get img-type account)))
-    (unless (equal img "/avatars/original/missing.png")
+    (unless (string= img "/avatars/original/missing.png")
       (mastodon-media--get-media-link-rendering img))))
 
 (defun mastodon-profile--show-user (user-handle)
@@ -784,7 +784,7 @@ IMG-TYPE is the JSON key from the account data."
                          nil ; predicate
                          'confirm)))))
   (if (not (or ; own profile has no need for item-json test:
-            (equal user-handle (mastodon-auth--get-account-name))
+            (string= user-handle (mastodon-auth--get-account-name))
             (mastodon-tl--profile-buffer-p)
             (mastodon-tl--property 'item-json :no-move)))
       (user-error "Looks like there's no toot or user at point?")
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index f51247b..7fc4de3 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -66,7 +66,7 @@ Returns a nested list containing user handle, display name, and URL."
           (mastodon-http--get-json
            url
            `(("q" . ,query) ;; NB: nil can break params (but works for me)
-             ,(when (equal "following"
+             ,(when (string= "following"
                            mastodon-toot--completion-style-for-mentions)
                 '("following" . "true")))
            :silent)))
@@ -103,7 +103,7 @@ TYPE is a string, either tags, statuses, or links.
 PRINT-FUN is the function used to print the data from the response."
   (let* ((url (mastodon-http--api (format "trends/%s" type)))
          ;; max for statuses = 40, for others = 20
-         (limit (if (equal type "statuses")
+         (limit (if (string= type "statuses")
                     '("limit" . "40")
                   '("limit" . "20")))
          (offset '(("offset" . "0")))
@@ -116,7 +116,7 @@ PRINT-FUN is the function used to print the data from the response."
                                     print-fun nil params)
       (mastodon-search--insert-heading "trending" type)
       (funcall print-fun data)
-      (unless (equal type "statuses")
+      (unless (string= type "statuses")
         (goto-char (point-min))))))
 
 ;; functions for mastodon search
@@ -153,10 +153,10 @@ is used for pagination."
   ;; TODO: handle no results
   (interactive "sSearch mastodon for: ")
   (let* ((url (mastodon-http--api-v2 "search"))
-         (following (when (or following (equal current-prefix-arg '(4)))
+         (following (when (or following (eq current-prefix-arg '(4)))
                       "true"))
          (type (or type
-                   (if (equal current-prefix-arg '(4))
+                   (if (eq current-prefix-arg '(4))
                        "accounts" ; if FOLLOWING, must be "accounts"
                      (completing-read "Search type: "
                                       mastodon-search-types nil :match))))
@@ -175,15 +175,15 @@ is used for pagination."
     (with-mastodon-buffer buffer #'mastodon-mode nil
       (mastodon-search-mode)
       (mastodon-search--insert-heading type)
-      (cond ((equal type "accounts")
+      (cond ((string= type "accounts")
              (mastodon-search--render-response items type buffer params
                                                'mastodon-views--insert-users-propertized-note
                                                'mastodon-views--insert-users-propertized-note))
-            ((equal type "hashtags")
+            ((string= type "hashtags")
              (mastodon-search--render-response items type buffer params
                                                'mastodon-search--print-tags
                                                'mastodon-search--print-tags))
-            ((equal type "statuses")
+            ((string= type "statuses")
              (mastodon-search--render-response items type buffer params
                                                #'mastodon-tl--timeline
                                                #'mastodon-tl--timeline)))
@@ -213,19 +213,19 @@ BUFFER, PARAMS, and UPDATE-FUN are for `mastodon-tl--buffer-spec'."
   "Return search buffer type, a member of `mastodon-search-types'."
   ;; called in `mastodon-tl--get-buffer-type'
   (let* ((spec (mastodon-tl--buffer-property 'update-params)))
-    (alist-get "type" spec nil nil #'equal)))
+    (alist-get "type" spec nil nil #'string=)))
 
 (defun mastodon-search--query-cycle ()
   "Cycle through search types: accounts, hashtags, and statuses."
   (interactive)
   (let* ((spec (mastodon-tl--buffer-property 'update-params))
-         (type (alist-get "type" spec nil nil #'equal))
-         (query (alist-get "q" spec nil nil #'equal)))
-    (cond ((equal type "hashtags")
+         (type (alist-get "type" spec nil nil #'string=))
+         (query (alist-get "q" spec nil nil #'string=)))
+    (cond ((string= type "hashtags")
            (mastodon-search--query query "accounts"))
-          ((equal type "accounts")
+          ((string= type "accounts")
            (mastodon-search--query query "statuses"))
-          ((equal type "statuses")
+          ((string= type "statuses")
            (mastodon-search--query query "hashtags")))))
 
 (defun mastodon-search--query-accounts-followed (query)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 2c1ef43..f400cc1 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -574,7 +574,7 @@ Do so if type of status at poins is not follow_request/follow."
   (let ((type (alist-get 'type
                          (mastodon-tl--property 'item-json :no-move)))
         (echo (mastodon-tl--property 'help-echo :no-move)))
-    (when (not (equal "" echo)) ; not for followers/following in profile
+    (when (not (string= "" echo)) ; not for followers/following in profile
       (unless (or (string= type "follow_request")
                   (string= type "follow")) ; no counts for these
         (message "%s" echo)))))
@@ -682,11 +682,11 @@ The result is added as an attachments property to author-byline."
 (defun mastodon-tl--format-faved-or-boosted-byline (letter)
   "Format the byline marker for a boosted or favourited status.
 LETTER is a string, F for favourited, B for boosted, or K for bookmarked."
-  (let ((help-string (cond ((equal letter "F")
+  (let ((help-string (cond ((string= letter "F")
                             "favourited")
-                           ((equal letter "B")
+                           ((string= letter "B")
                             "boosted")
-                           ((equal letter (or "🔖" "K"))
+                           ((string= letter (or "🔖" "K"))
                             "bookmarked"))))
     (format "(%s) "
             (propertize letter 'face 'mastodon-boost-fave-face
@@ -761,10 +761,10 @@ BASE-TOOT is JSON for the base toot, if any."
        ;; in `mastodon-tl--byline-author'
        (funcall author-byline toot nil domain)
        ;; visibility:
-       (cond ((equal visibility "direct")
+       (cond ((string= visibility "direct")
               (propertize (concat " " (mastodon-tl--symbol 'direct))
                           'help-echo visibility))
-             ((equal visibility "private")
+             ((string= visibility "private")
               (propertize (concat " " (mastodon-tl--symbol 'private))
                           'help-echo visibility)))
        ;;action byline:
@@ -1097,11 +1097,11 @@ content should be hidden."
         (user-error "Not in a thread")
       (save-excursion
         (goto-char (point-min))
-        (while (not (equal "No more items" ; improve this hack test!
+        (while (not (string= "No more items" ; improve this hack test!
                            (mastodon-tl--goto-next-item :no-refresh)))
           (let* ((json (mastodon-tl--property 'item-json :no-move))
                  (cw (alist-get 'spoiler_text json)))
-            (when (not (equal "" cw))
+            (when (not (string= "" cw))
               (mastodon-tl--toggle-spoiler-text-in-toot))))))))
 
 (defun mastodon-tl--spoiler (toot &optional filter)
@@ -1439,8 +1439,8 @@ EVENT is a mouse-click arg."
   "T if mastodon-media-type prop is \"gifv\" or \"video\".
 TYPE is a mastodon media type."
   (let ((type (or type (mastodon-tl--property 'mastodon-media-type :no-move))))
-    (or (equal type "gifv")
-        (equal type "video"))))
+    (or (string= type "gifv")
+        (string= type "video"))))
 
 (defun mastodon-tl--mpv-play-video-at-point (&optional url type)
   "Play the video or gif at point with an mpv process.
@@ -1767,13 +1767,13 @@ To disable showing the stats, customize
            (replies (format "%s %s" .replies_count (mastodon-tl--symbol 'reply)))
            (stats (concat
                    (propertize faves
-                               'favourited-p (eq 't .favourited)
+                               'favourited-p (eq t .favourited)
                                'favourites-field t
                                'help-echo (format "%s favourites" .favourites_count)
                                'face 'font-lock-comment-face)
                    (propertize " | " 'face 'font-lock-comment-face)
                    (propertize boosts
-                               'boosted-p (eq 't .reblogged)
+                               'boosted-p (eq t .reblogged)
                                'boosts-field t
                                'help-echo (format "%s boosts" .reblogs_count)
                                'face 'font-lock-comment-face)
@@ -1929,11 +1929,11 @@ call this function after it is set or use something else."
            'preferences)
           ;; search
           ((mastodon-tl--search-buffer-p)
-           (cond ((equal "accounts" (mastodon-search--buf-type))
+           (cond ((string= "accounts" (mastodon-search--buf-type))
                   'search-accounts)
-                 ((equal "hashtags" (mastodon-search--buf-type))
+                 ((string= "hashtags" (mastodon-search--buf-type))
                   'search-hashtags)
-                 ((equal "statuses" (mastodon-search--buf-type))
+                 ((string= "statuses" (mastodon-search--buf-type))
                   'search-statuses)))
           ;; trends
           ((mastodon-tl--endpoint-str-= "trends/statuses")
@@ -1993,7 +1993,7 @@ We hide replies if user explictly set the
 timeline."
   (and (mastodon-tl--timeline-proper-p) ; Only if we are in a proper timeline
        (or mastodon-tl--hide-replies ; User configured to hide replies
-           (equal '(4) prefix)))) ; Timeline called with C-u prefix
+           (eq '(4) prefix)))) ; Timeline called with C-u prefix
 
 
 ;;; UTILITIES
@@ -2107,7 +2107,7 @@ ID is that of the toot to view."
   (let* ((buffer (format "*mastodon-toot-%s*" id))
          (toot (mastodon-http--get-json
                 (mastodon-http--api (concat "statuses/" id)))))
-    (if (equal (caar toot) 'error)
+    (if (eq (caar toot) 'error)
         (user-error "Error: %s" (cdar toot))
       (with-mastodon-buffer buffer #'mastodon-mode nil
         (mastodon-tl--set-buffer-spec buffer (format "statuses/%s" id)
@@ -2152,7 +2152,7 @@ view all branches of a thread."
                      (mastodon-http--api (concat "statuses/" id))
                      nil :silent))
               (context (mastodon-http--get-json url nil :silent)))
-         (if (equal (caar toot) 'error)
+         (if (eq (caar toot) 'error)
              (user-error "Error: %s" (cdar toot))
            (when (member (alist-get 'type toot) '("reblog" "favourite"))
              (setq toot (alist-get 'status toot)))
@@ -2291,7 +2291,7 @@ desired language if they are not marked as such (or as anything)."
   (interactive (list (mastodon-tl--user-handles-get "filter by language")))
   (let ((langs (mastodon-tl--read-filter-langs)))
     (mastodon-tl--do-if-item
-     (if (equal "" (cdar langs))
+     (if (string= "" (cdar langs))
          (mastodon-tl--unfilter-user-languages user-handle)
        (mastodon-tl--follow-user user-handle nil langs)))))
 
@@ -2465,7 +2465,7 @@ ARGS is an alist of any parameters to send with the request."
                      (mastodon-http--process-json))))
          ;; TODO: when > if, with failure msg
          (cond ((string= notify "true")
-                (when (eq 't (alist-get 'notifying json))
+                (when (eq t (alist-get 'notifying json))
                   (message "Receiving notifications for user %s (@%s)!"
                            name user-handle)))
                ((string= notify "false")
@@ -2473,7 +2473,7 @@ ARGS is an alist of any parameters to send with the request."
                   (message "Not receiving notifications for user %s (@%s)!"
                            name user-handle)))
                ((string= reblogs "true")
-                (when (eq 't (alist-get 'showing_reblogs json))
+                (when (eq t (alist-get 'showing_reblogs json))
                   (message "Receiving boosts by user %s (@%s)!"
                            name user-handle)))
                ((string= reblogs "false")
@@ -2483,14 +2483,14 @@ ARGS is an alist of any parameters to send with the request."
                ((or (string= action "mute")
                     (string= action "unmute"))
                 (message "User %s (@%s) %sd!" name user-handle action))
-               ((equal args "languages[]")
+               ((string= args "languages[]")
                 (message "User %s language filters removed!" name))
-               ((assoc "languages[]" args #'equal)
+               ((assoc "languages[]" args #'string=)
                 (message "User %s filtered by language(s): %s" name
                          (mapconcat #'cdr args " ")))
                ((and (eq notify nil)
                      (eq reblogs nil))
-                (if (and (equal action "follow")
+                (if (and (string= action "follow")
                          (eq t (alist-get 'requested json)))
                     (message "Follow requested for user %s (@%s)!" name user-handle)
                   (message "User %s (@%s) %sed!" name user-handle action)))))))))
@@ -3092,7 +3092,7 @@ JSON and http headers, without it just the JSON."
            ;; so as a fallback, load trending statuses:
            ;; FIXME: this could possibly be a fallback for all timelines not
            ;; just home?
-           (when (equal endpoint "timelines/home")
+           (when (string= endpoint "timelines/home")
              (mastodon-search--trending-statuses)))
           ((eq (caar json) 'error)
            (user-error "Looks like the server bugged out: \"%s\"" (cdar json)))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 5f4116f..762c313 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -284,7 +284,7 @@ data about the item boosted or favourited."
 Includes boosts, and notifications that display toots.
 This macro makes the local variable ID available."
   (declare (debug t))
-  `(if (not (equal 'toot (mastodon-tl--property 'item-type :no-move)))
+  `(if (not (eq 'toot (mastodon-tl--property 'item-type :no-move)))
        (user-error "Looks like there's no toot at point?")
      (mastodon-tl--with-toot-helper
       (lambda (id)
@@ -409,12 +409,12 @@ ACTION is a symbol, either `favourite' or `boost.'"
       ;; there's nothing wrong with faving/boosting own toots
       ;; & nothing wrong with faving/boosting own toots from notifs,
       ;; it boosts/faves the base toot, not the notif status
-      ((or (equal n-type "follow")
-           (equal n-type "follow_request"))
+      ((or (string= n-type "follow")
+           (string= n-type "follow_request"))
        (user-error "Can't %s %s notifications" action n-type))
       ((and boost-p
-            (or (equal vis "direct")
-                (equal vis "private")))
+            (or (string= vis "direct")
+                (string= vis "private")))
        (user-error "Can't boost posts with visibility: %s" vis))
       (t
        (let* ((boosted (when byline-region
@@ -491,8 +491,8 @@ SUBTRACT means we are un-favouriting or unboosting, so we decrement."
           (bookmarked-p (when byline-region
                           (get-text-property (car byline-region) 'bookmarked-p)))
           (action (if bookmarked-p "unbookmark" "bookmark")))
-     (cond ((or (equal n-type "follow")
-                (equal n-type "follow_request"))
+     (cond ((or (string= n-type "follow")
+                (string= n-type "follow_request"))
             (user-error "Can't bookmark %s notifications" n-type))
            ((not byline-region)
             (user-error "Nothing to %s here?!?" action))
@@ -595,8 +595,8 @@ Uses `lingva.el'."
   ;; this check needs to allow acting on own toots displayed as boosts, so we
   ;; call `mastodon-tl--toot-or-base'.
   (let ((json (mastodon-tl--toot-or-base toot)))
-    (equal (alist-get 'acct (alist-get 'account json))
-           (mastodon-auth--user-acct))))
+    (string= (alist-get 'acct (alist-get 'account json))
+             (mastodon-auth--user-acct))))
 
 (defun mastodon-toot--pin-toot-toggle ()
   "Pin or unpin user's toot at point."
@@ -717,7 +717,7 @@ CANCEL means the toot was not sent, so we save the toot text as a draft."
     (unless (eq mastodon-toot-current-toot-text nil)
       (when cancel
         (cl-pushnew mastodon-toot-current-toot-text
-                    mastodon-toot-draft-toots-list :test 'equal)))
+                    mastodon-toot-draft-toots-list :test #'string=)))
     ;; prevent some weird bug when cancelling a non-empty toot:
     (delete #'mastodon-toot--save-toot-text after-change-functions)
     (quit-window 'kill)
@@ -931,7 +931,7 @@ instance to edit a toot."
                 ;; (we don't reload in every case as it can be slow and we may
                 ;; lose our place in a timeline.)
                 (when (or edit-id
-                          (equal 'thread (mastodon-tl--get-buffer-type)))
+                          (eq 'thread (mastodon-tl--get-buffer-type)))
                   (let ((pos (marker-position (cadr prev-window-config))))
                     (mastodon-tl--reload-timeline-or-profile pos))))))))))
 
@@ -1175,7 +1175,7 @@ prefixed by >."
                                 (alist-get 'account toot))))
           (mentions
            (cond ((and booster ;; different booster, user and mentions:
-                       (and (not (equal user booster))
+                       (and (not (string= user booster))
                             (not (member booster mentions))))
 	          (mastodon-toot--mentions-to-string
                    (append (list user booster) mentions nil)))
@@ -1228,7 +1228,7 @@ Return its two letter ISO 639 1 code."
   (let* ((choice (completing-read "Language for this toot: "
                                   mastodon-iso-639-1)))
     (setq mastodon-toot--language
-          (alist-get choice mastodon-iso-639-1 nil nil 'equal))
+          (alist-get choice mastodon-iso-639-1 nil nil #'string=))
     (message "Language set to %s" choice)
     (mastodon-toot--update-status-fields)))
 
@@ -1419,7 +1419,7 @@ Return a cons of a human readable string, and a seconds-from-now string."
   (let* ((options (mastodon-toot--poll-expiry-options-alist))
          (response (completing-read "poll ends in [or enter seconds]: "
                                     options nil 'confirm)))
-    (or (assoc response options #'equal)
+    (or (assoc response options #'string=)
         (if (< (string-to-number response) 600)
             (car options))))) ;; min 5 mins
 
@@ -1718,7 +1718,7 @@ REPLY-REGION is a string to be injected into the buffer."
                 (mastodon-toot--render-reply-region-str reply-region)
                 "\n"))
       (setq mastodon-toot--reply-to-id reply-to-id)
-      (unless (equal mastodon-toot--visibility reply-visibility)
+      (unless (string= mastodon-toot--visibility reply-visibility)
         (setq mastodon-toot--visibility reply-visibility))
       (mastodon-toot--set-cw reply-cw))))
 
@@ -1752,7 +1752,7 @@ REPLY-REGION is a string to be injected into the buffer."
       (mastodon-toot--apply-fields-props
        vis-region
        (format "%s"
-               (if (equal "private" mastodon-toot--visibility)
+               (if (string= "private" mastodon-toot--visibility)
                    "followers-only"
                  mastodon-toot--visibility)))
       ;; WHEN clauses don't work here, we need "" as display arg:
@@ -1783,7 +1783,7 @@ REPLY-REGION is a string to be injected into the buffer."
       (mastodon-toot--apply-fields-props
        cw-region
        (if (and mastodon-toot--content-warning
-                (not (equal "" mastodon-toot--content-warning)))
+                (not (string= "" mastodon-toot--content-warning)))
            (format "CW: %s" mastodon-toot--content-warning)
          "  ") ;; hold the blank space
        'mastodon-cw-face))))
diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el
index ef91bd0..989a614 100644
--- a/lisp/mastodon-views.el
+++ b/lisp/mastodon-views.el
@@ -766,7 +766,7 @@ When t, whole words means only match whole words."
                          "false"))
            (params `(("keyword" . ,updated)
                      ("whole_word" . ,whole-word)))
-           (id (cdr (assoc choice alist #'equal)))
+           (id (cdr (assoc choice alist #'string=)))
            (url (mastodon-http--api-v2 (format "filters/keywords/%s" id)))
            (resp (mastodon-http--put url params)))
       (mastodon-views--filters-triage resp
@@ -807,7 +807,7 @@ When t, whole words means only match whole words."
                            (mastodon-tl--property 'item-json :no-move)))
            (alist (mastodon-tl--map-alist-vals-to-alist 'keyword 'id kws))
            (choice (completing-read "Remove keyword: " alist))
-           (id (cdr (assoc choice alist #'equal)))
+           (id (cdr (assoc choice alist #'string=)))
            (url (mastodon-http--api-v2 (format "filters/keywords/%s" id)))
            (resp (mastodon-http--delete url)))
       (mastodon-views--filters-triage resp (format "Keyword %s removed!" choice)))))
@@ -1022,9 +1022,9 @@ IND is the optional indentation level to print at."
           (mastodon-views--print-json-keys
            (cdr el) (if ind (+ ind 4) 4)))
          (t ; basic handling of raw booleans:
-          (let ((val (cond ((equal (cdr el) :json-false)
+          (let ((val (cond ((eq (cdr el) :json-false)
                             "no")
-                           ((equal (cdr el) 't)
+                           ((eq (cdr el) t)
                             "yes")
                            (t
                             (cdr el)))))
-- 
cgit v1.2.3


From 9d3a301dc8f80fdf2c07d32d2c3e416b560a33f4 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Sat, 24 Aug 2024 21:00:23 +0200
Subject: autoload image-trans-check. FIX #584.

---
 lisp/mastodon-toot.el | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lisp/mastodon-toot.el')

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 762c313..832d03f 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -99,6 +99,7 @@
 (autoload 'mastodon-tl--human-duration "mastodon-tl")
 (autoload 'mastodon-profile--get-preferences-pref "mastodon-profile")
 (autoload 'mastodon-views--get-own-instance "mastodon-views")
+(autoload 'mastodon-tl--image-trans-check "mastodon-tl")
 
 ;; for mastodon-toot--translate-toot-text
 (autoload 'mastodon-tl--content "mastodon-tl")
-- 
cgit v1.2.3