From db26f1b4bc8a62e472ed7c7191a67ddbc2c65c69 Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Tue, 1 Jun 2021 14:20:28 +0200
Subject: add basic live updates of home/local/federated timelines.

the code, mastodon-async.el is taken from https://github.com/alexjgriffith/mastodon-future.el and only
slightly modified to make the home stream work.
---
 lisp/mastodon-async.el | 332 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 332 insertions(+)
 create mode 100644 lisp/mastodon-async.el

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
new file mode 100644
index 0000000..ffd8ab6
--- /dev/null
+++ b/lisp/mastodon-async.el
@@ -0,0 +1,332 @@
+;;; mastodon-async.el --- Client for Mastodon -*- lexical-binding: t -*-
+
+;; Copyright (C) 2017 Johnson Denen
+;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Version: 0.7.1
+;; Package-Requires: ((emacs "25.1"))
+;; Homepage: https://github.com/jdenen/mastodon.el
+
+;; This file is not part of GNU Emacs.
+
+;; This file is part of mastodon.el.
+
+;; mastodon.el is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; mastodon.el is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with mastodon.el.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Rework sync code so it does not mess up the async-buffer
+
+;;; Code:
+
+(require 'json)
+
+(defgroup mastodon-async nil
+  "An async module for mastodon streams."
+  :prefix "mastodon-async-"
+  :group 'external)
+
+;;;###autoload
+(define-minor-mode mastodon-async-mode
+  "Async Mastodon."
+  :lighter " MasA")
+
+(defvar mastodon-instance-url)
+
+(defvar mastodon-tl--enable-relative-timestamps)
+(defvar mastodon-tl--display-media-p)
+(defvar mastodon-tl--buffer-spec)
+
+(make-variable-buffer-local
+ (defvar mastodon-async--queue "" ;;"*mastodon-async-queue*"
+   "The intermediate queue buffer name."))
+
+(make-variable-buffer-local
+ (defvar mastodon-async--buffer "" ;;"*mastodon-async-buffer*"
+   "User facing output buffer name."))
+
+(make-variable-buffer-local
+ (defvar mastodon-async--http-buffer "" ;;""
+   "Buffer variable bound to http output."))
+
+(defun mastodon-async--display-http ()
+  "Display the async HTTP input buffer."
+  (display-buffer mastodon-async--http-buffer))
+
+(defun mastodon-async--display-buffer ()
+  "Display the async user facing buffer."
+  (interactive)
+  (display-buffer mastodon-async--buffer))
+
+(defun mastodon-async--display-queue ()
+  "Display the async queue buffer."
+  (display-buffer mastodon-async--queue))
+
+(defun mastodon-async--stop-http ()
+  "Stop the http processs and close the async and http buffer."
+  (interactive)
+  (let ((inhibit-read-only t))
+    (stop-process (get-buffer-process mastodon-async--http-buffer))
+    (delete-process (get-buffer-process mastodon-async--http-buffer))
+    (kill-buffer mastodon-async--http-buffer)
+    (setq mastodon-async--http-buffer "")
+    (kill-buffer mastodon-async--queue)))
+
+;; Need to handle the notification event
+;; The output can be passed to notifications
+;; need an alternate process-queue-string function
+(defun mastodon-async--stream-notifications ()
+  "Open a stream of Home."
+  (interactive)
+  (mastodon-async--mastodon
+   "user"
+   "home"
+   "notifications"
+   'mastodon-async--process-queue-string))
+
+;; this will stream both home AND notifications.
+;; need to workout how to filter "user" stream
+;; and split it
+(defun mastodon-async--stream-home ()
+  "Open a stream of Home."
+  (interactive)
+  (mastodon-async--mastodon
+   "user"
+   "home"
+   "home"
+   'mastodon-async--process-queue-string))
+
+(defun mastodon-async--stream-federated ()
+  "Open a stream of Federated."
+  (interactive)
+  (mastodon-async--mastodon
+   "public"
+   "public"
+   "federated"
+   'mastodon-async--process-queue-string))
+
+(defun mastodon-async--stream-local ()
+  "Open a stream of Local."
+  (interactive)
+  ;; Need to add another layer of filtering for this to work
+  ;; apparently it the local flag does not work
+  (mastodon-async--mastodon
+   "public"
+   "local" ;"public?local=true"
+   "local"
+   'mastodon-async--process-queue-local-string))
+
+(defun mastodon-async--mastodon (endpoint timeline name filter)
+  "Make sure that the previous async process has been closed.
+
+Then Start an async mastodon stream at ENDPOINT filtering toots
+using FILTER.
+Argument TIMELINE a specific target, such as federated or home.
+Argument NAME the center portion of the buffer name for *mastodon-async-buffer and *mastodon-async-queueu."
+  (let ((buffer (mastodon-async--start-process
+                 endpoint filter name)))
+    (with-current-buffer buffer
+      (mastodon-async--display-buffer)
+      (goto-char (point-max))
+      (goto-char 1))))
+
+(defun mastodon-async--get (url callback)
+  "An async get targeted at URL with a CALLBACK."
+  (let ((url-request-method "GET")
+        (url-request-extra-headers
+         `(("Authorization" .
+            ,(concat
+              "Bearer "
+              (mastodon-auth--access-token))))))
+    (url-retrieve url callback)))
+
+(defun mastodon-async--set-http-buffer (buffer http-buffer)
+  "Initializes for BUFFER a local variable `mastodon-async--http-buffer'.
+
+HTTP-BUFFER is the initializing value. Use this funcion if HTTP-BUFFER
+is not known when `mastodon-async--setup-buffer' is called."  
+  (with-current-buffer (get-buffer-create buffer)
+    (setq mastodon-async--http-buffer http-buffer)))
+
+(defun mastodon-async--set-local-variables (buffer
+                                            http-buffer
+                                            buffer-name
+                                            queue-name)
+  (with-current-buffer (get-buffer-create buffer)
+    (let ((value mastodon-instance-url))
+      (make-local-variable 'mastodon-instance-url)
+      (setq-local mastodon-instance-url value))
+    (setq mastodon-async--http-buffer http-buffer)
+    (setq mastodon-async--buffer buffer-name)
+    (setq mastodon-async--queue queue-name)))
+
+(defun mastodon-async--setup-http (http-buffer name)
+  "Adds local variables to HTTP-BUFFER.
+
+NAME is used to generate the display buffer and the queue."
+  (let ((queue-name(concat " *mastodon-async-queue-" name "-"
+                           mastodon-instance-url "*"))
+        (buffer-name(concat "*mastodon-async-display-" name "-"
+                            mastodon-instance-url "*")))
+    (mastodon-async--set-local-variables http-buffer http-buffer
+                                         buffer-name queue-name)))
+
+(defun mastodon-async--setup-queue (http-buffer name)
+  "Sets up the buffer for the async queue."
+  (let ((queue-name(concat " *mastodon-async-queue-" name "-"
+                           mastodon-instance-url "*"))
+        (buffer-name(concat "*mastodon-async-display-" name "-"
+                            mastodon-instance-url "*")))
+    (mastodon-async--set-local-variables queue-name http-buffer
+                                         buffer-name queue-name)
+    queue-name))
+
+(defun mastodon-async--setup-buffer (http-buffer name endpoint)
+  "Sets up the buffer timeline like `mastodon-tl--init'.
+
+HTTP-BUFFER the name of the http-buffer, if unknow set to 
+NAME is the given name of the stream, like local for public?local
+ENPOINT is the specific endpoint for a stream and timeline"  
+  (let ((queue-name (concat " *mastodon-async-queue-" name "-"
+                            mastodon-instance-url "*"))
+        (buffer-name (concat "*mastodon-async-display-" name "-"
+                             mastodon-instance-url "*"))
+       ;; if user stream, we need "timelines/home" not "timelines/user"
+        (endpoint (if (equal endpoint "user") "home" endpoint)))
+    (mastodon-async--set-local-variables buffer-name http-buffer
+                                         buffer-name queue-name)
+    ;; Similar to timeline init. 
+    (with-current-buffer (get-buffer-create buffer-name)
+      (setq inhibit-read-only t) ; for home timeline?
+      (make-local-variable 'mastodon-tl--enable-relative-timestamps)
+      (make-local-variable 'mastodon-tl--display-media-p)
+      (message (mastodon-http--api (format "timelines/%s" endpoint)))
+      (mastodon-tl--timeline (mastodon-http--get-json
+                              (mastodon-http--api
+                               (format "timelines/%s" endpoint))))
+      (mastodon-mode)
+      (setq mastodon-tl--buffer-spec
+            `(buffer-name ,buffer-name
+                          endpoint ,(format "timelines/%s" endpoint)
+                          update-function
+                          ,'mastodon-tl--timeline))
+      (setq-local mastodon-tl--enable-relative-timestamps nil)
+      (setq-local mastodon-tl--display-media-p t)
+      (current-buffer))))
+
+(defun mastodon-async--start-process (endpoint filter &optional name)
+  "Start an async mastodon stream at ENDPOINT.
+Filter the toots using FILTER."  
+  (let* ((stream (concat "streaming/" endpoint))
+         (async-queue (mastodon-async--setup-queue "" (or name stream)))
+         (async-buffer (mastodon-async--setup-buffer "" (or name stream) endpoint))
+         (http-buffer (mastodon-async--get
+                       (mastodon-http--api stream)
+                       (lambda (status) (message "HTTP SOURCE CLOSED")))))
+    (mastodon-async--setup-http  http-buffer (or name stream))
+    (mastodon-async--set-http-buffer async-buffer http-buffer)
+    (mastodon-async--set-http-buffer async-queue http-buffer)        
+    (set-process-filter (get-buffer-process http-buffer)
+                        (mastodon-async--http-hook filter))
+    http-buffer))
+
+(defun mastodon-async--http-hook (filter)
+  "Return a lambda with a custom FILTER for processing toots."
+  (let ((filter filter))
+    (lambda (proc data)
+      (with-current-buffer (process-buffer proc)
+        (let* ((string
+                (mastodon-async--stream-filter
+                 (mastodon-async--http-layer proc data)))
+               (queue-string (mastodon-async--cycle-queue string)))
+          (when queue-string
+            (mastodon-async--output-toot
+             (funcall filter queue-string))))))))
+
+(defun mastodon-async--process-queue-string (string)
+  "Parse the output STRING of the queue buffer."
+  (let* ((split-strings (split-string string "\n" t))
+         (event-type (replace-regexp-in-string
+                     "^event: " ""
+                     (car split-strings)))
+         (data (replace-regexp-in-string
+                "^data: " "" (cadr split-strings))))
+    (when (equal "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)))))
+
+(defun mastodon-async--process-queue-local-string (string)
+  "Use STRING to limit the public endpoint to displaying local steams only."
+  (let ((json (mastodon-async--process-queue-string string)))
+    (when json
+      (when (mastodon-async--account-local-p json)
+        json))))
+
+(defun mastodon-async--account-local-p (json)
+  "Test JSON to see if account is local."
+  (not (string-match-p
+       "@"
+       (cdr (assoc 'acct (cdr (assoc 'account json)))))))
+
+(defun mastodon-async--output-toot (toot)
+  "Process TOOT and prepend it to the async user facing buffer."
+  (if (not(bufferp (get-buffer mastodon-async--buffer)))
+      (mastodon-async--stop-http)
+    (when toot
+      (with-current-buffer mastodon-async--buffer
+        (let* ((inhibit-read-only t)
+               (old-max (point-max))
+               (previous (point))
+               (mastodon-tl--enable-relative-timestamps t)
+               (mastodon-tl--display-media-p t))
+	  (goto-char (point-min))          
+	  (mastodon-tl--timeline (list toot))
+          (if (equal previous 1)
+	      (goto-char 1)
+            (goto-char (+ previous (- (point-max) old-max)))))))))
+
+(defun mastodon-async--cycle-queue (string)
+  "Append the most recent STRING from http buffer to queue buffer.
+
+Then determine if a full message has been recived.  If so return it.
+Full messages are seperated by two newlines"
+  (with-current-buffer mastodon-async--queue
+    (goto-char (max-char))
+    (insert (decode-coding-string string 'utf-8))
+    (goto-char 0)
+    (let((next(re-search-forward "\n\n" nil t)))
+      (when next
+        (let ((return-string (buffer-substring 1 next))
+              (inhibit-read-only t))
+          (delete-region 1 next)
+          return-string)))))
+
+(defun mastodon-async--http-layer (proc data)
+  "Passes PROC and DATA to ‘url-http-generic-filter’.
+
+It then processes its output."
+  (with-current-buffer (process-buffer proc)
+    (let ((start (max 1 ( - (point-max) 2))))
+      (url-http-generic-filter proc data)
+      (when (> url-http-end-of-headers start)
+        (setq start url-http-end-of-headers))
+      (let ((end (- (point-max) 2)))
+        (buffer-substring start end)))))
+
+(defun mastodon-async--stream-filter (string)
+  "Remove comments from STRING."
+  (replace-regexp-in-string  "^:.*\n" "" string))
+
+(provide 'mastodon-async)
+;;; mastodon-async.el ends here
-- 
cgit v1.2.3


From 9f532060927265717b7c71f5b77f6c650e72a34d Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Thu, 3 Jun 2021 10:02:57 +0200
Subject: enable async stream for user notifications.

creates a notifications filter for the 'user' stream, then handles display of notifications, which have their own timeline funs.
---
 README.org                     | 13 +++++--
 lisp/mastodon-async.el         | 83 ++++++++++++++++++++++++++++--------------
 lisp/mastodon-notifications.el |  6 +--
 lisp/mastodon.el               |  5 +++
 4 files changed, 73 insertions(+), 34 deletions(-)

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

diff --git a/README.org b/README.org
index b51644b..6da0f4b 100644
--- a/README.org
+++ b/README.org
@@ -9,8 +9,8 @@ It adds the following features:
 |                   | display relationship (follows you/followed by you) on profiles                     |
 |                   | display toots/follows/followers counts on profiles                                 |
 |                   | links and tags in profiles are tab stops like in posts                             |
-| =R=, =a=, =r=           | view/accept/reject follow requests                                    |
-| =v=                 | view your favorited toots                                              |
+| =R=, =a=, =r=           | view/accept/reject follow requests                                                 |
+| =v=                 | view your favorited toots                                                          |
 | =i=                 | (un)pin toots, display pinned toots on profiles                                    |
 | =S-C-P=             | jump to your profile                                                               |
 | Timelines:        |                                                                                    |
@@ -33,7 +33,13 @@ The minimum Emacs version is now 25.1. But if you are running an older version i
 
 I did this for my own use and to learn more Elisp. If the code is terrible, feel free to improve or replace it. It surely still contains errors, I'm only weeding them out as I find them.
 
-** NB: dependency:
+** live-updating timelines
+
+(code adapted from https://github.com/alexjgriffith/mastodon-future.el).
+
+Works for federated, local, and home timelines and for notifications. It's pretty necro, so use at your own risk. Not a super high priority for me, but some people dig it. The command prefix is =mastodon-async--stream=
+
+** NB: dependency
 
 This version depends on the library =request= (for uploading attachments). You can install it from MELPA, or https://github.com/tkf/emacs-request.
 
@@ -53,7 +59,6 @@ I might add a few more features if the ones I added turn out to work ok. Possibl
 - mention all thread participants in replies
 - handle newlines in toots better, for poetry, etc.
 - improve async.
-- perhaps integrate live timeline updates from https://github.com/alexjgriffith/mastodon-future.el, and add live updates for notifcations and home timeline.
 
 It looks like 2-factor auth was never completed in the original repo. It's not a priority for me, auth ain't my thing. If you want to hack on it, its on the develop branch in the original repo.
 
diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index ffd8ab6..1be88ae 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -31,6 +31,8 @@
 
 (require 'json)
 
+(autoload 'mastodon-notifications--timeline "mastodon-notifications")
+
 (defgroup mastodon-async nil
   "An async module for mastodon streams."
   :prefix "mastodon-async-"
@@ -86,19 +88,19 @@
 ;; The output can be passed to notifications
 ;; need an alternate process-queue-string function
 (defun mastodon-async--stream-notifications ()
-  "Open a stream of Home."
+  "Open a stream of user notifications."
   (interactive)
   (mastodon-async--mastodon
    "user"
    "home"
    "notifications"
-   'mastodon-async--process-queue-string))
+   'mastodon-async--process-queue-string-notifications))
 
 ;; this will stream both home AND notifications.
 ;; need to workout how to filter "user" stream
 ;; and split it
 (defun mastodon-async--stream-home ()
-  "Open a stream of Home."
+  "Open a stream of the home timeline."
   (interactive)
   (mastodon-async--mastodon
    "user"
@@ -132,7 +134,7 @@
 Then Start an async mastodon stream at ENDPOINT filtering toots
 using FILTER.
 Argument TIMELINE a specific target, such as federated or home.
-Argument NAME the center portion of the buffer name for *mastodon-async-buffer and *mastodon-async-queueu."
+Argument NAME the center portion of the buffer name for *mastodon-async-buffer and *mastodon-async-queue."
   (let ((buffer (mastodon-async--start-process
                  endpoint filter name)))
     (with-current-buffer buffer
@@ -141,7 +143,7 @@ Argument NAME the center portion of the buffer name for *mastodon-async-buffer a
       (goto-char 1))))
 
 (defun mastodon-async--get (url callback)
-  "An async get targeted at URL with a CALLBACK."
+  "An async GET request to URL with CALLBACK."
   (let ((url-request-method "GET")
         (url-request-extra-headers
          `(("Authorization" .
@@ -174,16 +176,16 @@ is not known when `mastodon-async--setup-buffer' is called."
   "Adds local variables to HTTP-BUFFER.
 
 NAME is used to generate the display buffer and the queue."
-  (let ((queue-name(concat " *mastodon-async-queue-" name "-"
+  (let ((queue-name (concat " *mastodon-async-queue-" name "-"
                            mastodon-instance-url "*"))
-        (buffer-name(concat "*mastodon-async-display-" name "-"
+        (buffer-name (concat "*mastodon-async-display-" name "-"
                             mastodon-instance-url "*")))
     (mastodon-async--set-local-variables http-buffer http-buffer
                                          buffer-name queue-name)))
 
 (defun mastodon-async--setup-queue (http-buffer name)
   "Sets up the buffer for the async queue."
-  (let ((queue-name(concat " *mastodon-async-queue-" name "-"
+  (let ((queue-name (concat " *mastodon-async-queue-" name "-"
                            mastodon-instance-url "*"))
         (buffer-name(concat "*mastodon-async-display-" name "-"
                             mastodon-instance-url "*")))
@@ -194,15 +196,18 @@ NAME is used to generate the display buffer and the queue."
 (defun mastodon-async--setup-buffer (http-buffer name endpoint)
   "Sets up the buffer timeline like `mastodon-tl--init'.
 
-HTTP-BUFFER the name of the http-buffer, if unknow set to 
-NAME is the given name of the stream, like local for public?local
-ENPOINT is the specific endpoint for a stream and timeline"  
+HTTP-BUFFER the name of the http-buffer, if unknown, set to...
+NAME is the name of the stream for the buffer name.
+ENPOINT is the endpoint for the stream and timeline."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
                             mastodon-instance-url "*"))
         (buffer-name (concat "*mastodon-async-display-" name "-"
                              mastodon-instance-url "*"))
-       ;; if user stream, we need "timelines/home" not "timelines/user"
-        (endpoint (if (equal endpoint "user") "home" endpoint)))
+      ;; if user stream, we need "timelines/home" not "timelines/user"
+      ;; if notifs, we need "notifications" not "timelines/notifications"
+        (endpoint (if (equal name "notifications") "notifications"
+                    (if (equal name "home") "timelines/home"
+                      (format "timelines/%s" endpoint)))))
     (mastodon-async--set-local-variables buffer-name http-buffer
                                          buffer-name queue-name)
     ;; Similar to timeline init. 
@@ -210,16 +215,22 @@ ENPOINT is the specific endpoint for a stream and timeline"
       (setq inhibit-read-only t) ; for home timeline?
       (make-local-variable 'mastodon-tl--enable-relative-timestamps)
       (make-local-variable 'mastodon-tl--display-media-p)
-      (message (mastodon-http--api (format "timelines/%s" endpoint)))
-      (mastodon-tl--timeline (mastodon-http--get-json
-                              (mastodon-http--api
-                               (format "timelines/%s" endpoint))))
+      (message (mastodon-http--api endpoint))
+      (if (equal name "notifications")
+          (mastodon-notifications--timeline
+           (mastodon-http--get-json
+            (mastodon-http--api "notifications")))
+        (mastodon-tl--timeline (mastodon-http--get-json
+                                (mastodon-http--api endpoint))))
       (mastodon-mode)
       (setq mastodon-tl--buffer-spec
-            `(buffer-name ,buffer-name
-                          endpoint ,(format "timelines/%s" endpoint)
-                          update-function
-                          ,'mastodon-tl--timeline))
+            `(buffer-name
+              ,buffer-name
+              endpoint ,endpoint
+              update-function
+              ,(if (equal name "notifications")
+                   'mastodon-notifications--timeline
+                 'mastodon-tl--timeline)))
       (setq-local mastodon-tl--enable-relative-timestamps nil)
       (setq-local mastodon-tl--display-media-p t)
       (current-buffer))))
@@ -254,7 +265,7 @@ Filter the toots using FILTER."
              (funcall filter queue-string))))))))
 
 (defun mastodon-async--process-queue-string (string)
-  "Parse the output STRING of the queue buffer."
+  "Parse the output STRING of the queue buffer, returning only update events."
   (let* ((split-strings (split-string string "\n" t))
          (event-type (replace-regexp-in-string
                      "^event: " ""
@@ -266,6 +277,20 @@ Filter the toots using FILTER."
       ;; for now return nil if malformed using `ignore-errors' 
       (ignore-errors (json-read-from-string data)))))
 
+(defun mastodon-async--process-queue-string-notifications (string)
+  "Parse the output STRING of the queue buffer, returning only notification events."
+  ;; NB notification events in screams include follow requests
+  (let* ((split-strings (split-string string "\n" t))
+         (event-type (replace-regexp-in-string
+                     "^event: " ""
+                     (car split-strings)))
+         (data (replace-regexp-in-string
+                "^data: " "" (cadr split-strings))))
+    (when (equal "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)))))
+
 (defun mastodon-async--process-queue-local-string (string)
   "Use STRING to limit the public endpoint to displaying local steams only."
   (let ((json (mastodon-async--process-queue-string string)))
@@ -280,8 +305,8 @@ Filter the toots using FILTER."
        (cdr (assoc 'acct (cdr (assoc 'account json)))))))
 
 (defun mastodon-async--output-toot (toot)
-  "Process TOOT and prepend it to the async user facing buffer."
-  (if (not(bufferp (get-buffer mastodon-async--buffer)))
+  "Process TOOT and prepend it to the async user-facing buffer."
+  (if (not (bufferp (get-buffer mastodon-async--buffer)))
       (mastodon-async--stop-http)
     (when toot
       (with-current-buffer mastodon-async--buffer
@@ -290,8 +315,12 @@ Filter the toots using FILTER."
                (previous (point))
                (mastodon-tl--enable-relative-timestamps t)
                (mastodon-tl--display-media-p t))
-	  (goto-char (point-min))          
-	  (mastodon-tl--timeline (list toot))
+	  (goto-char (point-min))
+          (if (equal (buffer-name)
+                     (concat "*mastodon-async-display-notifications-"
+                             mastodon-instance-url "*"))
+              (mastodon-notifications--timeline (list toot))
+	    (mastodon-tl--timeline (list toot)))
           (if (equal previous 1)
 	      (goto-char 1)
             (goto-char (+ previous (- (point-max) old-max)))))))))
@@ -305,7 +334,7 @@ Full messages are seperated by two newlines"
     (goto-char (max-char))
     (insert (decode-coding-string string 'utf-8))
     (goto-char 0)
-    (let((next(re-search-forward "\n\n" nil t)))
+    (let ((next (re-search-forward "\n\n" nil t)))
       (when next
         (let ((return-string (buffer-substring 1 next))
               (inhibit-read-only t))
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index d40815a..4bf30f1 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -140,11 +140,11 @@
 (defun mastodon-notifications--get ()
   "Display NOTIFICATIONS in buffer."
   (interactive)
+  (message "Loading your nofications...")
   (mastodon-tl--init
-   "*mastodon-notifications*"
    "notifications"
-   'mastodon-notifications--timeline)
-  (message "Loading your nofications..."))
+   "notifications"
+   'mastodon-notifications--timeline))
 
 (provide 'mastodon-notifications)
 ;;; mastodon-notifications.el ends here
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 6096c55..4d0b940 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -72,6 +72,7 @@
 (autoload 'mastodon-async--stream-federated "mastodon-async")
 (autoload 'mastodon-async--stream-local "mastodon-async")
 (autoload 'mastodon-async--stream-home "mastodon-async")
+(autoload 'mastodon-async--stream-notifications "mastodon-async")
 
 (defgroup mastodon nil
   "Interface with Mastodon."
@@ -139,6 +140,10 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "i") #'mastodon-toot--pin-toot-toggle)
     (define-key map (kbd "v") #'mastodon-profile--view-favourites)
     (define-key map (kbd "R") #'mastodon-profile--view-follow-requests)
+    (define-key map (kbd "C-c h") #'mastodon-async--stream-home)
+    (define-key map (kbd "C-c f") #'mastodon-async--stream-federated)
+    (define-key map (kbd "C-c l") #'mastodon-async--stream-local)
+    (define-key map (kbd "C-c n") #'mastodon-async--stream-notifications)    
     map)
 
   "Keymap for `mastodon-mode'.")
-- 
cgit v1.2.3


From 21bbab0885097ce7e47cbb88f9214c1f507adf87 Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Fri, 4 Jun 2021 11:16:10 +0200
Subject: handle error on kill async buffer, begin same on borked JSON.

---
 lisp/mastodon-async.el | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 1be88ae..fcc6c94 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -82,11 +82,9 @@
     (delete-process (get-buffer-process mastodon-async--http-buffer))
     (kill-buffer mastodon-async--http-buffer)
     (setq mastodon-async--http-buffer "")
-    (kill-buffer mastodon-async--queue)))
+    (when (not (equal "" mastodon-async--queue)) ; error handle on kill async buffer
+      (kill-buffer mastodon-async--queue))))
 
-;; Need to handle the notification event
-;; The output can be passed to notifications
-;; need an alternate process-queue-string function
 (defun mastodon-async--stream-notifications ()
   "Open a stream of user notifications."
   (interactive)
@@ -96,9 +94,6 @@
    "notifications"
    'mastodon-async--process-queue-string-notifications))
 
-;; this will stream both home AND notifications.
-;; need to workout how to filter "user" stream
-;; and split it
 (defun mastodon-async--stream-home ()
   "Open a stream of the home timeline."
   (interactive)
@@ -266,20 +261,21 @@ Filter the toots using FILTER."
 
 (defun mastodon-async--process-queue-string (string)
   "Parse the output STRING of the queue buffer, returning only update events."
-  (let* ((split-strings (split-string string "\n" t))
-         (event-type (replace-regexp-in-string
-                     "^event: " ""
-                     (car split-strings)))
-         (data (replace-regexp-in-string
-                "^data: " "" (cadr split-strings))))
-    (when (equal "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)))))
+  (let ((split-strings (split-string string "\n" t)))
+    (when split-strings ; do nothing if we get nothing; just postpones the error
+      (let ((event-type (replace-regexp-in-string
+                         "^event: " ""
+                         (car split-strings)))
+            (data (replace-regexp-in-string
+                   "^data: " "" (cadr split-strings))))
+        (when (equal "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)))))))
 
 (defun mastodon-async--process-queue-string-notifications (string)
   "Parse the output STRING of the queue buffer, returning only notification events."
-  ;; NB notification events in screams include follow requests
+  ;; NB notification events in streams include follow requests
   (let* ((split-strings (split-string string "\n" t))
          (event-type (replace-regexp-in-string
                      "^event: " ""
-- 
cgit v1.2.3


From 68c2942b4c94cc9c3c10b1b1b6d78f3ff6f43fb9 Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Mon, 7 Jun 2021 17:06:07 +0200
Subject: fix async "local" endpoint, docstrings

---
 lisp/mastodon-async.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index fcc6c94..1690615 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -119,17 +119,17 @@
   ;; apparently it the local flag does not work
   (mastodon-async--mastodon
    "public"
-   "local" ;"public?local=true"
+   "public?local=true"
    "local"
    'mastodon-async--process-queue-local-string))
 
 (defun mastodon-async--mastodon (endpoint timeline name filter)
   "Make sure that the previous async process has been closed.
 
-Then Start an async mastodon stream at ENDPOINT filtering toots
+Then start an async stream at ENDPOINT filtering toots
 using FILTER.
-Argument TIMELINE a specific target, such as federated or home.
-Argument NAME the center portion of the buffer name for *mastodon-async-buffer and *mastodon-async-queue."
+TIMELINE is a specific target, such as federated or home.
+NAME is the center portion of the buffer name for *mastodon-async-buffer and *mastodon-async-queue."
   (let ((buffer (mastodon-async--start-process
                  endpoint filter name)))
     (with-current-buffer buffer
-- 
cgit v1.2.3


From 7afc5a08e35c86acc9f009404045a787ef61b77b Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Mon, 21 Jun 2021 11:33:40 +0200
Subject: typo in async http-layer, unless in http process-json, typo in readm

---
 README.org             | 2 +-
 lisp/mastodon-async.el | 2 +-
 lisp/mastodon-http.el  | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/README.org b/README.org
index 21ae34a..5adab37 100644
--- a/README.org
+++ b/README.org
@@ -37,7 +37,7 @@ I did this for my own use and to learn more Elisp. If the code is terrible, feel
 
 ** live-updating timelines
 
-(code adapted from https://github.com/alexjgriffith/mastodon-future.el).
+(code adapted from https://github.com/alexjgriffith/mastodon-future.el.)
 
 Works for federated, local, and home timelines and for notifications. It's pretty necro, so use at your own risk. Not a super high priority for me, but some people dig it. The command prefix is =mastodon-async--stream=, and you can load various timelines from within a mastodon session like so:
 - =C-c h= (home)
diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 1690615..4367cc9 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -342,7 +342,7 @@ Full messages are seperated by two newlines"
 
 It then processes its output."
   (with-current-buffer (process-buffer proc)
-    (let ((start (max 1 ( - (point-max) 2))))
+    (let ((start (max 1 (- (point-max) 2))))
       (url-http-generic-filter proc data)
       (when (> url-http-end-of-headers start)
         (setq start url-http-end-of-headers))
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 144b446..e8fd4d3 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -126,9 +126,8 @@ Pass response buffer to CALLBACK function."
           (buffer-substring-no-properties (point) (point-max))
           'utf-8)))
     (kill-buffer)
-    (if (not (or (string= "" json-string) (equal nil json-string)))
-        (json-read-from-string json-string)
-      (message "Looks like we got no JSON from the server."))))
+    (unless (or (string= "" json-string) (equal nil json-string)))
+        (json-read-from-string json-string)))
 
 (defun mastodon-http--delete (url)
   "Make DELETE request to URL."
-- 
cgit v1.2.3


From 53616d194cfcab743558f91e88526e83204ee704 Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Wed, 22 Sep 2021 17:48:10 +0200
Subject: package-lint: bump to emacs 26.1, disable stream keybindings

---
 README.org                     | 10 +++-------
 lisp/mastodon-async.el         |  2 +-
 lisp/mastodon-auth--test.el    |  2 +-
 lisp/mastodon-auth.el          |  2 +-
 lisp/mastodon-client.el        |  2 +-
 lisp/mastodon-discover.el      |  2 +-
 lisp/mastodon-http.el          |  2 +-
 lisp/mastodon-inspect.el       |  2 +-
 lisp/mastodon-media.el         |  2 +-
 lisp/mastodon-notifications.el |  2 +-
 lisp/mastodon-profile.el       |  2 +-
 lisp/mastodon-search.el        |  2 +-
 lisp/mastodon-tl.el            |  2 +-
 lisp/mastodon-toot.el          |  2 +-
 lisp/mastodon.el               | 18 +++++++++---------
 15 files changed, 25 insertions(+), 29 deletions(-)

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

diff --git a/README.org b/README.org
index e7960bf..4be82c6 100644
--- a/README.org
+++ b/README.org
@@ -32,19 +32,15 @@ It also makes some small cosmetic changes to make timelines easier to read, and
 
 This updated version is not on MELPA, to use it you need to clone and require it as per the installation instructions below.
 
-The minimum Emacs version is now 25.1. But if you are running an older version it shouldn't be very hard to get it working.
+The minimum Emacs version is now 26.1. But if you are running an older version it shouldn't be very hard to get it working.
 
 I did this for my own use and to learn more Elisp. Feel free to improve it.
 
 ** live-updating timelines
 
-(code adapted from https://github.com/alexjgriffith/mastodon-future.el.)
+(code taken from https://github.com/alexjgriffith/mastodon-future.el.)
 
-Works for federated, local, and home timelines and for notifications. It's pretty necro, sometimes it goes off the rails, so use at your own risk. Not a super high priority for me, but some people dig it. The command prefix is =mastodon-async--stream=, and you can load various timelines from within a mastodon session like so:
-- =C-c h= (home)
-- =C-c f= (federated)
-- =C-c l= (local)
-- =C-c n= (notifications)
+Works for federated, local, and home timelines and for notifications. It's pretty necro, sometimes it goes off the rails, so use at your own risk. Not a super high priority for me, but some people dig it. The command prefix is =mastodon-async--stream=.
 
 ** NB: dependency
 
diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 4367cc9..6a421d1 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.7.1
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-auth--test.el b/lisp/mastodon-auth--test.el
index b8705f5..9a765b9 100644
--- a/lisp/mastodon-auth--test.el
+++ b/lisp/mastodon-auth--test.el
@@ -5,7 +5,7 @@
 ;; Author: Ian Eure <ian@retrospec.tv>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 4628e74..3f4ee7d 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index 90f1375..6439c0a 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 2387feb..9c946be 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 94aa85d..31ea483 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1") (request "0.2.0"))
+;; Package-Requires: ((emacs "26.1") (request "0.2.0"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index c5a8d5d..9559b21 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 2100553..c3873df 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index caeb9cd..7524038 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index eb75247..98d11f7 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1") (seq "1.8"))
+;; Package-Requires: ((emacs "26.1") (seq "1.8"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 5e8253f..3b7e399 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>, martyhiatt <mousebot@riseup.net>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index c5240db..af6f0a2 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index d9f895c..c9184fc 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index fd00ee9..460fe29 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1") (request "0.2.0") (seq "1.8"))
+;; Package-Requires: ((emacs "26.1") (request "0.2.0") (seq "1.8"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -73,10 +73,10 @@
 (autoload 'mastodon-toot--copy-toot-url "mastodon-toot")
 (autoload 'mastodon-toot--pin-toot-toggle "mastodon-toot")
 (autoload 'mastodon-auth--get-account-name "mastodon-auth")
-(autoload 'mastodon-async--stream-federated "mastodon-async")
-(autoload 'mastodon-async--stream-local "mastodon-async")
-(autoload 'mastodon-async--stream-home "mastodon-async")
-(autoload 'mastodon-async--stream-notifications "mastodon-async")
+;; (autoload 'mastodon-async--stream-federated "mastodon-async")
+;; (autoload 'mastodon-async--stream-local "mastodon-async")
+;; (autoload 'mastodon-async--stream-home "mastodon-async")
+;; (autoload 'mastodon-async--stream-notifications "mastodon-async")
 (autoload 'mastodon-profile--update-user-profile-note "mastodon-profile")
 (autoload 'mastodon-auth--user-acct "mastodon-auth")
 (autoload 'mastodon-tl--poll-vote "mastodon-http")
@@ -147,10 +147,10 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "i") #'mastodon-toot--pin-toot-toggle)
     (define-key map (kbd "V") #'mastodon-profile--view-favourites)
     (define-key map (kbd "R") #'mastodon-profile--view-follow-requests)
-    (define-key map (kbd "C-c h") #'mastodon-async--stream-home)
-    (define-key map (kbd "C-c f") #'mastodon-async--stream-federated)
-    (define-key map (kbd "C-c l") #'mastodon-async--stream-local)
-    (define-key map (kbd "C-c n") #'mastodon-async--stream-notifications)
+    ;; (define-key map (kbd "C-c h") #'mastodon-async--stream-home)
+    ;; (define-key map (kbd "C-c f") #'mastodon-async--stream-federated)
+    ;; (define-key map (kbd "C-c l") #'mastodon-async--stream-local)
+    ;; (define-key map (kbd "C-c n") #'mastodon-async--stream-notifications)
     (define-key map (kbd "U") #'mastodon-profile--update-user-profile-note)
     (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept-notifs)
     (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject-notifs)
-- 
cgit v1.2.3


From d7593a06912b7946d2fb318093ec7e27c64b3be7 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Mon, 1 Nov 2021 12:28:32 +0100
Subject: Fix compilation warnings.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is mostly reflowing / reworkding docstrings to keep within 80
characters limit and adding autoloads.

There are two warning remaining that I don't understand:
- mastodon-async.el:359:16: Warning: reference to free variable
‘url-http-end-of-headers’
- mastodon-http.el:139:8: Warning: value returned from (string-equal json-string "") is unused

When adding autoloads this sorts them for better readability.
---
 lisp/mastodon-async.el         | 14 ++++++++++++--
 lisp/mastodon-auth.el          | 13 ++++++++++---
 lisp/mastodon-http.el          |  2 +-
 lisp/mastodon-media.el         |  5 ++++-
 lisp/mastodon-notifications.el | 15 ++++++++-------
 lisp/mastodon-search.el        |  9 ++-------
 lisp/mastodon-tl.el            |  7 +++++--
 lisp/mastodon-toot.el          | 41 +++++++++++++++++++++++------------------
 8 files changed, 65 insertions(+), 41 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 6a421d1..56dc230 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -30,8 +30,14 @@
 ;;; Code:
 
 (require 'json)
+(require 'url-http)
 
+(autoload 'mastodon-auth--access-token "mastodon-auth")
+(autoload 'mastodon-http--api "mastodon-http")
+(autoload 'mastodon-http--get-json "mastodon-http")
+(autoload 'mastodon-mode "mastodon")
 (autoload 'mastodon-notifications--timeline "mastodon-notifications")
+(autoload 'mastodon-tl--timeline "mastodon-tl")
 
 (defgroup mastodon-async nil
   "An async module for mastodon streams."
@@ -129,7 +135,9 @@
 Then start an async stream at ENDPOINT filtering toots
 using FILTER.
 TIMELINE is a specific target, such as federated or home.
-NAME is the center portion of the buffer name for *mastodon-async-buffer and *mastodon-async-queue."
+NAME is the center portion of the buffer name for
+*mastodon-async-buffer and *mastodon-async-queue."
+  (ignore timeline) ;; TODO: figure out what this is meant to be used for
   (let ((buffer (mastodon-async--start-process
                  endpoint filter name)))
     (with-current-buffer buffer
@@ -238,7 +246,9 @@ Filter the toots using FILTER."
          (async-buffer (mastodon-async--setup-buffer "" (or name stream) endpoint))
          (http-buffer (mastodon-async--get
                        (mastodon-http--api stream)
-                       (lambda (status) (message "HTTP SOURCE CLOSED")))))
+                       (lambda (status)
+                         (ignore status)
+                         (message "HTTP SOURCE CLOSED")))))
     (mastodon-async--setup-http  http-buffer (or name stream))
     (mastodon-async--set-http-buffer async-buffer http-buffer)
     (mastodon-async--set-http-buffer async-queue http-buffer)        
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 0b0c703..b22b51e 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -63,7 +63,10 @@ if you are happy with unencryped storage use e.g. \"~/authinfo\"."
 (defun mastodon-auth--generate-token ()
   "Make POST to generate auth token.
 
-If no auth-sources file, runs `mastodon-auth--generate-token-no-storing-credentials'. If auth-sources file exists, runs `mastodon-auth--generate-token-and-store'."
+If no auth-sources file, runs
+`mastodon-auth--generate-token-no-storing-credentials'. If
+auth-sources file exists, runs
+`mastodon-auth--generate-token-and-store'."
   (if (or (null mastodon-auth-source-file)
 	  (string= "" mastodon-auth-source-file))
       (mastodon-auth--generate-token-no-storing-credentials)
@@ -124,9 +127,13 @@ Reads and/or stores secrets in `MASTODON-AUTH-SOURCE-FILE'."
       (json-read-from-string json-string))))
 
 (defun mastodon-auth--access-token ()
-  "If an access token for `mastodon-instance-url' is in `mastodon-auth--token-alist', return it.
+  "Return exiting or generate new access token.
 
-Otherwise, generate a token and pass it to `mastodon-auth--handle-token-reponse'."
+If an access token for `mastodon-instance-url' is in
+`mastodon-auth--token-alist', return it.
+
+Otherwise, generate a token and pass it to
+`mastodon-auth--handle-token-reponse'."
   (if-let ((token (cdr (assoc mastodon-instance-url mastodon-auth--token-alist))))
       token
 
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index d6158eb..27f8ef0 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -145,7 +145,7 @@ Pass response buffer to CALLBACK function."
           (buffer-substring-no-properties (point) (point-max))
           'utf-8)))
     (kill-buffer)
-    (unless (or (string= "" json-string) (equal nil json-string)))
+    (unless (or (string-equal "" json-string) (null json-string)))
         (json-read-from-string json-string)))
 
 (defun mastodon-http--delete (url)
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 808a23d..5f8f46c 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -32,6 +32,8 @@
 ;; required by the server and client.
 
 ;;; Code:
+(require 'url-cache)
+
 (defvar url-show-status)
 
 (defvar mastodon-tl--shr-image-map-replacement)
@@ -141,7 +143,8 @@ fKRJkmVZjAQwh78A6vCRWJE8K+8AAAAASUVORK5CYII=")
 STATUS-PLIST is the usual plist of status events as per `url-retrieve'.
 IMAGE-OPTIONS are the precomputed options to apply to the image.
 MARKER is the marker to where the response should be visible.
-REGION-LENGTH is the length of the region that should be replaced with the image."
+REGION-LENGTH is the length of the region that should be replaced
+with the image."
   (when (marker-buffer marker) ; only if the buffer hasn't been kill in the meantime
     (let ((url-buffer (current-buffer))
           (is-error-response-p (eq :error (car status-plist))))
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 2e9aea3..ad3d7b4 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -29,22 +29,23 @@
 
 ;;; Code:
 
+(autoload 'mastodon-http--api "mastodon-http.el")
+(autoload 'mastodon-http--post "mastodon-http.el")
+(autoload 'mastodon-http--triage "mastodon-http.el")
 (autoload 'mastodon-media--inline-images "mastodon-media.el")
+(autoload 'mastodon-tl--byline "mastodon-tl.el")
 (autoload 'mastodon-tl--byline-author "mastodon-tl.el")
 (autoload 'mastodon-tl--clean-tabs-and-nl "mastodon-tl.el")
 (autoload 'mastodon-tl--content "mastodon-tl.el")
-(autoload 'mastodon-tl--byline "mastodon-tl.el")
-(autoload 'mastodon-tl--toot-id "mastodon-tl.el")
 (autoload 'mastodon-tl--field "mastodon-tl.el")
+(autoload 'mastodon-tl--find-property-range "mastodon-tl.el")
 (autoload 'mastodon-tl--has-spoiler "mastodon-tl.el")
 (autoload 'mastodon-tl--init "mastodon-tl.el")
+(autoload 'mastodon-tl--init-sync "mastodon-tl.el")
 (autoload 'mastodon-tl--insert-status "mastodon-tl.el")
-(autoload 'mastodon-tl--spoiler "mastodon-tl.el")
 (autoload 'mastodon-tl--property "mastodon-tl.el")
-(autoload 'mastodon-tl--find-property-range "mastodon-tl.el")
-(autoload 'mastodon-http--triage "mastodon-http.el")
-(autoload 'mastodon-http--post "mastodon-http.el")
-(autoload 'mastodon-http--api "mastodon-http.el")
+(autoload 'mastodon-tl--spoiler "mastodon-tl.el")
+(autoload 'mastodon-tl--toot-id "mastodon-tl.el")
 (defvar mastodon-tl--display-media-p)
 
 
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 03301ce..2227d79 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -46,12 +46,6 @@
 
 ;; functions for company completion of mentions in mastodon-toot
 
-(defun mastodon-search--get-user-info (account)
-  "Get user handle, display name and account URL from ACCOUNT."
-  (list (cdr (assoc 'display_name account))
-        (concat "@" (cdr (assoc 'acct account)))
-        (cdr (assoc 'url account))))
-
 (defun mastodon-search--search-accounts-query (query)
   "Prompt for a search QUERY and return accounts synchronously.
 Returns a nested list containing user handle, display name, and URL."
@@ -161,7 +155,8 @@ We use this to fetch the complete status from the server."
 (defun mastodon-search--fetch-full-status-from-id (id)
   "Fetch the full status with id ID from the server.
 
-This allows us to access the full account etc. details and to render them properly."
+This allows us to access the full account etc. details and to
+render them properly."
   (let* ((url (concat mastodon-instance-url "/api/v1/statuses/" (mastodon-tl--as-string id)))
         (json (mastodon-http--get-json url)))
     json))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 9bbc44f..e5ded3f 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -67,7 +67,7 @@
   :group 'mastodon)
 
 (defcustom mastodon-tl--enable-relative-timestamps t
-  "Nonnil to enable showing relative (to the current time) timestamps.
+  "Whether to show relative (to the current time) timestamps.
 
 This will require periodic updates of a timeline buffer to
 keep the timestamps current as time progresses."
@@ -630,7 +630,10 @@ Used for a mouse-click EVENT on a link."
   (mastodon-tl--do-link-action-at-point (posn-point (event-end event))))
 
 (defun mastodon-tl--has-spoiler (toot)
-  "Check if the given TOOT has a spoiler text that should initially be shown only while the main content should be hidden."
+  "Check if the given TOOT has a spoiler text.
+
+Spoiler text should initially be shown only while the main
+content should be hidden."
   (let ((spoiler (mastodon-tl--field 'spoiler_text toot)))
     (and spoiler (> (length spoiler) 0))))
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index b0b7e13..7698226 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -43,24 +43,25 @@
 (defvar mastodon-instance-url)
 (autoload 'mastodon-auth--user-acct "mastodon-auth")
 (autoload 'mastodon-http--api "mastodon-http")
-(autoload 'mastodon-http--post "mastodon-http")
-(autoload 'mastodon-http--triage "mastodon-http")
 (autoload 'mastodon-http--delete "mastodon-http")
-(autoload 'mastodon-http--process-json "mastodon-http")
 (autoload 'mastodon-http--get-json "mastodon-http")
+(autoload 'mastodon-http--get-json-async "mastodon-htpp")
+(autoload 'mastodon-http--post "mastodon-http")
+(autoload 'mastodon-http--post-media-attachment "mastodon-http")
+(autoload 'mastodon-http--process-json "mastodon-http")
+(autoload 'mastodon-http--read-file-as-string "mastodon-http")
+(autoload 'mastodon-http--triage "mastodon-http")
+(autoload 'mastodon-search--search-accounts-query "mastodon-search")
 (autoload 'mastodon-tl--as-string "mastodon-tl")
 (autoload 'mastodon-tl--clean-tabs-and-nl "mastodon-tl")
 (autoload 'mastodon-tl--field "mastodon-tl")
 (autoload 'mastodon-tl--find-property-range "mastodon-tl")
+(autoload 'mastodon-tl--find-property-range "mastodon-tl")
 (autoload 'mastodon-tl--goto-next-toot "mastodon-tl")
 (autoload 'mastodon-tl--property "mastodon-tl")
-(autoload 'mastodon-tl--find-property-range "mastodon-tl")
-(autoload 'mastodon-toot "mastodon")
-(autoload 'mastodon-http--post-media-attachment "mastodon-http")
-(autoload 'mastodon-http--read-file-as-string "mastodon-http")
-(autoload 'mastodon-tl--toot-id "mastodon-tl")
 (autoload 'mastodon-tl--reload-timeline-or-profile "mastodon-tl")
-(autoload 'mastodon-search--search-accounts-query "mastodon-search")
+(autoload 'mastodon-tl--toot-id "mastodon-tl")
+(autoload 'mastodon-toot "mastodon")
 
 (defgroup mastodon-toot nil
   "Tooting in Mastodon."
@@ -70,7 +71,8 @@
 (defcustom mastodon-toot--default-visibility "public"
   "The default visibility for new toots.
 
-Must be one of \"public\", \"unlisted\", \"private\" (for followers-only), or \"direct\"."
+Must be one of \"public\", \"unlisted\", \"private\" (for
+followers-only), or \"direct\"."
   :group 'mastodon-toot
   :type '(choice
           (const :tag "public" "public")
@@ -88,14 +90,17 @@ Must be one of \"public\", \"unlisted\", \"private\" (for followers-only), or \"
   :group 'mastodon-toot
   :type 'integer)
 
-(when (require 'company nil :noerror)
-  (defcustom mastodon-toot--enable-completion-for-mentions "following"
-    "Whether to enable company completion for mentions in toot compose buffer."
-      :group 'mastodon-toot
-      :type '(choice
-              (const :tag "off" nil)
-              (const :tag "following only" "following")
-              (const :tag "all users" "all"))))
+(defcustom mastodon-toot--enable-completion-for-mentions (if (require 'company nil :noerror) "following" "off")
+  "Whether to enable company completion for mentions.
+
+Used for completion in toot compose buffer.
+
+This is only used if company mode is installed."
+  :group 'mastodon-toot
+  :type '(choice
+          (const :tag "off" nil)
+          (const :tag "following only" "following")
+          (const :tag "all users" "all")))
 
 (defvar mastodon-toot--content-warning nil
   "A flag whether the toot should be marked with a content warning.")
-- 
cgit v1.2.3


From b9d5d2ee57855653c32fe2fe2a495e5a3a038acf Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Tue, 2 Nov 2021 18:35:38 +0100
Subject: Use `defvar-local` to create buffer-local vars.

This is much cleaner than first using `defvar` immediately followed by
`make-variable-buffer-local`.
---
 lisp/mastodon-async.el   | 15 ++++++---------
 lisp/mastodon-profile.el |  3 +--
 lisp/mastodon-tl.el      | 12 ++++--------
 lisp/mastodon-toot.el    | 24 ++++++++----------------
 4 files changed, 19 insertions(+), 35 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 56dc230..f7bbdff 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -55,17 +55,14 @@
 (defvar mastodon-tl--display-media-p)
 (defvar mastodon-tl--buffer-spec)
 
-(make-variable-buffer-local
- (defvar mastodon-async--queue "" ;;"*mastodon-async-queue*"
-   "The intermediate queue buffer name."))
+(defvar-local mastodon-async--queue "" ;;"*mastodon-async-queue*"
+  "The intermediate queue buffer name.")
 
-(make-variable-buffer-local
- (defvar mastodon-async--buffer "" ;;"*mastodon-async-buffer*"
-   "User facing output buffer name."))
+(defvar-local mastodon-async--buffer "" ;;"*mastodon-async-buffer*"
+   "User facing output buffer name.")
 
-(make-variable-buffer-local
- (defvar mastodon-async--http-buffer "" ;;""
-   "Buffer variable bound to http output."))
+(defvar-local mastodon-async--http-buffer "" ;;""
+   "Buffer variable bound to http output.")
 
 (defun mastodon-async--display-http ()
   "Display the async HTTP input buffer."
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 018af21..31499ed 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -62,9 +62,8 @@
 (defvar mastodon-tl--update-point)
 
 
-(defvar mastodon-profile--account nil
+(defvar-local mastodon-profile--account nil
   "The data for the account being described in the current profile buffer.")
-(make-variable-buffer-local 'mastodon-profile--account)
 
 ;; this way you can update it with C-M-x:
 (defvar mastodon-profile-mode-map
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b1b7c68..e4c179c 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -82,9 +82,8 @@ By default fixed width fonts are used."
   :type '(boolean :tag "Enable using proportional rather than fixed \
 width fonts when rendering HTML text"))
 
-(defvar mastodon-tl--buffer-spec nil
+(defvar-local mastodon-tl--buffer-spec nil
   "A unique identifier and functions for each Mastodon buffer.")
-(make-variable-buffer-local 'mastodon-tl--buffer-spec)
 
 (defcustom mastodon-tl--show-avatars nil
   "Whether to enable display of user avatars in timelines."
@@ -97,22 +96,19 @@ width fonts when rendering HTML text"))
           ;; (image-transforms-p))
   ;; "A boolean value stating whether to show avatars in timelines.")
 
-(defvar mastodon-tl--update-point nil
+(defvar-local mastodon-tl--update-point nil
   "When updating a mastodon buffer this is where new toots will be inserted.
 
 If nil `(point-min)' is used instead.")
-(make-variable-buffer-local 'mastodon-tl--update-point)
 
 (defvar mastodon-tl--display-media-p t
   "A boolean value stating whether to show media in timelines.")
 
-(defvar mastodon-tl--timestamp-next-update nil
+(defvar-local mastodon-tl--timestamp-next-update nil
   "The timestamp when the buffer should next be scanned to update the timestamps.")
-(make-variable-buffer-local 'mastodon-tl--timestamp-next-update)
 
-(defvar mastodon-tl--timestamp-update-timer nil
+(defvar-local mastodon-tl--timestamp-update-timer nil
   "The timer that, when set will scan the buffer to update the timestamps.")
-(make-variable-buffer-local 'mastodon-tl--timestamp-update-timer)
 
 (defvar mastodon-tl--link-keymap
   (let ((map (make-sparse-keymap)))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index deea2ef..07b52e3 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -106,35 +106,28 @@ This is only used if company mode is installed."
           (const :tag "following only" "following")
           (const :tag "all users" "all")))
 
-(defvar mastodon-toot--content-warning nil
+(defvar-local mastodon-toot--content-warning nil
   "A flag whether the toot should be marked with a content warning.")
-(make-variable-buffer-local 'mastodon-toot--content-warning)
 
-(defvar mastodon-toot--content-warning-from-reply-or-redraft nil
+(defvar-local mastodon-toot--content-warning-from-reply-or-redraft nil
   "The content warning of the toot being replied to.")
-(make-variable-buffer-local 'mastodon-toot--content-warning)
 
-(defvar mastodon-toot--content-nsfw nil
+(defvar-local mastodon-toot--content-nsfw nil
   "A flag indicating whether the toot should be marked as NSFW.")
-(make-variable-buffer-local 'mastodon-toot--content-nsfw)
 
-(defvar mastodon-toot--visibility "public"
+(defvar-local mastodon-toot--visibility "public"
   "A string indicating the visibility of the toot being composed.
 
 Valid values are \"direct\", \"private\" (followers-only), \"unlisted\", and \"public\".")
-(make-variable-buffer-local 'mastodon-toot--visibility)
 
-(defvar mastodon-toot--media-attachments nil
+(defvar-local mastodon-toot--media-attachments nil
   "A list of the media attachments of the toot being composed.")
-(make-variable-buffer-local 'mastodon-toot--media-attachments)
 
-(defvar mastodon-toot--media-attachment-ids nil
+(defvar-local mastodon-toot--media-attachment-ids nil
   "A list of any media attachment ids of the toot being composed.")
-(make-variable-buffer-local 'mastodon-toot--media-attachment-ids)
 
-(defvar mastodon-toot--reply-to-id nil
+(defvar-local mastodon-toot--reply-to-id nil
   "Buffer-local variable to hold the id of the toot being replied to.")
-(make-variable-buffer-local 'mastodon-toot--reply-to-id)
 
 (defvar mastodon-toot--max-toot-chars nil
   "The maximum allowed characters count for a single toot.")
@@ -714,9 +707,8 @@ e.g. mastodon-toot--send -> Send."
   "Format a list of keybindings, KBINDS, for display in documentation."
   (mapcar #'mastodon-toot--format-kbind kbinds))
 
-(defvar mastodon-toot--kbinds-pairs nil
+(defvar-local mastodon-toot--kbinds-pairs nil
   "Contains a list of paired toot compose buffer keybindings for inserting.")
-(make-variable-buffer-local 'mastodon-toot--kbinds-pairs)
 
 (defun mastodon-toot--formatted-kbinds-pairs (kbinds-list longest)
   "Return a list of strings each containing two formatted kbinds.
-- 
cgit v1.2.3


From 93950dbee4165c733fd8e0a4938fd7d0f462d908 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Tue, 2 Nov 2021 20:30:27 +0100
Subject: Reformat all code.

Basically, in Emacs for each file: select all text and
`indent-region`.

- This also removes one redundant comment, and
- fixes an error with json decoding where the `json-read-from-string`
  was actually not within the intended `unless` clause (which explains
  the warning about "result of (string-equal "" json-string) will be
  ignored" which I never understood.
---
 lisp/mastodon-async.el              |  22 +-
 lisp/mastodon-http.el               |  87 ++++----
 lisp/mastodon-inspect.el            |   2 +-
 lisp/mastodon-media.el              |   4 +-
 lisp/mastodon-notifications.el      |  68 +++---
 lisp/mastodon-profile.el            |  24 +--
 lisp/mastodon-search.el             |  78 +++----
 lisp/mastodon-tl.el                 |  54 ++---
 lisp/mastodon-toot.el               | 106 ++++-----
 lisp/mastodon.el                    |   4 +-
 test/mastodon-auth-tests.el         |  14 +-
 test/mastodon-client-tests.el       |  64 +++---
 test/mastodon-http-tests.el         |   6 +-
 test/mastodon-media-tests.el        | 266 +++++++++++------------
 test/mastodon-notifications-test.el |   4 +-
 test/mastodon-tl-tests.el           | 420 ++++++++++++++++++------------------
 test/mastodon-toot-tests.el         |   6 +-
 17 files changed, 614 insertions(+), 615 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index f7bbdff..1fabee2 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -59,10 +59,10 @@
   "The intermediate queue buffer name.")
 
 (defvar-local mastodon-async--buffer "" ;;"*mastodon-async-buffer*"
-   "User facing output buffer name.")
+  "User facing output buffer name.")
 
 (defvar-local mastodon-async--http-buffer "" ;;""
-   "Buffer variable bound to http output.")
+  "Buffer variable bound to http output.")
 
 (defun mastodon-async--display-http ()
   "Display the async HTTP input buffer."
@@ -177,16 +177,16 @@ is not known when `mastodon-async--setup-buffer' is called."
 
 NAME is used to generate the display buffer and the queue."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
-                           mastodon-instance-url "*"))
+                            mastodon-instance-url "*"))
         (buffer-name (concat "*mastodon-async-display-" name "-"
-                            mastodon-instance-url "*")))
+                             mastodon-instance-url "*")))
     (mastodon-async--set-local-variables http-buffer http-buffer
                                          buffer-name queue-name)))
 
 (defun mastodon-async--setup-queue (http-buffer name)
   "Sets up the buffer for the async queue."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
-                           mastodon-instance-url "*"))
+                            mastodon-instance-url "*"))
         (buffer-name(concat "*mastodon-async-display-" name "-"
                             mastodon-instance-url "*")))
     (mastodon-async--set-local-variables queue-name http-buffer
@@ -203,8 +203,8 @@ ENPOINT is the endpoint for the stream and timeline."
                             mastodon-instance-url "*"))
         (buffer-name (concat "*mastodon-async-display-" name "-"
                              mastodon-instance-url "*"))
-      ;; if user stream, we need "timelines/home" not "timelines/user"
-      ;; if notifs, we need "notifications" not "timelines/notifications"
+        ;; if user stream, we need "timelines/home" not "timelines/user"
+        ;; if notifs, we need "notifications" not "timelines/notifications"
         (endpoint (if (equal name "notifications") "notifications"
                     (if (equal name "home") "timelines/home"
                       (format "timelines/%s" endpoint)))))
@@ -285,8 +285,8 @@ Filter the toots using FILTER."
   ;; NB notification events in streams include follow requests
   (let* ((split-strings (split-string string "\n" t))
          (event-type (replace-regexp-in-string
-                     "^event: " ""
-                     (car split-strings)))
+                      "^event: " ""
+                      (car split-strings)))
          (data (replace-regexp-in-string
                 "^data: " "" (cadr split-strings))))
     (when (equal "notification" event-type)
@@ -304,8 +304,8 @@ Filter the toots using FILTER."
 (defun mastodon-async--account-local-p (json)
   "Test JSON to see if account is local."
   (not (string-match-p
-       "@"
-       (cdr (assoc 'acct (cdr (assoc 'account json)))))))
+        "@"
+        (cdr (assoc 'acct (cdr (assoc 'account json)))))))
 
 (defun mastodon-async--output-toot (toot)
   "Process TOOT and prepend it to the async user-facing buffer."
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 875e9bf..a183ed7 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -153,8 +153,8 @@ is available we will call it with or without a timeout."
           (buffer-substring-no-properties (point) (point-max))
           'utf-8)))
     (kill-buffer)
-    (unless (or (string-equal "" json-string) (null json-string)))
-        (json-read-from-string json-string)))
+    (unless (or (string-equal "" json-string) (null json-string))
+      (json-read-from-string json-string))))
 
 (defun mastodon-http--delete (url)
   "Make DELETE request to URL."
@@ -256,8 +256,8 @@ Authorization header is included by default unless UNAUTHENTICED-P is non-nil."
                       args
                       "&")))
         (url-request-extra-headers
-	     (append `(("Authorization" . ,(concat "Bearer " (mastodon-auth--access-token))))
-	             headers)))
+	 (append `(("Authorization" . ,(concat "Bearer " (mastodon-auth--access-token))))
+	         headers)))
     (with-temp-buffer
       (url-retrieve url callback cbargs))))
 
@@ -269,46 +269,45 @@ The upload is asynchronous. On succeeding,
 item uploaded, and `mastodon-toot--update-status-fields' is run."
   (let* ((file (file-name-nondirectory filename))
          (request-backend 'curl))
-         ;; (response
-         (request
-            url
-            :type "POST"
-            :params `(("description" . ,caption))
-            :files `(("file" . (,file :file ,filename
-                                      :mime-type "multipart/form-data")))
-            :parser 'json-read
-            :headers `(("Authorization" . ,(concat "Bearer "
-                                                   (mastodon-auth--access-token))))
-            :sync t
-            :success (cl-function
-                      (lambda (&key data &allow-other-keys)
-                        (when data
-                          (progn
-                            (push (cdr (assoc 'id data))
-                                  mastodon-toot--media-attachment-ids) ; add ID to list
-                            (message "%s file %s with id %S and caption '%s' uploaded!"
-                                     (capitalize (cdr (assoc 'type data)))
-                                     file
-                                     (cdr (assoc 'id data))
-                                     (cdr (assoc 'description data)))
-                            (mastodon-toot--update-status-fields)))))
-            :error (cl-function
-                    (lambda (&key error-thrown &allow-other-keys)
-                      (cond
-                       ;; handle curl errors first (eg 26, can't read file/path)
-                       ;; because the '=' test below fails for them
-                       ;; they have the form (error . error message 24)
-                       ((not (proper-list-p error-thrown)) ; not dotted list
-			            (message "Got error: %s. Shit went south." (cdr error-thrown)))
-                       ;; handle mastodon api errors
-                       ;; they have the form (error http 401)
-			           ((= (car (last error-thrown)) 401)
-                        (message "Got error: %s Unauthorized: The access token is invalid" error-thrown))
-                       ((= (car (last error-thrown)) 422)
-                        (message "Got error: %s Unprocessable entity: file or file type is unsupported or invalid" error-thrown))
-                       (t
-                        (message "Got error: %s Shit went south"
-                                 error-thrown))))))))
+    (request
+     url
+     :type "POST"
+     :params `(("description" . ,caption))
+     :files `(("file" . (,file :file ,filename
+                               :mime-type "multipart/form-data")))
+     :parser 'json-read
+     :headers `(("Authorization" . ,(concat "Bearer "
+                                            (mastodon-auth--access-token))))
+     :sync t
+     :success (cl-function
+               (lambda (&key data &allow-other-keys)
+                 (when data
+                   (progn
+                     (push (cdr (assoc 'id data))
+                           mastodon-toot--media-attachment-ids) ; add ID to list
+                     (message "%s file %s with id %S and caption '%s' uploaded!"
+                              (capitalize (cdr (assoc 'type data)))
+                              file
+                              (cdr (assoc 'id data))
+                              (cdr (assoc 'description data)))
+                     (mastodon-toot--update-status-fields)))))
+     :error (cl-function
+             (lambda (&key error-thrown &allow-other-keys)
+               (cond
+                ;; handle curl errors first (eg 26, can't read file/path)
+                ;; because the '=' test below fails for them
+                ;; they have the form (error . error message 24)
+                ((not (proper-list-p error-thrown)) ; not dotted list
+		 (message "Got error: %s. Shit went south." (cdr error-thrown)))
+                ;; handle mastodon api errors
+                ;; they have the form (error http 401)
+		((= (car (last error-thrown)) 401)
+                 (message "Got error: %s Unauthorized: The access token is invalid" error-thrown))
+                ((= (car (last error-thrown)) 422)
+                 (message "Got error: %s Unprocessable entity: file or file type is unsupported or invalid" error-thrown))
+                (t
+                 (message "Got error: %s Shit went south"
+                          error-thrown))))))))
 
 (provide 'mastodon-http)
 ;;; mastodon-http.el ends here
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index 2181ea2..4647335 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -59,7 +59,7 @@
    (concat "*mastodon-inspect-toot-"
            (mastodon-tl--as-string (mastodon-tl--property 'toot-id))
            "*")
-  (mastodon-tl--property 'toot-json)))
+   (mastodon-tl--property 'toot-json)))
 
 (defun mastodon-inspect--download-single-toot (toot-id)
   "Download the toot/status represented by TOOT-ID."
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 5f8f46c..f7386c6 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -161,7 +161,7 @@ with the image."
                                  t image-options))))
             (when mastodon-media--enable-image-caching
               (unless (url-is-cached url) ; cache if not already cached
-              (url-store-in-cache url-buffer)))
+                (url-store-in-cache url-buffer)))
             (with-current-buffer (marker-buffer marker)
               ;; Save narrowing in our buffer
               (let ((inhibit-read-only t))
@@ -239,7 +239,7 @@ found."
          ;; Avatars are just one character in the buffer
          ((eq media-type 'avatar)
           (list next-pos (+ next-pos 1) 'avatar))
-        ;; Media links are 5 character ("[img]")
+         ;; Media links are 5 character ("[img]")
          ((eq media-type 'media-link)
           (list next-pos (+ next-pos 5) 'media-link)))))))
 
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 36f9d4a..2430bcc 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -80,23 +80,23 @@
     (let* ((toot-json (mastodon-tl--property 'toot-json))
            (f-req-p (string= "follow_request" (cdr (assoc 'type toot-json)))))
       (if f-req-p
-        (let* ((account (cdr (assoc 'account toot-json)))
-               (id (cdr (assoc 'id account)))
-               (handle (cdr (assoc 'acct account)))
-               (name (cdr (assoc 'username account))))
-          (if id
-              (let ((response
-                     (mastodon-http--post
-                      (concat
-                       (mastodon-http--api "follow_requests")
-                       (format "/%s/authorize" id))
-                      nil nil)))
-                (mastodon-http--triage response
-                                       (lambda ()
-                                         (mastodon-notifications--get)
-                                         (message "Follow request of %s (@%s) accepted!"
-                                                  name handle))))
-            (message "No account result at point?")))
+          (let* ((account (cdr (assoc 'account toot-json)))
+                 (id (cdr (assoc 'id account)))
+                 (handle (cdr (assoc 'acct account)))
+                 (name (cdr (assoc 'username account))))
+            (if id
+                (let ((response
+                       (mastodon-http--post
+                        (concat
+                         (mastodon-http--api "follow_requests")
+                         (format "/%s/authorize" id))
+                        nil nil)))
+                  (mastodon-http--triage response
+                                         (lambda ()
+                                           (mastodon-notifications--get)
+                                           (message "Follow request of %s (@%s) accepted!"
+                                                    name handle))))
+              (message "No account result at point?")))
         (message "No follow request at point?")))))
 
 (defun mastodon-notifications--follow-request-reject-notifs ()
@@ -106,23 +106,23 @@
     (let* ((toot-json (mastodon-tl--property 'toot-json))
            (f-req-p (string= "follow_request" (cdr (assoc 'type toot-json)))))
       (if f-req-p
-        (let* ((account (cdr (assoc 'account toot-json)))
-               (id (cdr (assoc 'id account)))
-               (handle (cdr (assoc 'acct account)))
-               (name (cdr (assoc 'username account))))
-          (if id
-              (let ((response
-                     (mastodon-http--post
-                      (concat
-                       (mastodon-http--api "follow_requests")
-                       (format "/%s/reject" id))
-                      nil nil)))
-                (mastodon-http--triage response
-                                       (lambda ()
-                                         (mastodon-notifications--get)
-                                         (message "Follow request of %s (@%s) rejected!"
-                                                  name handle))))
-            (message "No account result at point?")))
+          (let* ((account (cdr (assoc 'account toot-json)))
+                 (id (cdr (assoc 'id account)))
+                 (handle (cdr (assoc 'acct account)))
+                 (name (cdr (assoc 'username account))))
+            (if id
+                (let ((response
+                       (mastodon-http--post
+                        (concat
+                         (mastodon-http--api "follow_requests")
+                         (format "/%s/reject" id))
+                        nil nil)))
+                  (mastodon-http--triage response
+                                         (lambda ()
+                                           (mastodon-notifications--get)
+                                           (message "Follow request of %s (@%s) rejected!"
+                                                    name handle))))
+              (message "No account result at point?")))
         (message "No follow request at point?")))))
 
 (defun mastodon-notifications--mention (note)
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 31499ed..b68be6f 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -256,20 +256,20 @@ Returns a list of lists."
   (let* ((car-fields (mapcar 'car fields))
          ;; (cdr-fields (mapcar 'cadr fields))
          ;; (cdr-fields-rendered
-          ;; (list
-           ;; (mapcar (lambda (x)
-                     ;; (mastodon-tl--render-text x nil))
-                   ;; cdr-fields)))
+         ;; (list
+         ;; (mapcar (lambda (x)
+         ;; (mastodon-tl--render-text x nil))
+         ;; cdr-fields)))
          (left-width (car (sort (mapcar 'length car-fields) '>))))
-         ;; (right-width (car (sort (mapcar 'length cdr-fields) '>))))
+    ;; (right-width (car (sort (mapcar 'length cdr-fields) '>))))
     (mapconcat (lambda (field)
                  (mastodon-tl--render-text
                   (concat
                    (format "_ %s " (car field))
                    (make-string (- (+ 1 left-width) (length (car field))) ?_)
                    (format " :: %s" (cadr field)))
-                   ;; (make-string (- (+ 1 right-width) (length (cdr field))) ?_)
-                   ;; " |")
+                  ;; (make-string (- (+ 1 right-width) (length (cdr field))) ?_)
+                  ;; " |")
                   field)) ; nil)) ; hack to make links tabstops
                fields "")))
 
@@ -307,7 +307,7 @@ Returns a list of lists."
                         account 'statuses_count)))
          (relationships (mastodon-profile--relationships-get id))
          (followed-by-you (cdr (assoc 'following
-                                  (aref relationships 0))))
+                                      (aref relationships 0))))
          (follows-you (cdr (assoc 'followed_by
                                   (aref relationships 0))))
          (followsp (or (equal follows-you 't) (equal followed-by-you 't)))
@@ -327,9 +327,9 @@ Returns a list of lists."
              (is-followers (string= endpoint-type "followers"))
              (is-following (string= endpoint-type "following"))
              (endpoint-name (cond
-                              (is-statuses "     TOOTS   ")
-                              (is-followers "  FOLLOWERS  ")
-                              (is-following "  FOLLOWING  "))))
+                             (is-statuses "     TOOTS   ")
+                             (is-followers "  FOLLOWERS  ")
+                             (is-following "  FOLLOWING  "))))
         (insert
          "\n"
          (mastodon-profile--image-from-account account)
@@ -382,7 +382,7 @@ Returns a list of lists."
           'success))
         (setq mastodon-tl--update-point (point))
         (mastodon-media--inline-images (point-min) (point))
-         ;; insert pinned toots first
+        ;; insert pinned toots first
         (when (and pinned (equal endpoint-type "statuses"))
           (mastodon-profile--insert-statuses-pinned pinned)
           (setq mastodon-tl--update-point (point))) ;updates to follow pinned toots
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 5f52bb7..cbb452d 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -80,7 +80,7 @@ Returns a nested list containing user handle, display name, and URL."
          (tags-list (mapcar #'mastodon-search--get-hashtag-info
                             tags))
          ;; (status-list (mapcar #'mastodon-search--get-status-info
-                              ;; statuses))
+         ;; statuses))
          (status-ids-list (mapcar 'mastodon-search--get-id-from-status
                                   statuses))
          (toots-list-json (mapcar #'mastodon-search--fetch-full-status-from-id
@@ -97,42 +97,42 @@ Returns a nested list containing user handle, display name, and URL."
                          " ------------\n\n")
                  'success))
         (mapc (lambda (el)
-              (insert (propertize (car el) 'face 'mastodon-display-name-face)
-                      " : \n : "
-                      (propertize (concat "@" (car (cdr el)))
-                                  'face 'mastodon-handle-face
-                                  'mouse-face 'highlight
-		                  'mastodon-tab-stop 'user-handle
-		                  'keymap mastodon-tl--link-keymap
-                                  'mastodon-handle (concat "@" (car (cdr el)))
-		                  'help-echo (concat "Browse user profile of @" (car (cdr el))))
-                      " : \n"
-                      "\n"))
-            user-ids)
-      ;; hashtag results:
-      (insert (mastodon-tl--set-face
-               (concat "\n ------------\n"
-                       " HASHTAGS\n"
-                       " ------------\n\n")
-               'success))
-      (mapc (lambda (el)
-              (insert " : #"
-                      (propertize (car el)
-                                  'mouse-face 'highlight
-                                  'mastodon-tag (car el)
-                                  'mastodon-tab-stop 'hashtag
-                                  'help-echo (concat "Browse tag #" (car el))
-                                  'keymap mastodon-tl--link-keymap)
-                      " : \n\n"))
-            tags-list)
-      ;; status results:
-      (insert (mastodon-tl--set-face
-               (concat "\n ------------\n"
-                       " STATUSES\n"
-                       " ------------\n")
-               'success))
-      (mapc 'mastodon-tl--toot toots-list-json)
-      (goto-char (point-min))))))
+                (insert (propertize (car el) 'face 'mastodon-display-name-face)
+                        " : \n : "
+                        (propertize (concat "@" (car (cdr el)))
+                                    'face 'mastodon-handle-face
+                                    'mouse-face 'highlight
+		                    'mastodon-tab-stop 'user-handle
+		                    'keymap mastodon-tl--link-keymap
+                                    'mastodon-handle (concat "@" (car (cdr el)))
+		                    'help-echo (concat "Browse user profile of @" (car (cdr el))))
+                        " : \n"
+                        "\n"))
+              user-ids)
+        ;; hashtag results:
+        (insert (mastodon-tl--set-face
+                 (concat "\n ------------\n"
+                         " HASHTAGS\n"
+                         " ------------\n\n")
+                 'success))
+        (mapc (lambda (el)
+                (insert " : #"
+                        (propertize (car el)
+                                    'mouse-face 'highlight
+                                    'mastodon-tag (car el)
+                                    'mastodon-tab-stop 'hashtag
+                                    'help-echo (concat "Browse tag #" (car el))
+                                    'keymap mastodon-tl--link-keymap)
+                        " : \n\n"))
+              tags-list)
+        ;; status results:
+        (insert (mastodon-tl--set-face
+                 (concat "\n ------------\n"
+                         " STATUSES\n"
+                         " ------------\n")
+                 'success))
+        (mapc 'mastodon-tl--toot toots-list-json)
+        (goto-char (point-min))))))
 
 (defun mastodon-search--get-user-info (account)
   "Get user handle, display name and account URL from ACCOUNT."
@@ -153,7 +153,7 @@ Returns a nested list containing user handle, display name, and URL."
         (cdr (assoc 'content status))))
 
 (defun mastodon-search--get-id-from-status (status)
-    "Fetch the id from a STATUS returned by a search call to the server.
+  "Fetch the id from a STATUS returned by a search call to the server.
 
 We use this to fetch the complete status from the server."
   (cdr (assoc 'id status)))
@@ -164,7 +164,7 @@ We use this to fetch the complete status from the server."
 This allows us to access the full account etc. details and to
 render them properly."
   (let* ((url (concat mastodon-instance-url "/api/v1/statuses/" (mastodon-tl--as-string id)))
-        (json (mastodon-http--get-json url)))
+         (json (mastodon-http--get-json url)))
     json))
 
 (provide 'mastodon-search)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index e4c179c..d300a09 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -91,10 +91,10 @@ width fonts when rendering HTML text"))
   :type '(boolean :tag "Whether to display user avatars in timelines"))
 
 ;; (defvar mastodon-tl--show-avatars nil
-        ;; (if (version< emacs-version "27.1")
-            ;; (image-type-available-p 'imagemagick)
-          ;; (image-transforms-p))
-  ;; "A boolean value stating whether to show avatars in timelines.")
+;; (if (version< emacs-version "27.1")
+;; (image-type-available-p 'imagemagick)
+;; (image-transforms-p))
+;; "A boolean value stating whether to show avatars in timelines.")
 
 (defvar-local mastodon-tl--update-point nil
   "When updating a mastodon buffer this is where new toots will be inserted.
@@ -463,7 +463,7 @@ START and END are the boundaries of the link in the toot."
          (url-instance (concat "https://"
                                (url-host (url-generic-parse-url url))))
          (maybe-userhandle (if (string= mastodon-instance-url url-instance)
-                               ; if handle is local, then no instance suffix:
+                                        ; if handle is local, then no instance suffix:
                                (buffer-substring-no-properties start end)
                              (mastodon-tl--extract-userhandle-from-url
                               url (buffer-substring-no-properties start end)))))
@@ -652,12 +652,12 @@ message is a link which unhides/hides the main body."
                    (mastodon-tl--render-text spoiler toot))
                   'default))
          (message (concat ;"\n"
-                          " ---------------\n"
-                          " " (mastodon-tl--make-link
-                               (concat "CW: " string)
-                                                      'content-warning)
-                          "\n"
-                          " ---------------\n"))
+                   " ---------------\n"
+                   " " (mastodon-tl--make-link
+                        (concat "CW: " string)
+                        'content-warning)
+                   "\n"
+                   " ---------------\n"))
          (cw (mastodon-tl--set-face message 'mastodon-cw-face)))
     (concat
      cw
@@ -747,10 +747,10 @@ takes a single function. By default it is
     (concat "Poll: \n\n"
             (mapconcat (lambda (option)
                          (progn
-                         (format "Option %s: %s, %s votes.\n"
-                                 (setq option-counter (1+ option-counter))
-                                 (cdr (assoc 'title option))
-                                 (cdr (assoc 'votes_count option)))))
+                           (format "Option %s: %s, %s votes.\n"
+                                   (setq option-counter (1+ option-counter))
+                                   (cdr (assoc 'title option))
+                                   (cdr (assoc 'votes_count option)))))
                        options
                        "\n") "\n")))
 
@@ -764,8 +764,8 @@ takes a single function. By default it is
                      (mastodon-tl--field 'poll toot)))
            (options (mastodon-tl--field 'options poll))
            (options-titles (mapcar (lambda (x)
-                                   (cdr (assoc 'title x)))
-                                 options))
+                                     (cdr (assoc 'title x)))
+                                   options))
            (options-number-seq (number-sequence 1 (length options)))
            (options-numbers (mapcar (lambda(x)
                                       (number-to-string x))
@@ -775,16 +775,16 @@ takes a single function. By default it is
            ;; but also store both as cons cell as cdr, as we need it below
            (candidates (mapcar (lambda (cell)
                                  (cons (format "%s | %s" (car cell) (cdr cell))
-                                        cell))
+                                       cell))
                                options-alist)))
       (if (null (mastodon-tl--field 'poll (mastodon-tl--property 'toot-json)))
           (message "No poll here.")
         ;; var "option" = just the cdr, a cons of option number and desc
         (cdr (assoc
               (completing-read "Poll option to vote for: "
-                         candidates
-                         nil ; (predicate)
-                         t) ; require match
+                               candidates
+                               nil ; (predicate)
+                               t) ; require match
               candidates))))))
   (if (null (mastodon-tl--field 'poll (mastodon-tl--property 'toot-json)))
       (message "No poll here.")
@@ -961,7 +961,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/follow" user-id))))
@@ -983,7 +983,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/unfollow" user-id))))
@@ -1006,7 +1006,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/mute" user-id))))
@@ -1026,7 +1026,7 @@ webapp"
            (mutes-json (mastodon-http--get-json mutes-url))
            (muted-accts (mapcar (lambda (muted)
                                   (cdr (assoc 'acct muted)))
-                                  mutes-json)))
+                                mutes-json)))
       (completing-read "Handle of user to unmute: "
                        muted-accts
                        nil ; predicate
@@ -1055,7 +1055,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/block" user-id))))
@@ -1074,7 +1074,7 @@ webapp"
     (let* ((blocks-url (mastodon-http--api (format "blocks")))
            (blocks-json (mastodon-http--get-json blocks-url))
            (blocked-accts (mapcar (lambda (blocked)
-                                  (cdr (assoc 'acct blocked)))
+                                    (cdr (assoc 'acct blocked)))
                                   blocks-json)))
       (completing-read "Handle of user to unblock: "
                        blocked-accts
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 07b52e3..22eb626 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -184,9 +184,9 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
   "Take ACTION on toot at point, then execute CALLBACK."
   (let* ((id (mastodon-tl--property 'base-toot-id))
          (url (mastodon-http--api (concat "statuses/"
-                                         (mastodon-tl--as-string id)
-                                         "/"
-                                         action))))
+                                          (mastodon-tl--as-string id)
+                                          "/"
+                                          action))))
     (let ((response (mastodon-http--post url nil nil)))
       (mastodon-http--triage response callback))))
 
@@ -312,7 +312,7 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
                (with-current-buffer response
                  (let* ((json-response (mastodon-http--process-json))
                         (content (cdr (assoc 'text json-response))))
-                        ;; (media (cdr (assoc 'media_attachments json-response))))
+                   ;; (media (cdr (assoc 'media_attachments json-response))))
                    (mastodon-toot--compose-buffer nil nil)
                    (goto-char (point-max))
                    (insert content)
@@ -338,8 +338,8 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
                      (format "Toot already bookmarked. Remove? ")
                    (format "Bookmark this toot? ")))
          (message (if (equal bookmarked t)
-                       "Bookmark removed!"
-                     "Toot bookmarked!")))
+                      "Bookmark removed!"
+                    "Toot bookmarked!")))
     (when (y-or-n-p prompt)
       (let ((response (mastodon-http--post url nil nil)))
         (mastodon-http--triage response
@@ -496,10 +496,10 @@ eg. \"feduser@fed.social\" -> \"feduser@fed.social\"."
   "Extract mentions from STATUS and process them into a string."
   (interactive)
   (let* ((boosted (mastodon-tl--field 'reblog status))
-        (mentions
-         (if boosted
-             (cdr (assoc 'mentions (cdr (assoc 'reblog status))))
-           (cdr (assoc 'mentions status)))))
+         (mentions
+          (if boosted
+              (cdr (assoc 'mentions (cdr (assoc 'reblog status))))
+            (cdr (assoc 'mentions status)))))
     (mapconcat (lambda(x) (mastodon-toot--process-local
                            (cdr (assoc 'acct x))))
                ;; reverse does not work on vectors in 24.5
@@ -534,19 +534,19 @@ The prefix can match against both user handles and display names."
 
 (defun mastodon-toot--mentions-completion (command &optional arg &rest ignored)
   "A company completion backend for toot mentions."
-   (interactive (list 'interactive))
-   (cl-case command
-     (interactive (company-begin-backend 'mastodon-toot--mentions-completion))
-     (prefix (when (and (bound-and-true-p mastodon-toot-mode) ; if masto toot minor mode
-                        (save-excursion
-                          (forward-whitespace -1)
-                          (forward-whitespace 1)
-                          (looking-at "@")))
-               ;; @ + thing before point
-               (concat "@" (company-grab-symbol))))
-     (candidates (mastodon-toot--mentions-company-candidates arg))
-     (annotation (mastodon-toot--mentions-company-annotation arg))
-     (meta (mastodon-toot--mentions-company-meta arg))))
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'mastodon-toot--mentions-completion))
+    (prefix (when (and (bound-and-true-p mastodon-toot-mode) ; if masto toot minor mode
+                       (save-excursion
+                         (forward-whitespace -1)
+                         (forward-whitespace 1)
+                         (looking-at "@")))
+              ;; @ + thing before point
+              (concat "@" (company-grab-symbol))))
+    (candidates (mastodon-toot--mentions-company-candidates arg))
+    (annotation (mastodon-toot--mentions-company-annotation arg))
+    (meta (mastodon-toot--mentions-company-meta arg))))
 
 (defun mastodon-toot--reply ()
   "Reply to toot at `point'."
@@ -803,38 +803,38 @@ REPLY-JSON is the full JSON of the toot being replied to."
   "Update the status fields in the header based on the current state."
   (ignore-errors  ;; called from after-change-functions so let's not leak errors
     (let ((inhibit-read-only t)
-         (header-region (mastodon-tl--find-property-range 'toot-post-header
+          (header-region (mastodon-tl--find-property-range 'toot-post-header
+                                                           (point-min)))
+          (count-region (mastodon-tl--find-property-range 'toot-post-counter
                                                           (point-min)))
-         (count-region (mastodon-tl--find-property-range 'toot-post-counter
+          (visibility-region (mastodon-tl--find-property-range
+                              'toot-post-visibility (point-min)))
+          (nsfw-region (mastodon-tl--find-property-range 'toot-post-nsfw-flag
                                                          (point-min)))
-         (visibility-region (mastodon-tl--find-property-range
-                             'toot-post-visibility (point-min)))
-         (nsfw-region (mastodon-tl--find-property-range 'toot-post-nsfw-flag
-                                                        (point-min)))
-         (cw-region (mastodon-tl--find-property-range 'toot-post-cw-flag
-                                                      (point-min))))
-     (add-text-properties (car count-region) (cdr count-region)
-                          (list 'display
-                                (format "%s/%s characters"
-                                        (- (point-max) (cdr header-region))
-                                        mastodon-toot--max-toot-chars)))
-     (add-text-properties (car visibility-region) (cdr visibility-region)
-                         (list 'display
-                               (format "Visibility: %s"
-                                       (if (equal
-                                            mastodon-toot--visibility
-                                            "private")
-                                           "followers-only"
-                                         mastodon-toot--visibility))))
-     (add-text-properties (car nsfw-region) (cdr nsfw-region)
-                          (list 'display (if mastodon-toot--content-nsfw
-                                             (if mastodon-toot--media-attachments
-                                                 "NSFW" "NSFW (no effect until attachments added)")
-                                           "")
-                                'face 'mastodon-cw-face))
-     (add-text-properties (car cw-region) (cdr cw-region)
-                          (list 'invisible (not mastodon-toot--content-warning)
-                                'face 'mastodon-cw-face)))))
+          (cw-region (mastodon-tl--find-property-range 'toot-post-cw-flag
+                                                       (point-min))))
+      (add-text-properties (car count-region) (cdr count-region)
+                           (list 'display
+                                 (format "%s/%s characters"
+                                         (- (point-max) (cdr header-region))
+                                         mastodon-toot--max-toot-chars)))
+      (add-text-properties (car visibility-region) (cdr visibility-region)
+                           (list 'display
+                                 (format "Visibility: %s"
+                                         (if (equal
+                                              mastodon-toot--visibility
+                                              "private")
+                                             "followers-only"
+                                           mastodon-toot--visibility))))
+      (add-text-properties (car nsfw-region) (cdr nsfw-region)
+                           (list 'display (if mastodon-toot--content-nsfw
+                                              (if mastodon-toot--media-attachments
+                                                  "NSFW" "NSFW (no effect until attachments added)")
+                                            "")
+                                 'face 'mastodon-cw-face))
+      (add-text-properties (car cw-region) (cdr cw-region)
+                           (list 'invisible (not mastodon-toot--content-warning)
+                                 'face 'mastodon-cw-face)))))
 
 (defun mastodon-toot--compose-buffer (reply-to-user reply-to-id &optional reply-json)
   "Create a new buffer to capture text for a new toot.
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index d405bed..826787a 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -204,8 +204,8 @@ Use. e.g. \"%c\" for your locale's date and time format."
                     "favourites"
                     "search"))
          (buffer (cl-some (lambda (el)
-                           (get-buffer (concat "*mastodon-" el "*")))
-                         tls))) ; return first buff that exists
+                            (get-buffer (concat "*mastodon-" el "*")))
+                          tls))) ; return first buff that exists
     (if buffer
         (switch-to-buffer buffer)
       (mastodon-tl--get-home-timeline)
diff --git a/test/mastodon-auth-tests.el b/test/mastodon-auth-tests.el
index 7daa4db..69c34a4 100644
--- a/test/mastodon-auth-tests.el
+++ b/test/mastodon-auth-tests.el
@@ -45,10 +45,10 @@
   "Should generate token and return JSON response."
   (with-temp-buffer
     (with-mock
-      (mock (mastodon-auth--generate-token) => (progn
-                                                  (insert "\n\n{\"access_token\":\"abcdefg\"}")
-                                                  (current-buffer)))
-      (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
+     (mock (mastodon-auth--generate-token) => (progn
+                                                (insert "\n\n{\"access_token\":\"abcdefg\"}")
+                                                (current-buffer)))
+     (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
 
 (ert-deftest access-token-found ()
   "Should return value in `mastodon-auth--token-alist' if found."
@@ -61,6 +61,6 @@
   (let ((mastodon-instance-url "https://instance.url")
         (mastodon-auth--token nil))
     (with-mock
-      (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
-      (should (string= (mastodon-auth--access-token) "foobaz"))
-      (should (equal mastodon-auth--token-alist '(("https://instance.url" . "foobaz")))))))
+     (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
+     (should (string= (mastodon-auth--access-token) "foobaz"))
+     (should (equal mastodon-auth--token-alist '(("https://instance.url" . "foobaz")))))))
diff --git a/test/mastodon-client-tests.el b/test/mastodon-client-tests.el
index dfe175b..d7f750d 100644
--- a/test/mastodon-client-tests.el
+++ b/test/mastodon-client-tests.el
@@ -17,30 +17,30 @@
   "Should return client registration JSON."
   (with-temp-buffer
     (with-mock
-      (mock (mastodon-client--register) => (progn
-                                                   (insert "\n\n{\"foo\":\"bar\"}")
-                                                   (current-buffer)))
-      (should (equal (mastodon-client--fetch) '(:foo "bar"))))))
+     (mock (mastodon-client--register) => (progn
+                                            (insert "\n\n{\"foo\":\"bar\"}")
+                                            (current-buffer)))
+     (should (equal (mastodon-client--fetch) '(:foo "bar"))))))
 
 (ert-deftest store-1 ()
   "Should return the client plist."
   (let ((mastodon-instance-url "http://mastodon.example")
         (plist '(:client_id "id" :client_secret "secret")))
     (with-mock
-      (mock (mastodon-client--token-file) => "stubfile.plstore")
-      (mock (mastodon-client--fetch) => '(:client_id "id" :client_secret "secret"))
-      (let* ((plstore (plstore-open "stubfile.plstore"))
-             (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
-        (should (equal (mastodon-client--store) plist))))))
+     (mock (mastodon-client--token-file) => "stubfile.plstore")
+     (mock (mastodon-client--fetch) => '(:client_id "id" :client_secret "secret"))
+     (let* ((plstore (plstore-open "stubfile.plstore"))
+            (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
+       (should (equal (mastodon-client--store) plist))))))
 
 (ert-deftest store-2 ()
-   "Should store client in `mastodon-client--token-file'."
-   (let* ((mastodon-instance-url "http://mastodon.example")
-          (plstore (plstore-open "stubfile.plstore"))
-          (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
-     (plstore-close plstore)
-     (should (string= (plist-get client :client_id) "id"))
-     (should (string= (plist-get client :client_secret) "secret"))))
+  "Should store client in `mastodon-client--token-file'."
+  (let* ((mastodon-instance-url "http://mastodon.example")
+         (plstore (plstore-open "stubfile.plstore"))
+         (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
+    (plstore-close plstore)
+    (should (string= (plist-get client :client_id) "id"))
+    (should (string= (plist-get client :client_secret) "secret"))))
 
 (ert-deftest read-finds-match ()
   "Should return mastodon client from `mastodon-token-file' if it exists."
@@ -60,8 +60,8 @@
 (ert-deftest read-empty-store ()
   "Should return nil if mastodon client is not present in the plstore."
   (with-mock
-    (mock (mastodon-client--token-file) => "fixture/empty.plstore")
-    (should (equal (mastodon-client--read) nil))))
+   (mock (mastodon-client--token-file) => "fixture/empty.plstore")
+   (should (equal (mastodon-client--read) nil))))
 
 (ert-deftest client-set-and-matching ()
   "Should return `mastondon-client' if `mastodon-client--client-details-alist' is non-nil and instance url is included."
@@ -75,29 +75,29 @@
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist '(("http://other.example" :wrong))))
     (with-mock
-      (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
-      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
-      (should (equal mastodon-client--client-details-alist
-                     '(("http://mastodon.example" :client_id "foo" :client_secret "bar")
-                       ("http://other.example" :wrong)))))))
+     (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
+     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
+     (should (equal mastodon-client--client-details-alist
+                    '(("http://mastodon.example" :client_id "foo" :client_secret "bar")
+                      ("http://other.example" :wrong)))))))
 
 (ert-deftest client-unset ()
   "Should read from `mastodon-token-file' if available."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
     (with-mock
-      (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
-      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
-      (should (equal mastodon-client--client-details-alist
-                     '(("http://mastodon.example" :client_id "foo" :client_secret "bar")))))))
+     (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
+     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
+     (should (equal mastodon-client--client-details-alist
+                    '(("http://mastodon.example" :client_id "foo" :client_secret "bar")))))))
 
 (ert-deftest client-unset-and-not-in-storage ()
   "Should store client data in plstore if it can't be read."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
     (with-mock
-      (mock (mastodon-client--read))
-      (mock (mastodon-client--store) => '(:client_id "foo" :client_secret "baz"))
-      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "baz")))
-      (should (equal mastodon-client--client-details-alist
-                     '(("http://mastodon.example" :client_id "foo" :client_secret "baz")))))))
+     (mock (mastodon-client--read))
+     (mock (mastodon-client--store) => '(:client_id "foo" :client_secret "baz"))
+     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "baz")))
+     (should (equal mastodon-client--client-details-alist
+                    '(("http://mastodon.example" :client_id "foo" :client_secret "baz")))))))
diff --git a/test/mastodon-http-tests.el b/test/mastodon-http-tests.el
index d0f715e..03d4f94 100644
--- a/test/mastodon-http-tests.el
+++ b/test/mastodon-http-tests.el
@@ -4,6 +4,6 @@
   "Should make a `url-retrieve' of the given URL."
   (let ((callback-double (lambda () "double")))
     (with-mock
-      (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
-      (mock (mastodon-auth--access-token) => "test-token")
-      (mastodon-http--get "https://foo.bar/baz"))))
+     (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
+     (mock (mastodon-auth--access-token) => "test-token")
+     (mastodon-http--get "https://foo.bar/baz"))))
diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index 20993f9..b537dfe 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -3,143 +3,143 @@
 (ert-deftest mastodon-media:get-avatar-rendering ()
   "Should return text with all expected properties."
   (with-mock
-    (mock (image-type-available-p 'imagemagick) => t)
-    (mock (create-image * (when (version< emacs-version "27.1") 'imagemagick) t :height 123) => :mock-image)
-
-    (let* ((mastodon-media--avatar-height 123)
-           (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
-           (result-no-properties (substring-no-properties result))
-           (properties (text-properties-at 0 result)))
-      (should (string= "  " result-no-properties))
-      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
-      (should (eq 'needs-loading (plist-get properties 'media-state)))
-      (should (eq 'avatar (plist-get properties 'media-type)))
-      (should (eq :mock-image (plist-get properties 'display))))))
+   (mock (image-type-available-p 'imagemagick) => t)
+   (mock (create-image * (when (version< emacs-version "27.1") 'imagemagick) t :height 123) => :mock-image)
+
+   (let* ((mastodon-media--avatar-height 123)
+          (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
+          (result-no-properties (substring-no-properties result))
+          (properties (text-properties-at 0 result)))
+     (should (string= "  " result-no-properties))
+     (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+     (should (eq 'needs-loading (plist-get properties 'media-state)))
+     (should (eq 'avatar (plist-get properties 'media-type)))
+     (should (eq :mock-image (plist-get properties 'display))))))
 
 (ert-deftest mastodon-media:get-media-link-rendering ()
   "Should return text with all expected properties."
   (with-mock
-    (mock (create-image * nil t) => :mock-image)
-
-    (let* ((mastodon-media--preview-max-height 123)
-           (result (mastodon-media--get-media-link-rendering "http://example.org/img.png"))
-           (result-no-properties (substring-no-properties result))
-           (properties (text-properties-at 0 result)))
-      (should (string= "[img] " result-no-properties))
-      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
-      (should (eq 'needs-loading (plist-get properties 'media-state)))
-      (should (eq 'media-link (plist-get properties 'media-type)))
-      (should (eq :mock-image (plist-get properties 'display))))))
+   (mock (create-image * nil t) => :mock-image)
+
+   (let* ((mastodon-media--preview-max-height 123)
+          (result (mastodon-media--get-media-link-rendering "http://example.org/img.png"))
+          (result-no-properties (substring-no-properties result))
+          (properties (text-properties-at 0 result)))
+     (should (string= "[img] " result-no-properties))
+     (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+     (should (eq 'needs-loading (plist-get properties 'media-state)))
+     (should (eq 'media-link (plist-get properties 'media-type)))
+     (should (eq :mock-image (plist-get properties 'display))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image
-             *
-             (when (version< emacs-version "27.1") 'imagemagick)
-             t :height 123) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             url
-             #'mastodon-media--process-image-response
-             `(:my-marker (:height 123) 1 ,url))
-            => :called-as-expected)
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                        ":rest"))
-
-        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+     (mock (image-type-available-p 'imagemagick) => t)
+     (mock (create-image
+            *
+            (when (version< emacs-version "27.1") 'imagemagick)
+            t :height 123) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            url
+            #'mastodon-media--process-image-response
+            `(:my-marker (:height 123) 1 ,url))
+           => :called-as-expected)
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                       ":rest"))
+
+       (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => nil)
-      (mock (create-image * nil t) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             url
-             #'mastodon-media--process-image-response
-             `(:my-marker () 1 ,url))
-            => :called-as-expected)
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                        ":rest"))
-
-        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+     (mock (image-type-available-p 'imagemagick) => nil)
+     (mock (create-image * nil t) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            url
+            #'mastodon-media--process-image-response
+            `(:my-marker () 1 ,url))
+           => :called-as-expected)
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                       ":rest"))
+
+       (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
 (ert-deftest mastodon-media:load-image-from-url:media-link-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image * nil t) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             "http://example.org/image.png"
-             #'mastodon-media--process-image-response
-             '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
-            => :called-as-expected)
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-media-link-rendering url)
-                        ":rest"))
-        (let ((mastodon-media--preview-max-height 321))
-          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+     (mock (image-type-available-p 'imagemagick) => t)
+     (mock (create-image * nil t) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            "http://example.org/image.png"
+            #'mastodon-media--process-image-response
+            '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
+           => :called-as-expected)
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-media-link-rendering url)
+                       ":rest"))
+       (let ((mastodon-media--preview-max-height 321))
+         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:load-image-from-url:media-link-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => nil)
-      (mock (create-image * nil t) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             "http://example.org/image.png"
-             #'mastodon-media--process-image-response
-             '(:my-marker () 5 "http://example.org/image.png"))
-            => :called-as-expected)
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering url)
-                        ":rest"))
-        (let ((mastodon-media--preview-max-height 321))
-          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+     (mock (image-type-available-p 'imagemagick) => nil)
+     (mock (create-image * nil t) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            "http://example.org/image.png"
+            #'mastodon-media--process-image-response
+            '(:my-marker () 5 "http://example.org/image.png"))
+           => :called-as-expected)
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering url)
+                       ":rest"))
+       (let ((mastodon-media--preview-max-height 321))
+         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:load-image-from-url:url-fetching-fails ()
   "Should cope with failures in url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image
-             *
-             (when (version< emacs-version "27.1") 'imagemagick)
-             t :height 123) => '(image foo))
-      (stub url-retrieve => (error "url-retrieve failed"))
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                        ":rest"))
-
-        (should (eq :loading-failed (mastodon-media--load-image-from-url url 'avatar 7 1)))
-        ;; the media state was updated so we won't load this again: 
-        (should (eq 'loading-failed (get-text-property 7 'media-state)))))))
+     (mock (image-type-available-p 'imagemagick) => t)
+     (mock (create-image
+            *
+            (when (version< emacs-version "27.1") 'imagemagick)
+            t :height 123) => '(image foo))
+     (stub url-retrieve => (error "url-retrieve failed"))
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                       ":rest"))
+
+       (should (eq :loading-failed (mastodon-media--load-image-from-url url 'avatar 7 1)))
+       ;; the media state was updated so we won't load this again: 
+       (should (eq 'loading-failed (get-text-property 7 'media-state)))))))
 
 (ert-deftest mastodon-media:process-image-response ()
   "Should process the HTTP response and adjust the source buffer."
   (with-temp-buffer
     (with-mock
-      (let ((source-buffer (current-buffer))
+     (let ((source-buffer (current-buffer))
            used-marker
            saved-marker)
        (insert "start:")
@@ -175,35 +175,35 @@
 (ert-deftest mastodon-media:inline-images ()
   "Should process all media in buffer."
   (with-mock
-    ;; Stub needed for the test setup:
-    (stub create-image => '(image ignored))
-
-    (let (marker-media-link marker-media-link-bad-url marker-false-media marker-avatar)
-      (with-temp-buffer
-        (insert "Some text before\n")
-        (setq marker-media-link (copy-marker (point)))
-        (insert (mastodon-media--get-media-link-rendering "http://example.org/i.jpg")
-                " some more text ")
-        (setq marker-media-link-bad-url (copy-marker (point)))
-        (insert (mastodon-media--get-media-link-rendering "/files/small/missing.png")
-                " some more text ")
-        (setq marker-false-media (copy-marker (point)))
-        (insert
-         ;; text that looks almost like an avatar but lacks the media-url property
-         (propertize "this won't be processed"
-                     'media-state 'needs-loading
-                     'media-type 'avatar)
-         "even more text ")
-        (setq marker-avatar (copy-marker (point)))
-        (insert (mastodon-media--get-avatar-rendering "http://example.org/avatar.png")
-                " end of text")
-        (goto-char (point-min))
-
-        ;; stub for the actual test:
-        (stub mastodon-media--load-image-from-url)
-        (mastodon-media--inline-images (point-min) (point-max))
-
-        (should (eq 'loading (get-text-property marker-media-link 'media-state)))
-        (should (eq 'invalid-url (get-text-property marker-media-link-bad-url 'media-state)))
-        (should (eq 'loading (get-text-property marker-avatar 'media-state)))
-        (should (eq 'needs-loading (get-text-property marker-false-media 'media-state)))))))
+   ;; Stub needed for the test setup:
+   (stub create-image => '(image ignored))
+
+   (let (marker-media-link marker-media-link-bad-url marker-false-media marker-avatar)
+     (with-temp-buffer
+       (insert "Some text before\n")
+       (setq marker-media-link (copy-marker (point)))
+       (insert (mastodon-media--get-media-link-rendering "http://example.org/i.jpg")
+               " some more text ")
+       (setq marker-media-link-bad-url (copy-marker (point)))
+       (insert (mastodon-media--get-media-link-rendering "/files/small/missing.png")
+               " some more text ")
+       (setq marker-false-media (copy-marker (point)))
+       (insert
+        ;; text that looks almost like an avatar but lacks the media-url property
+        (propertize "this won't be processed"
+                    'media-state 'needs-loading
+                    'media-type 'avatar)
+        "even more text ")
+       (setq marker-avatar (copy-marker (point)))
+       (insert (mastodon-media--get-avatar-rendering "http://example.org/avatar.png")
+               " end of text")
+       (goto-char (point-min))
+
+       ;; stub for the actual test:
+       (stub mastodon-media--load-image-from-url)
+       (mastodon-media--inline-images (point-min) (point-max))
+
+       (should (eq 'loading (get-text-property marker-media-link 'media-state)))
+       (should (eq 'invalid-url (get-text-property marker-media-link-bad-url 'media-state)))
+       (should (eq 'loading (get-text-property marker-avatar 'media-state)))
+       (should (eq 'needs-loading (get-text-property marker-false-media 'media-state)))))))
diff --git a/test/mastodon-notifications-test.el b/test/mastodon-notifications-test.el
index 778d350..3047ae6 100644
--- a/test/mastodon-notifications-test.el
+++ b/test/mastodon-notifications-test.el
@@ -185,8 +185,8 @@
   "Ensure get request format for notifictions is accurate."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
-      (mastodon-notifications--get))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
+     (mastodon-notifications--get))))
 
 (defun mastodon-notifications--test-type (fun sample)
   "Test notification draw functions.
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 24de5d0..4edf5d5 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -114,19 +114,19 @@
 (ert-deftest as-string-1 ()
   "Should accept a string or number and return a string."
   (let ((id "1000"))
-      (should (string= (mastodon-tl--as-string id) id))))
+    (should (string= (mastodon-tl--as-string id) id))))
 
 (ert-deftest as-string-2 ()
   "Should accept a string or number and return a string."
   (let ((id 1000))
-      (should (string= (mastodon-tl--as-string id) (number-to-string id)))))
+    (should (string= (mastodon-tl--as-string id) (number-to-string id)))))
 
 (ert-deftest more-json ()
   "Should request toots older than max_id."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
-      (mastodon-tl--more-json "timelines/foo" 12345))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+     (mastodon-tl--more-json "timelines/foo" 12345))))
 
 (ert-deftest more-json-id-string ()
   "Should request toots older than max_id.
@@ -135,8 +135,8 @@
 a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
-      (mastodon-tl--more-json "timelines/foo" "12345"))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+     (mastodon-tl--more-json "timelines/foo" "12345"))))
 
 (ert-deftest update-json-id-string ()
   "Should request toots more recent than since_id.
@@ -145,8 +145,8 @@ a string or a numeric."
 a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
-      (mastodon-tl--updated-json "timelines/foo" "12345"))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
+     (mastodon-tl--updated-json "timelines/foo" "12345"))))
 
 (ert-deftest mastodon-tl--relative-time-description ()
   "Should format relative time as expected"
@@ -156,10 +156,10 @@ a string or a numeric."
               (weeks (n) (* n (days 7)))
               (years (n) (* n (days 365)))
               (format-seconds-since (seconds)
-                                    (let ((timestamp (time-subtract (current-time) (seconds-to-time seconds))))
-                                      (mastodon-tl--relative-time-description timestamp)))
+                (let ((timestamp (time-subtract (current-time) (seconds-to-time seconds))))
+                  (mastodon-tl--relative-time-description timestamp)))
               (check (seconds expected)
-                     (should (string= (format-seconds-since seconds) expected))))
+                (should (string= (format-seconds-since seconds) expected))))
     (check 1 "less than a minute ago")
     (check 59 "less than a minute ago")
     (check 60 "one minute ago")
@@ -195,33 +195,33 @@ a string or a numeric."
                 (weeks (n) (* n (days 7)))
                 (years (n) (* n (days 365.25)))
                 (next-update (seconds-ago)
-                             (let* ((timestamp (time-subtract current-time
-                                                              (seconds-to-time seconds-ago))))
-                               (cdr (mastodon-tl--relative-time-details timestamp current-time))))
+                  (let* ((timestamp (time-subtract current-time
+                                                   (seconds-to-time seconds-ago))))
+                    (cdr (mastodon-tl--relative-time-details timestamp current-time))))
                 (check (seconds-ago)
-                       (let* ((timestamp (time-subtract current-time (seconds-to-time seconds-ago)))
-                              (at-now (mastodon-tl--relative-time-description timestamp current-time))
-                              (at-one-second-before (mastodon-tl--relative-time-description
-                                                     timestamp
-                                                     (time-subtract (next-update seconds-ago)
-                                                                    (seconds-to-time 1))))
-                              (at-result (mastodon-tl--relative-time-description
-                                          timestamp
-                                          (next-update seconds-ago))))
-                         (when nil  ;; change to t to debug test failures
-                           (prin1 (format "\nFor %s: %s / %s"
-                                          seconds-ago
-                                          (time-to-seconds
-                                           (time-subtract (next-update seconds-ago)
-                                                          timestamp))
-                                          (round
-                                           (time-to-seconds
-                                            (time-subtract (next-update seconds-ago)
-                                                           current-time))))))
-                         ;; a second earlier the description is the same as at current time
-                         (should (string= at-now at-one-second-before))
-                         ;; but at the result time it is different
-                         (should-not (string= at-one-second-before at-result)))))
+                  (let* ((timestamp (time-subtract current-time (seconds-to-time seconds-ago)))
+                         (at-now (mastodon-tl--relative-time-description timestamp current-time))
+                         (at-one-second-before (mastodon-tl--relative-time-description
+                                                timestamp
+                                                (time-subtract (next-update seconds-ago)
+                                                               (seconds-to-time 1))))
+                         (at-result (mastodon-tl--relative-time-description
+                                     timestamp
+                                     (next-update seconds-ago))))
+                    (when nil  ;; change to t to debug test failures
+                      (prin1 (format "\nFor %s: %s / %s"
+                                     seconds-ago
+                                     (time-to-seconds
+                                      (time-subtract (next-update seconds-ago)
+                                                     timestamp))
+                                     (round
+                                      (time-to-seconds
+                                       (time-subtract (next-update seconds-ago)
+                                                      current-time))))))
+                    ;; a second earlier the description is the same as at current time
+                    (should (string= at-now at-one-second-before))
+                    ;; but at the result time it is different
+                    (should-not (string= at-one-second-before at-result)))))
       (check 0)
       (check 1)
       (check 59)
@@ -253,39 +253,39 @@ a string or a numeric."
   (let ((mastodon-tl--show-avatars-p nil)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (let ((byline (mastodon-tl--byline mastodon-tl-test-base-toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-	    (handle-location 20))
-	(should (string= (substring-no-properties
-			  byline)
-			 "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (let ((byline (mastodon-tl--byline mastodon-tl-test-base-toot
+                                        'mastodon-tl--byline-author
+                                        'mastodon-tl--byline-boosted))
+	   (handle-location 20))
+       (should (string= (substring-no-properties
+			 byline)
+			"Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 "))
-	(should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
-                    'user-handle))
-        (should (string= (get-text-property handle-location 'mastodon-handle byline)
-                         "@acct42@example.space"))
-	(should (equal (get-text-property handle-location 'help-echo byline)
-                   "Browse user profile of @acct42@example.space"))))))
+       (should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
+                   'user-handle))
+       (should (string= (get-text-property handle-location 'mastodon-handle byline)
+                        "@acct42@example.space"))
+       (should (equal (get-text-property handle-location 'help-echo byline)
+                      "Browse user profile of @acct42@example.space"))))))
 
 (ert-deftest mastodon-tl--byline-regular-with-avatar ()
   "Should format the regular toot correctly."
   (let ((mastodon-tl--show-avatars-p t)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-      (stub create-image => '(image "fake data"))
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline mastodon-tl-test-base-toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (stub create-image => '(image "fake data"))
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline mastodon-tl-test-base-toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -295,14 +295,14 @@ a string or a numeric."
          (toot (cons '(reblogged . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -312,14 +312,14 @@ a string or a numeric."
          (toot (cons '(favourited . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -330,14 +330,14 @@ a string or a numeric."
          (toot `((favourited . t) (reblogged . t) ,@mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -349,31 +349,31 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-      ;; We don't expect to use the toot's timestamp but the timestamp of the
-      ;; reblogged toot:
-      (mock (date-to-time timestamp) => '(1 2))
-      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-      (mock (date-to-time original-timestamp) => '(3 4))
-      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-      (let ((byline (mastodon-tl--byline toot
-					 'mastodon-tl--byline-author
-					 'mastodon-tl--byline-boosted))
-	    (handle1-location 20)
-	    (handle2-location 65))
-	(should (string= (substring-no-properties byline)
-			 "Account 42 (@acct42@example.space)
+     ;; We don't expect to use the toot's timestamp but the timestamp of the
+     ;; reblogged toot:
+     (mock (date-to-time timestamp) => '(1 2))
+     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+     (mock (date-to-time original-timestamp) => '(3 4))
+     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+     (let ((byline (mastodon-tl--byline toot
+					'mastodon-tl--byline-author
+					'mastodon-tl--byline-boosted))
+	   (handle1-location 20)
+	   (handle2-location 65))
+       (should (string= (substring-no-properties byline)
+			"Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 "))
-	(should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
-                'user-handle))
-	(should (equal (get-text-property handle1-location 'help-echo byline)
-		       "Browse user profile of @acct42@example.space"))
-	(should (eq (get-text-property handle2-location 'mastodon-tab-stop byline)
-                'user-handle))
-	(should (equal (get-text-property handle2-location 'help-echo byline)
-                   "Browse user profile of @acct43@example.space"))))))
+       (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
+                   'user-handle))
+       (should (equal (get-text-property handle1-location 'help-echo byline)
+		      "Browse user profile of @acct42@example.space"))
+       (should (eq (get-text-property handle2-location 'mastodon-tab-stop byline)
+                   'user-handle))
+       (should (equal (get-text-property handle2-location 'help-echo byline)
+                      "Browse user profile of @acct43@example.space"))))))
 
 (ert-deftest mastodon-tl--byline-reblogged-with-avatars ()
   "Should format the reblogged toot correctly."
@@ -383,19 +383,19 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-      ;; We don't expect to use the toot's timestamp but the timestamp of the
-      ;; reblogged toot:
-      (stub create-image => '(image "fake data"))
-      (mock (date-to-time timestamp) => '(1 2))
-      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-      (mock (date-to-time original-timestamp) => '(3 4))
-      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "Account 42 (@acct42@example.space)
+     ;; We don't expect to use the toot's timestamp but the timestamp of the
+     ;; reblogged toot:
+     (stub create-image => '(image "fake data"))
+     (mock (date-to-time timestamp) => '(1 2))
+     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+     (mock (date-to-time original-timestamp) => '(3 4))
+     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 ")))))
@@ -408,17 +408,17 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-      ;; We don't expect to use the toot's timestamp but the timestamp of the
-      ;; reblogged toot:
-      (mock (date-to-time timestamp) => '(1 2))
-      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-      (mock (date-to-time original-timestamp) => '(3 4))
-      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
+     ;; We don't expect to use the toot's timestamp but the timestamp of the
+     ;; reblogged toot:
+     (mock (date-to-time timestamp) => '(1 2))
+     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+     (mock (date-to-time original-timestamp) => '(3 4))
+     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
                       "(B) (F) Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
@@ -429,17 +429,17 @@ a string or a numeric."
   (let ((mastodon-tl--show-avatars-p nil)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (current-time) => '(22782 22000))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (let* ((formatted-string (mastodon-tl--byline mastodon-tl-test-base-toot
-                                                    'mastodon-tl--byline-author
-                                                    'mastodon-tl--byline-boosted))
-             (timestamp-start (string-match "2999-99-99" formatted-string))
-             (properties (text-properties-at timestamp-start formatted-string)))
-        (should (equal '(22782 21551) (plist-get properties 'timestamp)))
-        (should (string-equal "7 minutes ago" (plist-get properties 'display)))))))
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (current-time) => '(22782 22000))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (let* ((formatted-string (mastodon-tl--byline mastodon-tl-test-base-toot
+                                                   'mastodon-tl--byline-author
+                                                   'mastodon-tl--byline-boosted))
+            (timestamp-start (string-match "2999-99-99" formatted-string))
+            (properties (text-properties-at timestamp-start formatted-string)))
+       (should (equal '(22782 21551) (plist-get properties 'timestamp)))
+       (should (string-equal "7 minutes ago" (plist-get properties 'display)))))))
 
 (ert-deftest mastodon-tl--consider-timestamp-for-updates-no-active-callback ()
   "Should update the timestamp update variables as expected."
@@ -454,33 +454,33 @@ a string or a numeric."
 
       ;; something a later update doesn't update:
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (null mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+       (should (null mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something only shortly sooner doesn't update:
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago" (time-subtract long-in-the-future (seconds-to-time 9))))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago" (time-subtract long-in-the-future (seconds-to-time 9))))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (null mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+       (should (null mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something much sooner, does update
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago"  soon-in-the-future))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago"  soon-in-the-future))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (null mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
+       (should (null mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
       )))
 
 (ert-deftest mastodon-tl--consider-timestamp-for-updates-with-active-callback ()
@@ -496,27 +496,27 @@ a string or a numeric."
 
       ;; something a later update doesn't update:
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (eq 'initial-timer mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+       (should (eq 'initial-timer mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something much sooner, does update
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago"  soon-in-the-future))
-        (mock (cancel-timer 'initial-timer))
-        (mock (run-at-time soon-in-the-future nil
-                           #'mastodon-tl--update-timestamps-callback
-                           (current-buffer) nil) => 'new-timer)
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago"  soon-in-the-future))
+       (mock (cancel-timer 'initial-timer))
+       (mock (run-at-time soon-in-the-future nil
+                          #'mastodon-tl--update-timestamps-callback
+                          (current-buffer) nil) => 'new-timer)
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (eq 'new-timer mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
+       (should (eq 'new-timer mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
       )))
 
 (ert-deftest mastodon-tl--find-property-range--no-tag ()
@@ -769,45 +769,45 @@ constant."
   (let ((now (current-time))
         markers)
     (cl-labels ((insert-timestamp (n)
-                                  (insert (format "\nSome text before timestamp %s:" n))
-                                  (insert (propertize
-                                           (format "timestamp #%s" n)
-                                           'timestamp (time-subtract now (seconds-to-time (* 60 n)))
-                                           'display (format "unset %s" n)))
-                                  (push (copy-marker (point)) markers)
-                                  (insert " some more text.")))
+                  (insert (format "\nSome text before timestamp %s:" n))
+                  (insert (propertize
+                           (format "timestamp #%s" n)
+                           'timestamp (time-subtract now (seconds-to-time (* 60 n)))
+                           'display (format "unset %s" n)))
+                  (push (copy-marker (point)) markers)
+                  (insert " some more text.")))
       (with-temp-buffer
         (cl-dotimes (n 12) (insert-timestamp (+ n 2)))
         (setq markers (nreverse markers))
 
         (with-mock
-          (mock (current-time) => now)
-          (stub run-at-time => 'fake-timer)
-
-          ;; make the initial call
-          (mastodon-tl--update-timestamps-callback (current-buffer) nil)
-          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                           "unset 7" "unset 8" "unset 9" "unset 10" "unset 11" "unset 12" "unset 13")
-                         (tl-tests--property-values-at 'display
-                                                       (tl-tests--all-regions-with-property 'timestamp))))
-
-          ;; fake the follow-up call
-          (mastodon-tl--update-timestamps-callback (current-buffer) (nth 4 markers))
-          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                           "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
-                           "unset 12" "unset 13")
-                         (tl-tests--property-values-at 'display
-                                                       (tl-tests--all-regions-with-property 'timestamp))))
-          (should (null (marker-position (nth 4 markers))))
-
-          ;; fake the follow-up call
-          (mastodon-tl--update-timestamps-callback (current-buffer) (nth 9 markers))
-          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                           "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
-                           "12 minutes ago" "13 minutes ago")
-                         (tl-tests--property-values-at 'display
-                                                       (tl-tests--all-regions-with-property 'timestamp))))
-          (should (null (marker-position (nth 9 markers)))))))))
+         (mock (current-time) => now)
+         (stub run-at-time => 'fake-timer)
+
+         ;; make the initial call
+         (mastodon-tl--update-timestamps-callback (current-buffer) nil)
+         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                          "unset 7" "unset 8" "unset 9" "unset 10" "unset 11" "unset 12" "unset 13")
+                        (tl-tests--property-values-at 'display
+                                                      (tl-tests--all-regions-with-property 'timestamp))))
+
+         ;; fake the follow-up call
+         (mastodon-tl--update-timestamps-callback (current-buffer) (nth 4 markers))
+         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                          "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
+                          "unset 12" "unset 13")
+                        (tl-tests--property-values-at 'display
+                                                      (tl-tests--all-regions-with-property 'timestamp))))
+         (should (null (marker-position (nth 4 markers))))
+
+         ;; fake the follow-up call
+         (mastodon-tl--update-timestamps-callback (current-buffer) (nth 9 markers))
+         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                          "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
+                          "12 minutes ago" "13 minutes ago")
+                        (tl-tests--property-values-at 'display
+                                                      (tl-tests--all-regions-with-property 'timestamp))))
+         (should (null (marker-position (nth 9 markers)))))))))
 
 (ert-deftest mastodon-tl--has-spoiler ()
   "Should be able to detect toots with spoiler text as expected"
@@ -925,13 +925,13 @@ constant."
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-wrong-instance ()
   (should (null (mastodon-tl--extract-hashtag-from-url
-		  "https://example.org/tags/foo"
-		  "https://other.example.org"))))
+		 "https://example.org/tags/foo"
+		 "https://other.example.org"))))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-not-tag ()
   (should (null (mastodon-tl--extract-hashtag-from-url
-		  "https://example.org/@userid"
-		  "https://example.org"))))
+		 "https://example.org/@userid"
+		 "https://example.org"))))
 
 (ert-deftest mastodon-tl--userhandles ()
   "Should recognise iserhandles in a toot and add the required properties to it."
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index 06da870..abc66d0 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -41,6 +41,6 @@
 
 (ert-deftest cancel ()
   (with-mock
-    (mock (kill-buffer-and-window))
-    (mastodon-toot--cancel)
-    (mock-verify)))
+   (mock (kill-buffer-and-window))
+   (mastodon-toot--cancel)
+   (mock-verify)))
-- 
cgit v1.2.3


From d0bf4f196a9a30ea4e19b0b6fa5f9c5bfaf695b3 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Tue, 2 Nov 2021 21:25:18 +0100
Subject: Convert most uses of `(cdr (assoc <some-symbol> <a-list>))` to
 `(alist-get <some-symbol> <a-list>)`

This is more readable and actually more efficient (maybe) since it
uses `eq` rather than `equal` as a test.
---
 lisp/mastodon-async.el         |  2 +-
 lisp/mastodon-auth.el          | 10 ++---
 lisp/mastodon-http.el          | 10 ++---
 lisp/mastodon-notifications.el | 30 +++++++--------
 lisp/mastodon-profile.el       | 62 +++++++++++++++---------------
 lisp/mastodon-search.el        | 26 ++++++-------
 lisp/mastodon-tl.el            | 87 +++++++++++++++++++++---------------------
 lisp/mastodon-toot.el          | 64 +++++++++++++++----------------
 8 files changed, 145 insertions(+), 146 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 1fabee2..1fee9ef 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -305,7 +305,7 @@ Filter the toots using FILTER."
   "Test JSON to see if account is local."
   (not (string-match-p
         "@"
-        (cdr (assoc 'acct (cdr (assoc 'account json)))))))
+        (alist-get 'acct (alist-get 'account json)))))
 
 (defun mastodon-async--output-toot (toot)
   "Process TOOT and prepend it to the async user-facing buffer."
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index b22b51e..e5767f1 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -158,11 +158,11 @@ Handle any errors from the server."
 
 (defun mastodon-auth--get-account-name ()
   "Request user credentials and return an account name."
-  (cdr (assoc
-        'acct
-        (mastodon-http--get-json
-         (mastodon-http--api
-          "accounts/verify_credentials")))))
+  (alist-get
+   'acct
+   (mastodon-http--get-json
+    (mastodon-http--api
+     "accounts/verify_credentials"))))
 
 (defun mastodon-auth--user-acct ()
   "Return a mastodon user acct name."
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 3e27e13..a45b4ed 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -88,7 +88,7 @@ Message status and JSON error from RESPONSE if unsuccessful."
       (progn
         (switch-to-buffer response)
         (let ((json-response (mastodon-http--process-json)))
-          (message "Error %s: %s" status (cdr (assoc 'error json-response))))))))
+          (message "Error %s: %s" status (alist-get 'error json-response)))))))
 
 (defun mastodon-http--read-file-as-string (filename)
   "Read a file FILENAME as a string. Used to generate image preview."
@@ -267,13 +267,13 @@ item uploaded, and `mastodon-toot--update-status-fields' is run."
                (lambda (&key data &allow-other-keys)
                  (when data
                    (progn
-                     (push (cdr (assoc 'id data))
+                     (push (alist-get 'id data)
                            mastodon-toot--media-attachment-ids) ; add ID to list
                      (message "%s file %s with id %S and caption '%s' uploaded!"
-                              (capitalize (cdr (assoc 'type data)))
+                              (capitalize (alist-get 'type data))
                               file
-                              (cdr (assoc 'id data))
-                              (cdr (assoc 'description data)))
+                              (alist-get 'id data)
+                              (alist-get 'description data))
                      (mastodon-toot--update-status-fields)))))
      :error (cl-function
              (lambda (&key error-thrown &allow-other-keys)
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 2430bcc..4437635 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -78,12 +78,12 @@
   (interactive)
   (when (mastodon-tl--find-property-range 'toot-json (point))
     (let* ((toot-json (mastodon-tl--property 'toot-json))
-           (f-req-p (string= "follow_request" (cdr (assoc 'type toot-json)))))
+           (f-req-p (string= "follow_request" (alist-get 'type toot-json))))
       (if f-req-p
-          (let* ((account (cdr (assoc 'account toot-json)))
-                 (id (cdr (assoc 'id account)))
-                 (handle (cdr (assoc 'acct account)))
-                 (name (cdr (assoc 'username account))))
+          (let* ((account (alist-get 'account toot-json))
+                 (id (alist-get 'id account))
+                 (handle (alist-get 'acct account))
+                 (name (alist-get 'username account)))
             (if id
                 (let ((response
                        (mastodon-http--post
@@ -104,12 +104,12 @@
   (interactive)
   (when (mastodon-tl--find-property-range 'toot-json (point))
     (let* ((toot-json (mastodon-tl--property 'toot-json))
-           (f-req-p (string= "follow_request" (cdr (assoc 'type toot-json)))))
+           (f-req-p (string= "follow_request" (alist-get 'type toot-json))))
       (if f-req-p
-          (let* ((account (cdr (assoc 'account toot-json)))
-                 (id (cdr (assoc 'id account)))
-                 (handle (cdr (assoc 'acct account)))
-                 (name (cdr (assoc 'username account))))
+          (let* ((account (alist-get 'account toot-json))
+                 (id (alist-get 'id account))
+                 (handle (alist-get 'acct account))
+                 (name (alist-get 'username account)))
             (if id
                 (let ((response
                        (mastodon-http--post
@@ -127,7 +127,7 @@
 
 (defun mastodon-notifications--mention (note)
   "Format for a `mention' NOTE."
-  (let ((id (cdr (assoc 'id note)))
+  (let ((id (alist-get 'id note))
         (status (mastodon-tl--field 'status note)))
     (mastodon-notifications--insert-status
      status
@@ -156,8 +156,8 @@
 
 (defun mastodon-notifications--follow-request (note)
   "Format for a `follow-request' NOTE."
-  (let ((id (cdr (assoc 'id note)))
-        (follower (cdr (assoc 'username (cdr (assoc 'account note))))))
+  (let ((id (alist-get 'id note))
+        (follower (alist-get 'username (alist-get 'account note))))
     (mastodon-notifications--insert-status
      (cons '(reblog (id . nil)) note)
      (propertize (format "You have a follow request from... %s" follower)
@@ -170,7 +170,7 @@
 
 (defun mastodon-notifications--favourite (note)
   "Format for a `favourite' NOTE."
-  (let ((id (cdr (assoc 'id note)))
+  (let ((id (alist-get 'id note))
         (status (mastodon-tl--field 'status note)))
     (mastodon-notifications--insert-status
      status
@@ -188,7 +188,7 @@
 
 (defun mastodon-notifications--reblog (note)
   "Format for a `boost' NOTE."
-  (let ((id (cdr (assoc 'id note)))
+  (let ((id (alist-get 'id note))
         (status (mastodon-tl--field 'status note)))
     (mastodon-notifications--insert-status
      status
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index b68be6f..c4bec38 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -163,9 +163,9 @@ extra keybindings."
   (interactive)
   (if (mastodon-tl--find-property-range 'toot-json (point))
       (let* ((acct-json (mastodon-profile--toot-json))
-             (id (cdr (assoc 'id acct-json)))
-             (handle (cdr (assoc 'acct acct-json)))
-             (name (cdr (assoc 'username acct-json))))
+             (id (alist-get 'id acct-json))
+             (handle (alist-get 'acct acct-json))
+             (name (alist-get 'username acct-json)))
         (if id
             (let ((response
                    (mastodon-http--post
@@ -185,9 +185,9 @@ extra keybindings."
   (interactive)
   (if (mastodon-tl--find-property-range 'toot-json (point))
       (let* ((acct-json (mastodon-profile--toot-json))
-             (id (cdr (assoc 'id acct-json)))
-             (handle (cdr (assoc 'acct acct-json)))
-             (name (cdr (assoc 'username acct-json))))
+             (id (alist-get 'id acct-json))
+             (handle (alist-get 'acct acct-json))
+             (name (alist-get 'username acct-json)))
         (if id
             (let ((response
                    (mastodon-http--post
@@ -209,8 +209,8 @@ extra keybindings."
                       "/api/v1/accounts/update_credentials"))
          ;; (buffer (mastodon-http--patch url))
          (json (mastodon-http--patch-json url))
-         (source (cdr (assoc 'source json)))
-         (note (cdr (assoc 'note source)))
+         (source (alist-get 'source json))
+         (note (alist-get 'note source))
          (buffer (get-buffer-create "*mastodon-update-profile*"))
          (inhibit-read-only t))
     (switch-to-buffer-other-window buffer)
@@ -247,8 +247,8 @@ Returns a list of lists."
       (mapcar
        (lambda (el)
          (list
-          (cdr (assoc 'name el))
-          (cdr (assoc 'value el))))
+          (alist-get 'name el)
+          (alist-get 'value el)))
        fields))))
 
 (defun mastodon-profile--fields-insert (fields)
@@ -306,10 +306,10 @@ Returns a list of lists."
                        (mastodon-profile--account-field
                         account 'statuses_count)))
          (relationships (mastodon-profile--relationships-get id))
-         (followed-by-you (cdr (assoc 'following
-                                      (aref relationships 0))))
-         (follows-you (cdr (assoc 'followed_by
-                                  (aref relationships 0))))
+         (followed-by-you (alist-get 'following
+                                     (aref relationships 0)))
+         (follows-you (alist-get 'followed_by
+                                 (aref relationships 0)))
          (followsp (or (equal follows-you 't) (equal followed-by-you 't)))
          (fields (mastodon-profile--fields-get account))
          (pinned (mastodon-profile--get-statuses-pinned account)))
@@ -396,11 +396,11 @@ Returns a list of lists."
 If toot is a boost, opens the profile of the booster."
   (interactive)
   (mastodon-profile--make-author-buffer
-   (cdr (assoc 'account (mastodon-profile--toot-json)))))
+   (alist-get 'account (mastodon-profile--toot-json))))
 
 (defun mastodon-profile--image-from-account (status)
   "Generate an image from a STATUS."
-  (let ((url (cdr (assoc 'avatar_static status))))
+  (let ((url (alist-get 'avatar_static status)))
     (unless (equal url "/avatars/original/missing.png")
       (mastodon-media--get-media-link-rendering url))))
 
@@ -443,12 +443,12 @@ FIELD is used to identify regions under 'account"
                       (propertize
                        (mastodon-tl--byline-author `((account . ,toot)))
                        'byline  't
-                       'toot-id (cdr (assoc 'id toot))
+                       'toot-id (alist-get 'id toot)
                        'base-toot-id (mastodon-tl--toot-id toot)
                        'toot-json toot))
               (mastodon-media--inline-images start-pos (point))
               (insert "\n"
-                      (mastodon-tl--render-text (cdr (assoc 'note toot)) nil)
+                      (mastodon-tl--render-text (alist-get 'note toot) nil)
                       "\n")))
           tootv)))
 
@@ -461,7 +461,7 @@ If the handle does not match a search return then retun NIL."
                    handle))
          (matching-account
           (seq-remove
-           (lambda(x) (not (string= (cdr (assoc 'acct x)) handle)))
+           (lambda(x) (not (string= (alist-get 'acct x) handle)))
            (mastodon-http--get-json
             (mastodon-http--api (format "accounts/search?q=%s" handle))))))
     (when (equal 1 (length matching-account))
@@ -477,35 +477,35 @@ If the handle does not match a search return then retun NIL."
 
 These include the author, author of reblogged entries and any user mentioned."
   (when status
-    (let ((this-account (cdr (assoc 'account status)))
-	  (mentions (cdr (assoc 'mentions status)))
-	  (reblog (cdr (assoc 'reblog status))))
+    (let ((this-account (alist-get 'account status))
+	  (mentions (alist-get 'mentions status))
+	  (reblog (alist-get 'reblog status)))
       (seq-filter
        'stringp
        (seq-uniq
         (seq-concatenate
          'list
-         (list (cdr (assoc 'acct this-account)))
+         (list (alist-get 'acct this-account))
          (mastodon-profile--extract-users-handles reblog)
          (mapcar (lambda (mention)
-                   (cdr (assoc 'acct mention)))
+                   (alist-get 'acct mention))
                  mentions)))))))
 
 (defun mastodon-profile--lookup-account-in-status (handle status)
   "Return account for HANDLE using hints in STATUS if possible."
-  (let* ((this-account (cdr (assoc 'account status)))
-         (reblog-account (cdr (assoc 'account (cdr (assoc 'reblog status)))))
+  (let* ((this-account (alist-get 'account status))
+         (reblog-account (alist-get 'account (alist-get 'reblog status)))
          (mention-id (seq-some
                       (lambda (mention)
                         (when (string= handle
-                                       (cdr (assoc 'acct mention)))
-                          (cdr (assoc 'id mention))))
-                      (cdr (assoc 'mentions status)))))
+                                       (alist-get 'acct mention))
+                          (alist-get 'id mention)))
+                      (alist-get 'mentions status))))
     (cond ((string= handle
-                    (cdr (assoc 'acct this-account)))
+                    (alist-get 'acct this-account))
            this-account)
           ((string= handle
-                    (cdr (assoc 'acct reblog-account)))
+                    (alist-get 'acct reblog-account))
            reblog-account)
           (mention-id
            (mastodon-profile--account-from-id mention-id))
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index cbb452d..fcfaec9 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -72,9 +72,9 @@ Returns a nested list containing user handle, display name, and URL."
   (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
          (buffer (format "*mastodon-search-%s*" query))
          (response (mastodon-http--get-search-json url query))
-         (accts (cdr (assoc 'accounts response)))
-         (tags (cdr (assoc 'hashtags response)))
-         (statuses (cdr (assoc 'statuses response)))
+         (accts (alist-get 'accounts response))
+         (tags (alist-get 'hashtags response))
+         (statuses (alist-get 'statuses response))
          (user-ids (mapcar #'mastodon-search--get-user-info
                            accts)) ; returns a list of three-item lists
          (tags-list (mapcar #'mastodon-search--get-hashtag-info
@@ -136,27 +136,27 @@ Returns a nested list containing user handle, display name, and URL."
 
 (defun mastodon-search--get-user-info (account)
   "Get user handle, display name and account URL from ACCOUNT."
-  (list (cdr (assoc 'display_name account))
-        (cdr (assoc 'acct account))
-        (cdr (assoc 'url account))))
+  (list (alist-get 'display_name account)
+        (alist-get 'acct account)
+        (alist-get 'url account)))
 
 (defun mastodon-search--get-hashtag-info (tag)
   "Get hashtag name and URL from TAG."
-  (list (cdr (assoc 'name tag))
-        (cdr (assoc 'url tag))))
+  (list (alist-get 'name tag)
+        (alist-get 'url tag)))
 
 (defun mastodon-search--get-status-info (status)
   "Get ID, timestamp, content, and spoiler from STATUS."
-  (list (cdr (assoc 'id status))
-        (cdr (assoc 'created_at status))
-        (cdr (assoc 'spoiler_text status))
-        (cdr (assoc 'content status))))
+  (list (alist-get 'id status)
+        (alist-get 'created_at status)
+        (alist-get 'spoiler_text status)
+        (alist-get 'content status)))
 
 (defun mastodon-search--get-id-from-status (status)
   "Fetch the id from a STATUS returned by a search call to the server.
 
 We use this to fetch the complete status from the server."
-  (cdr (assoc 'id status)))
+  (alist-get 'id status))
 
 (defun mastodon-search--fetch-full-status-from-id (id)
   "Fetch the full status with id ID from the server.
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index d300a09..cf1c326 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -266,13 +266,13 @@ Optionally start from POS."
 
 (defun mastodon-tl--byline-author (toot)
   "Propertize author of TOOT."
-  (let* ((account (cdr (assoc 'account toot)))
-         (handle (cdr (assoc 'acct account)))
-         (name (if (not (string= "" (cdr (assoc 'display_name account))))
-                   (cdr (assoc 'display_name account))
-                 (cdr (assoc 'username account))))
-         (profile-url (cdr (assoc 'url account)))
-         (avatar-url (cdr (assoc 'avatar account))))
+  (let* ((account (alist-get 'account toot))
+         (handle (alist-get 'acct account))
+         (name (if (not (string= "" (alist-get 'display_name account)))
+                   (alist-get 'display_name account)
+                 (alist-get 'username account)))
+         (profile-url (alist-get 'url account))
+         (avatar-url (alist-get 'avatar account)))
     ;; TODO: Once we have a view for a user (e.g. their posts
     ;; timeline) make this a tab-stop and attach an action
     (concat
@@ -298,7 +298,7 @@ Optionally start from POS."
 
 (defun mastodon-tl--byline-boosted (toot)
   "Add byline for boosted data from TOOT."
-  (let ((reblog (cdr (assoc 'reblog toot))))
+  (let ((reblog (alist-get 'reblog toot)))
     (when reblog
       (concat
        "\n "
@@ -310,8 +310,8 @@ Optionally start from POS."
   "Return FIELD from TOOT.
 
 Return value from boosted content if available."
-  (or (cdr (assoc field (cdr (assoc 'reblog toot))))
-      (cdr (assoc field toot))))
+  (or (alist-get field (alist-get 'reblog toot))
+      (alist-get field toot)))
 
 (defun mastodon-tl--relative-time-details (timestamp &optional current-time)
   "Return cons of (descriptive string . next change) for the TIMESTAMP.
@@ -502,14 +502,14 @@ START and END are the boundaries of the link in the toot."
 
 (defun mastodon-tl--extract-userid-toot (toot acct)
   "Extract a user id for an ACCT from mentions in a TOOT."
-  (let* ((mentions (append (cdr (assoc 'mentions toot)) nil))
+  (let* ((mentions (append (alist-get 'mentions toot) nil))
          (mention (pop mentions))
          (short-acct (substring acct 1 (length acct)))
          return)
     (while mention
-      (when (string= (cdr (assoc 'acct mention))
+      (when (string= (alist-get 'acct mention)
                      short-acct)
-        (setq return (cdr (assoc 'id  mention))))
+        (setq return (alist-get 'id  mention)))
       (setq mention (pop mentions)))
     return))
 
@@ -671,12 +671,12 @@ message is a link which unhides/hides the main body."
          (media-string (mapconcat
                         (lambda (media-attachement)
                           (let ((preview-url
-                                 (cdr (assoc 'preview_url media-attachement)))
+                                 (alist-get 'preview_url media-attachement))
                                 (remote-url
-                                 (if (cdr (assoc 'remote_url media-attachement))
-                                     (cdr (assoc 'remote_url media-attachement))
+                                 (if (alist-get 'remote_url media-attachement)
+                                     (alist-get 'remote_url media-attachement)
                                    ;; fallback b/c notifications don't have remote_url
-                                   (cdr (assoc 'url media-attachement)))))
+                                   (alist-get 'url media-attachement))))
                             (if mastodon-tl--display-media-p
                                 (mastodon-media--get-media-link-rendering
                                  preview-url remote-url) ; 2nd arg for shr-browse-url
@@ -690,10 +690,10 @@ message is a link which unhides/hides the main body."
 (defun mastodon-tl--content (toot)
   "Retrieve text content from TOOT."
   (let* ((content (mastodon-tl--field 'content toot))
-         (reblog (cdr (assoc 'reblog toot)))
+         (reblog (alist-get 'reblog toot))
          (poll-p (if reblog
-                     (cdr (assoc 'poll reblog))
-                   (cdr (assoc 'poll toot)))))
+                     (alist-get 'poll reblog)
+                   (alist-get 'poll toot))))
     (concat
      (when poll-p
        (mastodon-tl--get-poll toot))
@@ -718,18 +718,17 @@ takes a single function. By default it is
               body
               " \n"
               (mastodon-tl--byline toot author-byline action-byline))
-      'toot-id      (cdr (assoc 'id toot))
+      'toot-id      (alist-get 'id toot)
       'base-toot-id (mastodon-tl--toot-id toot)
       'help-echo    (when (and mastodon-tl--buffer-spec
                                (string-match-p
                                 "context" ; when thread view
                                 (plist-get mastodon-tl--buffer-spec 'endpoint)))
-                      (if (alist-get 'reblog toot)
-                          (let ((reblog (cdr (assoc 'reblog toot))))
-                            (format "%s faves | %s boosts | %s replies"
-                                    (alist-get 'favourites_count reblog)
-                                    (alist-get 'reblogs_count reblog)
-                                    (alist-get 'replies_count reblog)))
+                      (if-let ((reblog (alist-get 'reblog toot)))
+                          (format "%s faves | %s boosts | %s replies"
+                                  (alist-get 'favourites_count reblog)
+                                  (alist-get 'reblogs_count reblog)
+                                  (alist-get 'replies_count reblog))
                         (format "%s faves | %s boosts | %s replies"
                                 (alist-get 'favourites_count toot)
                                 (alist-get 'reblogs_count toot)
@@ -749,8 +748,8 @@ takes a single function. By default it is
                          (progn
                            (format "Option %s: %s, %s votes.\n"
                                    (setq option-counter (1+ option-counter))
-                                   (cdr (assoc 'title option))
-                                   (cdr (assoc 'votes_count option)))))
+                                   (alist-get 'title option)
+                                   (alist-get 'votes_count option))))
                        options
                        "\n") "\n")))
 
@@ -759,12 +758,12 @@ takes a single function. By default it is
   (interactive
    (list
     (let* ((toot (mastodon-tl--property 'toot-json))
-           (reblog (cdr (assoc 'reblog toot)))
-           (poll (or (cdr (assoc 'poll reblog))
+           (reblog (alist-get 'reblog toot))
+           (poll (or (alist-get 'poll reblog)
                      (mastodon-tl--field 'poll toot)))
            (options (mastodon-tl--field 'options poll))
            (options-titles (mapcar (lambda (x)
-                                     (cdr (assoc 'title x)))
+                                     (alist-get 'title x))
                                    options))
            (options-number-seq (number-sequence 1 (length options)))
            (options-numbers (mapcar (lambda(x)
@@ -790,7 +789,7 @@ takes a single function. By default it is
       (message "No poll here.")
     (let* ((toot (mastodon-tl--property 'toot-json))
            (poll (mastodon-tl--field 'poll toot))
-           (poll-id (cdr (assoc 'id poll)))
+           (poll-id (alist-get 'id poll))
            (url (mastodon-http--api (format "polls/%s/votes" poll-id)))
            ;; need to zero-index our option:
            (option-as-arg (number-to-string (1- (string-to-number (car option)))))
@@ -916,9 +915,9 @@ If the toot has been boosted use the id found in the
 reblog portion of the toot.  Otherwise, use the body of
 the toot.  This is the same behaviour as the mastodon.social
 webapp"
-  (let ((id (cdr (assoc 'id json)))
-        (reblog (cdr (assoc 'reblog json))))
-    (if reblog (cdr (assoc 'id reblog)) id)))
+  (let ((id (alist-get 'id json))
+        (reblog (alist-get 'reblog json)))
+    (if reblog (alist-get 'id reblog) id)))
 
 
 (defun mastodon-tl--thread ()
@@ -930,10 +929,10 @@ webapp"
          (buffer (format "*mastodon-thread-%s*" id))
          (toot (mastodon-tl--property 'toot-json))
          (context (mastodon-http--get-json url)))
-    (when (member (cdr (assoc 'type toot)) '("reblog" "favourite"))
-      (setq toot (cdr (assoc 'status toot))))
-    (if (> (+ (length (cdr (assoc 'ancestors context)))
-              (length (cdr (assoc 'descendants context))))
+    (when (member (alist-get 'type toot) '("reblog" "favourite"))
+      (setq toot (alist-get 'status toot)))
+    (if (> (+ (length (alist-get 'ancestors context))
+              (length (alist-get 'descendants context)))
            0)
         (with-output-to-temp-buffer buffer
           (switch-to-buffer buffer)
@@ -945,9 +944,9 @@ webapp"
                               (lambda(toot) (message "END of thread."))))
           (let ((inhibit-read-only t))
             (mastodon-tl--timeline (vconcat
-                                    (cdr (assoc 'ancestors context))
+                                    (alist-get 'ancestors context)
                                     `(,toot)
-                                    (cdr (assoc 'descendants context))))))
+                                    (alist-get 'descendants context)))))
       (message "No Thread!"))))
 
 (defun mastodon-tl--follow-user (user-handle)
@@ -1025,7 +1024,7 @@ webapp"
     (let* ((mutes-url (mastodon-http--api (format "mutes")))
            (mutes-json (mastodon-http--get-json mutes-url))
            (muted-accts (mapcar (lambda (muted)
-                                  (cdr (assoc 'acct muted)))
+                                  (alist-get 'acct muted))
                                 mutes-json)))
       (completing-read "Handle of user to unmute: "
                        muted-accts
@@ -1074,7 +1073,7 @@ webapp"
     (let* ((blocks-url (mastodon-http--api (format "blocks")))
            (blocks-json (mastodon-http--get-json blocks-url))
            (blocked-accts (mapcar (lambda (blocked)
-                                    (cdr (assoc 'acct blocked)))
+                                    (alist-get 'acct blocked))
                                   blocks-json)))
       (completing-read "Handle of user to unblock: "
                        blocked-accts
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 22eb626..9acdb2a 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -155,7 +155,7 @@ Valid values are \"direct\", \"private\" (followers-only), \"unlisted\", and \"p
   "Set max_toot_chars returned in JSON-RESPONSE and display in new toot buffer."
   (setq mastodon-toot--max-toot-chars
         (number-to-string
-         (cdr (assoc 'max_toot_chars json-response))))
+         (alist-get 'max_toot_chars json-response)))
   (with-current-buffer "*new toot*"
     (mastodon-toot--update-status-fields)))
 
@@ -246,11 +246,11 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
   (interactive)
   (let* ((toot (mastodon-tl--property 'toot-json))
          (pinnable-p (and
-                      (not (cdr (assoc 'reblog toot)))
-                      (equal (cdr (assoc 'acct
-                                         (cdr (assoc 'account toot))))
+                      (not (alist-get 'reblog toot))
+                      (equal (alist-get 'acct
+                                        (alist-get 'account toot))
                              (mastodon-auth--user-acct))))
-         (pinned-p (equal (cdr (assoc 'pinned toot)) t))
+         (pinned-p (equal (alist-get 'pinned toot) t))
          (action (if pinned-p "unpin" "pin"))
          (msg (if pinned-p "unpinned" "pinned"))
          (msg-y-or-n (if pinned-p "Unpin" "Pin")))
@@ -266,8 +266,8 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
   (interactive)
   (let* ((toot (mastodon-tl--property 'toot-json))
          (url (if (mastodon-tl--field 'reblog toot)
-                  (cdr (assoc 'url (cdr (assoc 'reblog toot))))
-                (cdr (assoc 'url toot)))))
+                  (alist-get 'url (alist-get 'reblog toot))
+                (alist-get 'url toot))))
     (kill-new url)
     (message "Toot URL copied to the clipboard.")))
 
@@ -277,9 +277,9 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
   (let* ((toot (mastodon-tl--property 'toot-json))
          (id (mastodon-tl--as-string (mastodon-tl--toot-id toot)))
          (url (mastodon-http--api (format "statuses/%s" id))))
-    (if (or (cdr (assoc 'reblog toot))
-            (not (equal (cdr (assoc 'acct
-                                    (cdr (assoc 'account toot))))
+    (if (or (alist-get 'reblog toot)
+            (not (equal (alist-get 'acct
+                                   (alist-get 'account toot))
                         (mastodon-auth--user-acct))))
         (message "You can only delete your own toots.")
       (if (y-or-n-p (format "Delete this toot? "))
@@ -296,12 +296,12 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
   (let* ((toot (mastodon-tl--property 'toot-json))
          (id (mastodon-tl--as-string (mastodon-tl--toot-id toot)))
          (url (mastodon-http--api (format "statuses/%s" id)))
-         (toot-cw (cdr (assoc 'spoiler_text toot)))
-         (toot-visibility (cdr (assoc 'visibility toot)))
-         (reply-id (cdr (assoc 'in_reply_to_id toot))))
-    (if (or (cdr (assoc 'reblog toot))
-            (not (equal (cdr (assoc 'acct
-                                    (cdr (assoc 'account toot))))
+         (toot-cw (alist-get 'spoiler_text toot))
+         (toot-visibility (alist-get 'visibility toot))
+         (reply-id (alist-get 'in_reply_to_id toot)))
+    (if (or (alist-get 'reblog toot)
+            (not (equal (alist-get 'acct
+                                   (alist-get 'account toot))
                         (mastodon-auth--user-acct))))
         (message "You can only delete and redraft your own toots.")
       (if (y-or-n-p (format "Delete and redraft this toot? "))
@@ -311,8 +311,8 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
              (lambda ()
                (with-current-buffer response
                  (let* ((json-response (mastodon-http--process-json))
-                        (content (cdr (assoc 'text json-response))))
-                   ;; (media (cdr (assoc 'media_attachments json-response))))
+                        (content (alist-get 'text json-response)))
+                   ;; (media (alist-get 'media_attachments json-response)))
                    (mastodon-toot--compose-buffer nil nil)
                    (goto-char (point-max))
                    (insert content)
@@ -330,7 +330,7 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
   (interactive)
   (let* ((toot (mastodon-tl--property 'toot-json))
          (id (mastodon-tl--as-string (mastodon-tl--toot-id toot)))
-         (bookmarked (cdr (assoc 'bookmarked toot)))
+         (bookmarked (alist-get 'bookmarked toot))
          (url (mastodon-http--api (if (equal bookmarked t)
                                       (format "statuses/%s/unbookmark" id)
                                     (format "statuses/%s/bookmark" id))))
@@ -498,10 +498,10 @@ eg. \"feduser@fed.social\" -> \"feduser@fed.social\"."
   (let* ((boosted (mastodon-tl--field 'reblog status))
          (mentions
           (if boosted
-              (cdr (assoc 'mentions (cdr (assoc 'reblog status))))
-            (cdr (assoc 'mentions status)))))
+              (alist-get 'mentions (alist-get 'reblog status))
+            (alist-get 'mentions status))))
     (mapconcat (lambda(x) (mastodon-toot--process-local
-                           (cdr (assoc 'acct x))))
+                           (alist-get 'acct x)))
                ;; reverse does not work on vectors in 24.5
                (reverse (append mentions nil))
                "")))
@@ -554,12 +554,12 @@ The prefix can match against both user handles and display names."
   (let* ((toot (mastodon-tl--property 'toot-json))
          (id (mastodon-tl--as-string (mastodon-tl--field 'id toot)))
          (account (mastodon-tl--field 'account toot))
-         (user (cdr (assoc 'acct account)))
+         (user (alist-get 'acct account))
          (mentions (mastodon-toot--mentions toot))
          (boosted (mastodon-tl--field 'reblog toot))
          (booster (when boosted
-                    (cdr (assoc 'acct
-                                (cdr (assoc 'account toot)))))))
+                    (alist-get 'acct
+                               (alist-get 'account toot)))))
     (mastodon-toot (when user
                      (if booster
                          (if (and
@@ -634,8 +634,8 @@ The items' ids are added to `mastodon-toot--media-attachment-ids',
 which are used to attach them to a toot after uploading."
   (mapcar (lambda (attachment)
             (let* ((filename (expand-file-name
-                              (cdr (assoc :filename attachment))))
-                   (caption (cdr (assoc :description attachment)))
+                              (alist-get :filename attachment)))
+                   (caption (alist-get :description attachment))
                    (url (concat mastodon-instance-url "/api/v2/media")))
               (message "Uploading %s..." (file-name-nondirectory filename))
               (mastodon-http--post-media-attachment url filename caption)))
@@ -659,14 +659,14 @@ which are used to attach them to a toot after uploading."
                                      (image-transforms-p))
                              `(:height ,mastodon-toot--attachment-height))))
         (mapcan (lambda (attachment)
-                  (let* ((data (cdr (assoc :contents 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))
-                         (type (cdr (assoc :content-type attachment)))
-                         (description (cdr (assoc :description attachment))))
+                         (type (alist-get :content-type attachment))
+                         (description (alist-get :description attachment)))
                     (setq counter (1+ counter))
                     (list (format "\n    %d: " counter)
                           image
@@ -787,8 +787,8 @@ on the status of NSFW, content warning flags, media attachments, etc."
   "If REPLY-TO-USER is provided, inject their handle into the message.
 If REPLY-TO-ID is provided, set `mastodon-toot--reply-to-id'.
 REPLY-JSON is the full JSON of the toot being replied to."
-  (let ((reply-visibility (cdr (assoc 'visibility reply-json)))
-        (reply-cw (cdr (assoc 'spoiler_text reply-json))))
+  (let ((reply-visibility (alist-get 'visibility reply-json))
+        (reply-cw (alist-get 'spoiler_text reply-json)))
     (when reply-to-user
       (insert (format "%s " reply-to-user))
       (setq mastodon-toot--reply-to-id reply-to-id)
-- 
cgit v1.2.3


From 65f80fd810793638beb6f146b25919bca5c21cfc Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Fri, 5 Nov 2021 18:33:16 +0100
Subject: Do a bit if `if` and `progn` sanitizing.

- A `progn` with a single form is redundant
- `when` doesn't need a `progn` body
- `if` has an implicit `progn` for the consequences
- I converted one cascade of `if`s into a `cond`.
---
 lisp/mastodon-async.el   |  7 ++++---
 lisp/mastodon-auth.el    |  1 -
 lisp/mastodon-http.el    | 24 +++++++++++-------------
 lisp/mastodon-profile.el | 11 +++++------
 lisp/mastodon-toot.el    | 29 ++++++++++++++---------------
 5 files changed, 34 insertions(+), 38 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 1fee9ef..524e13d 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -205,9 +205,10 @@ ENPOINT is the endpoint for the stream and timeline."
                              mastodon-instance-url "*"))
         ;; if user stream, we need "timelines/home" not "timelines/user"
         ;; if notifs, we need "notifications" not "timelines/notifications"
-        (endpoint (if (equal name "notifications") "notifications"
-                    (if (equal name "home") "timelines/home"
-                      (format "timelines/%s" endpoint)))))
+        (endpoint (cond
+                   ((equal name "notifications") "notifications")
+                   ((equal name "home") "timelines/home")
+                   (t (format "timelines/%s" endpoint)))))
     (mastodon-async--set-local-variables buffer-name http-buffer
                                          buffer-name queue-name)
     ;; Similar to timeline init. 
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index e5767f1..8d0d7c6 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -136,7 +136,6 @@ Otherwise, generate a token and pass it to
 `mastodon-auth--handle-token-reponse'."
   (if-let ((token (cdr (assoc mastodon-instance-url mastodon-auth--token-alist))))
       token
-
     (mastodon-auth--handle-token-response (mastodon-auth--get-token))))
 
 (defun mastodon-auth--handle-token-response (response)
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index a45b4ed..1ec0dc0 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -85,10 +85,9 @@ Message status and JSON error from RESPONSE if unsuccessful."
                   (mastodon-http--status))))
     (if (string-prefix-p "2" status)
         (funcall success)
-      (progn
-        (switch-to-buffer response)
-        (let ((json-response (mastodon-http--process-json)))
-          (message "Error %s: %s" status (alist-get 'error json-response)))))))
+      (switch-to-buffer response)
+      (let ((json-response (mastodon-http--process-json)))
+        (message "Error %s: %s" status (alist-get 'error json-response))))))
 
 (defun mastodon-http--read-file-as-string (filename)
   "Read a file FILENAME as a string. Used to generate image preview."
@@ -266,15 +265,14 @@ item uploaded, and `mastodon-toot--update-status-fields' is run."
      :success (cl-function
                (lambda (&key data &allow-other-keys)
                  (when data
-                   (progn
-                     (push (alist-get 'id data)
-                           mastodon-toot--media-attachment-ids) ; add ID to list
-                     (message "%s file %s with id %S and caption '%s' uploaded!"
-                              (capitalize (alist-get 'type data))
-                              file
-                              (alist-get 'id data)
-                              (alist-get 'description data))
-                     (mastodon-toot--update-status-fields)))))
+                   (push (alist-get 'id data)
+                         mastodon-toot--media-attachment-ids) ; add ID to list
+                   (message "%s file %s with id %S and caption '%s' uploaded!"
+                            (capitalize (alist-get 'type data))
+                            file
+                            (alist-get 'id data)
+                            (alist-get 'description data))
+                   (mastodon-toot--update-status-fields))))
      :error (cl-function
              (lambda (&key error-thrown &allow-other-keys)
                (cond
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index c4bec38..81ab837 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -349,12 +349,11 @@ Returns a list of lists."
          (mastodon-tl--render-text note account)
          ;; account here to enable tab-stops in profile note
          (if fields
-             (progn
-               (concat "\n"
-                       (mastodon-tl--set-face
-                        (mastodon-profile--fields-insert fields)
-                        'success)
-                       "\n"))
+             (concat "\n"
+                     (mastodon-tl--set-face
+                      (mastodon-profile--fields-insert fields)
+                      'success)
+                     "\n")
            "")
          ;; insert counts
          (mastodon-tl--set-face
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index d5f4d78..885db1d 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -373,21 +373,20 @@ To use the downloaded emoji, run `mastodon-toot--enable-custom-emoji'."
                                             "mastodon-custom-emojis"))))
     (if (not (file-directory-p emojify-emojis-dir))
         (message "Looks like you need to set up emojify first.")
-      (progn
-        (unless (file-directory-p mastodon-custom-emoji-dir)
-          (make-directory mastodon-custom-emoji-dir nil)) ; no add parent
-        (mapc (lambda (x)
-                (url-copy-file (alist-get 'url x)
-                               (concat
-                                mastodon-custom-emoji-dir
-                                (alist-get 'shortcode x)
-                                "."
-                                (file-name-extension (alist-get 'url x)))
-                               t))
-              custom-emoji)
-        (message "Custom emoji for %s downloaded to %s"
-                 mastodon-instance-url
-                 mastodon-custom-emoji-dir)))))
+      (unless (file-directory-p mastodon-custom-emoji-dir)
+        (make-directory mastodon-custom-emoji-dir nil)) ; no add parent
+      (mapc (lambda (x)
+              (url-copy-file (alist-get 'url x)
+                             (concat
+                              mastodon-custom-emoji-dir
+                              (alist-get 'shortcode x)
+                              "."
+                              (file-name-extension (alist-get 'url x)))
+                             t))
+            custom-emoji)
+      (message "Custom emoji for %s downloaded to %s"
+               mastodon-instance-url
+               mastodon-custom-emoji-dir))))
 
 (defun mastodon-toot--collect-custom-emoji ()
   "Return a list of `mastodon-instance-url's custom emoji.
-- 
cgit v1.2.3


From fc8005c8fe3c5466c7e2d2b510e24f6eba661431 Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Fri, 17 Dec 2021 15:03:00 +0100
Subject: bump version, change homepage link, readme

---
 README.org                     | 2 +-
 lisp/mastodon-async.el         | 4 ++--
 lisp/mastodon-auth.el          | 4 ++--
 lisp/mastodon-client.el        | 4 ++--
 lisp/mastodon-discover.el      | 4 ++--
 lisp/mastodon-http.el          | 4 ++--
 lisp/mastodon-inspect.el       | 4 ++--
 lisp/mastodon-media.el         | 4 ++--
 lisp/mastodon-notifications.el | 4 ++--
 lisp/mastodon-profile.el       | 4 ++--
 lisp/mastodon-search.el        | 4 ++--
 lisp/mastodon-tl.el            | 4 ++--
 lisp/mastodon-toot.el          | 4 ++--
 lisp/mastodon.el               | 4 ++--
 14 files changed, 27 insertions(+), 27 deletions(-)

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

diff --git a/README.org b/README.org
index ab2dbff..fff4bc8 100644
--- a/README.org
+++ b/README.org
@@ -32,7 +32,7 @@ It adds the following features:
 |                 | images are links to the full image, can be zoomed/rotated/saved (see image keymap) |
 |                 | images scale properly                                                              |
 |                 | toot visibility (direct, followers only) icon appears in toot bylines              |
-|                 | display a toot's favorites, boosts and replies count in thread view                |
+|                 | display toot's number of favorites, boosts and replies                             |
 |                 | customize option to cache images                                                   |
 | Toots:          |                                                                                    |
 |                 | mention booster in replies by default                                              |
diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 524e13d..3651bd5 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.7.1
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 8d0d7c6..8355200 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index bdfbca9..cb8eb26 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 33ce3d5..6b2eadf 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index a4f126f..00a0718 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1") (request "0.2.0"))
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index 57240f3..4d91948 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 457628f..bbab816 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 15633be..5efb7d4 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 7a9edc3..d21f5c0 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1") (seq "1.0"))
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index fcfaec9..a7dcda9 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>, martyhiatt <mousebot@riseup.net>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 9355480..89604b5 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 2ff7f83..c89acc7 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1"))
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 662b691..2411e20 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.9.1
+;; Version: 0.9.2
 ;; Package-Requires: ((emacs "26.1") (request "0.3.2") (seq "1.0"))
-;; Homepage: https://github.com/jdenen/mastodon.el
+;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
 
-- 
cgit v1.2.3


From 3a87f6caa62cbd0e925c765d2ac2840ba55f8db1 Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Fri, 17 Dec 2021 16:22:46 +0100
Subject: depend on emacs 27.1, flychecks, docstrings, etc.

strictly, the 27.1 dependency is only for proper-list-p in -http.el.
---
 lisp/mastodon-async.el         | 25 +++++++++++++++----------
 lisp/mastodon-auth.el          |  2 +-
 lisp/mastodon-client.el        |  2 +-
 lisp/mastodon-discover.el      |  2 +-
 lisp/mastodon-http.el          |  2 +-
 lisp/mastodon-inspect.el       |  4 +++-
 lisp/mastodon-media.el         |  2 +-
 lisp/mastodon-notifications.el |  2 +-
 lisp/mastodon-profile.el       |  2 +-
 lisp/mastodon-search.el        |  2 +-
 lisp/mastodon-tl.el            |  2 +-
 lisp/mastodon-toot.el          | 10 +++++++---
 lisp/mastodon.el               |  5 +++--
 13 files changed, 37 insertions(+), 25 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 3651bd5..77fdb8e 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -32,6 +32,8 @@
 (require 'json)
 (require 'url-http)
 
+(defvar url-http-end-of-headers)
+
 (autoload 'mastodon-auth--access-token "mastodon-auth")
 (autoload 'mastodon-http--api "mastodon-http")
 (autoload 'mastodon-http--get-json "mastodon-http")
@@ -153,10 +155,10 @@ NAME is the center portion of the buffer name for
     (url-retrieve url callback)))
 
 (defun mastodon-async--set-http-buffer (buffer http-buffer)
-  "Initializes for BUFFER a local variable `mastodon-async--http-buffer'.
+  "Initialize for BUFFER a local variable `mastodon-async--http-buffer'.
 
 HTTP-BUFFER is the initializing value. Use this funcion if HTTP-BUFFER
-is not known when `mastodon-async--setup-buffer' is called."  
+is not known when `mastodon-async--setup-buffer' is called."
   (with-current-buffer (get-buffer-create buffer)
     (setq mastodon-async--http-buffer http-buffer)))
 
@@ -164,6 +166,7 @@ is not known when `mastodon-async--setup-buffer' is called."
                                             http-buffer
                                             buffer-name
                                             queue-name)
+  "Set local variables for BUFFER, HTTP-BUFFER, BUFFER-NAME, and QUEUE-NAME."
   (with-current-buffer (get-buffer-create buffer)
     (let ((value mastodon-instance-url))
       (make-local-variable 'mastodon-instance-url)
@@ -173,7 +176,7 @@ is not known when `mastodon-async--setup-buffer' is called."
     (setq mastodon-async--queue queue-name)))
 
 (defun mastodon-async--setup-http (http-buffer name)
-  "Adds local variables to HTTP-BUFFER.
+  "Add local variables to HTTP-BUFFER.
 
 NAME is used to generate the display buffer and the queue."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
@@ -184,7 +187,8 @@ NAME is used to generate the display buffer and the queue."
                                          buffer-name queue-name)))
 
 (defun mastodon-async--setup-queue (http-buffer name)
-  "Sets up the buffer for the async queue."
+  "Set up HTTP-BUFFER buffer for the async queue.
+NAME is used to generate the display buffer and the queue."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
                             mastodon-instance-url "*"))
         (buffer-name(concat "*mastodon-async-display-" name "-"
@@ -194,11 +198,11 @@ NAME is used to generate the display buffer and the queue."
     queue-name))
 
 (defun mastodon-async--setup-buffer (http-buffer name endpoint)
-  "Sets up the buffer timeline like `mastodon-tl--init'.
+  "Set up the buffer timeline like `mastodon-tl--init'.
 
 HTTP-BUFFER the name of the http-buffer, if unknown, set to...
 NAME is the name of the stream for the buffer name.
-ENPOINT is the endpoint for the stream and timeline."
+ENDPOINT is the endpoint for the stream and timeline."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
                             mastodon-instance-url "*"))
         (buffer-name (concat "*mastodon-async-display-" name "-"
@@ -211,7 +215,7 @@ ENPOINT is the endpoint for the stream and timeline."
                    (t (format "timelines/%s" endpoint)))))
     (mastodon-async--set-local-variables buffer-name http-buffer
                                          buffer-name queue-name)
-    ;; Similar to timeline init. 
+    ;; Similar to timeline init.
     (with-current-buffer (get-buffer-create buffer-name)
       (setq inhibit-read-only t) ; for home timeline?
       (make-local-variable 'mastodon-tl--enable-relative-timestamps)
@@ -238,7 +242,8 @@ ENPOINT is the endpoint for the stream and timeline."
 
 (defun mastodon-async--start-process (endpoint filter &optional name)
   "Start an async mastodon stream at ENDPOINT.
-Filter the toots using FILTER."  
+Filter the toots using FILTER.
+NAME is used for the queue and display buffer."
   (let* ((stream (concat "streaming/" endpoint))
          (async-queue (mastodon-async--setup-queue "" (or name stream)))
          (async-buffer (mastodon-async--setup-buffer "" (or name stream) endpoint))
@@ -249,7 +254,7 @@ Filter the toots using FILTER."
                          (message "HTTP SOURCE CLOSED")))))
     (mastodon-async--setup-http  http-buffer (or name stream))
     (mastodon-async--set-http-buffer async-buffer http-buffer)
-    (mastodon-async--set-http-buffer async-queue http-buffer)        
+    (mastodon-async--set-http-buffer async-queue http-buffer)
     (set-process-filter (get-buffer-process http-buffer)
                         (mastodon-async--http-hook filter))
     http-buffer))
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 8355200..31df2ae 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index cb8eb26..a03d035 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 6b2eadf..21a0f95 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 00a0718..4461ea2 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "27.1") (request "0.2.0"))
+;; Package-Requires: ((emacs "27.1") (request "0.3.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index 4d91948..c9a9277 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -98,6 +98,7 @@
 (defvar mastodon-inspect--search-result-tags)
 
 (defun mastodon-inspect--get-search-result (query)
+  "Inspect function for a search result for QUERY."
   (interactive)
   (setq mastodon-inspect--search-query-full-result
         (append ; convert vector to list
@@ -111,6 +112,7 @@
                 nil)))
 
 (defun mastodon-inspect--get-search-account (query)
+  "Return JSON for a single account after search QUERY."
   (interactive)
   (setq mastodon-inspect--search-query-accounts-result
         (append ; convert vector to list
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index bbab816..6e02ebb 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 5efb7d4..ebf98ba 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index d21f5c0..dbe5686 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1") (seq "1.0"))
+;; Package-Requires: ((emacs "27.1") (seq "1.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index a7dcda9..6317895 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>, martyhiatt <mousebot@riseup.net>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 89604b5..71e08de 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index c89acc7..6cf337a 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -545,7 +545,11 @@ The prefix can match against both user handles and display names."
     (propertize handle 'annot display-name 'meta url)))
 
 (defun mastodon-toot-mentions (command &optional arg &rest ignored)
-  "A company completion backend for toot mentions."
+  "A company completion backend for toot mentions.
+COMMAND is either prefix, to fetch a prefix query, candidates, to
+build a list of candidates with query ARG, annotation, to format
+an annotation for candidate ARG, or meta, to format meta info for
+candidate ARG. IGNORED remains a mystery."
   (interactive (list 'interactive))
   (cl-case command
     (interactive (company-begin-backend 'mastodon-toot-mentions))
@@ -645,7 +649,7 @@ File is actually attached to the toot upon posting."
     (mastodon-toot--upload-attached-media (car (last mastodon-toot--media-attachments)))))
 
 (defun mastodon-toot--upload-attached-media (attachment)
-  "Upload a single attachment using `mastodon-http--post-media-attachment'.
+  "Upload a single ATTACHMENT using `mastodon-http--post-media-attachment'.
 The item's id is added to `mastodon-toot--media-attachment-ids',
 which is used to attach it to a toot when posting."
   (let* ((filename (expand-file-name
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 2411e20..adc1ac8 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.2
-;; Package-Requires: ((emacs "26.1") (request "0.3.2") (seq "1.0"))
+;; Package-Requires: ((emacs "27.1") (request "0.3.2") (seq "1.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -31,7 +31,8 @@
 
 ;;; Code:
 (require 'cl-lib) ; for `cl-some' call in mastodon
-(require 'mastodon-toot) ; hack to make mastodon-toot customs visible
+;; hack to make mastodon-toot customizes visible prior to running mastodon-toot:
+(require 'mastodon-toot)
 
 (declare-function discover-add-context-menu "discover")
 (declare-function emojify-mode "emojify")
-- 
cgit v1.2.3


From 242628c090adad5e6f6292b108c6626bd78bf11a Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Fri, 17 Dec 2021 18:06:41 +0100
Subject: boilerplate maintainer contact

---
 lisp/mastodon-async.el         | 2 ++
 lisp/mastodon-auth.el          | 1 +
 lisp/mastodon-client.el        | 1 +
 lisp/mastodon-discover.el      | 1 +
 lisp/mastodon-http.el          | 1 +
 lisp/mastodon-inspect.el       | 1 +
 lisp/mastodon-media.el         | 1 +
 lisp/mastodon-notifications.el | 1 +
 lisp/mastodon-profile.el       | 1 +
 lisp/mastodon-search.el        | 4 +++-
 lisp/mastodon-tl.el            | 1 +
 lisp/mastodon-toot.el          | 1 +
 lisp/mastodon.el               | 1 +
 13 files changed, 16 insertions(+), 1 deletion(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 77fdb8e..bda6a4d 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -2,6 +2,8 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;;         Alex J. Griffith <griffitaj@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 31df2ae..0b9a0dd 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index a03d035..2ecfff4 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 21a0f95..c8e3fd0 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 4461ea2..0447e22 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1") (request "0.3.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index c9a9277..209e8dd 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 6e02ebb..5e2699a 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index ebf98ba..ac0d339 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index dbe5686..0ed4d04 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1") (seq "1.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 6317895..04b3e23 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -1,7 +1,9 @@
 ;;; mastodon-search.el --- Search functions for mastodon.el  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2017-2019 Johnson Denen
-;; Author: Johnson Denen <johnson.denen@gmail.com>, martyhiatt <mousebot@riseup.net>
+;; Author: Johnson Denen <johnson.denen@gmail.com>
+;;         Marty Hiatt <martianhiatus@riseup.net>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 71e08de..45b905d 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 6cf337a..5b46f5e 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index adc1ac8..9a0fe37 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
+;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 0.9.2
 ;; Package-Requires: ((emacs "27.1") (request "0.3.2") (seq "1.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
-- 
cgit v1.2.3


From c1aa61bb361cca5d107896a83b1b729315c4d79a Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Fri, 17 Dec 2021 18:18:28 +0100
Subject: bump version to a round number

---
 lisp/mastodon-async.el         | 2 +-
 lisp/mastodon-auth.el          | 2 +-
 lisp/mastodon-client.el        | 2 +-
 lisp/mastodon-discover.el      | 2 +-
 lisp/mastodon-http.el          | 2 +-
 lisp/mastodon-inspect.el       | 2 +-
 lisp/mastodon-media.el         | 2 +-
 lisp/mastodon-notifications.el | 2 +-
 lisp/mastodon-profile.el       | 2 +-
 lisp/mastodon-search.el        | 2 +-
 lisp/mastodon-tl.el            | 2 +-
 lisp/mastodon-toot.el          | 2 +-
 lisp/mastodon.el               | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index bda6a4d..6ff09e3 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;;         Alex J. Griffith <griffitaj@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 0b9a0dd..e4f5934 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index 2ecfff4..b27d434 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index c8e3fd0..10abc59 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 0447e22..33182ff 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1") (request "0.3.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index 209e8dd..b0270ee 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 5e2699a..acce473 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index ac0d339..6d48681 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 0ed4d04..e8025ed 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1") (seq "1.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 04b3e23..78c2ab4 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;;         Marty Hiatt <martianhiatus@riseup.net>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 67cdf82..62550cd 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 5b46f5e..e813b33 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 9a0fe37..d5f9b6e 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
-;; Version: 0.9.2
+;; Version: 0.10.0
 ;; Package-Requires: ((emacs "27.1") (request "0.3.2") (seq "1.0"))
 ;; Homepage: https://git.blast.noho.st/mouse/mastodon.el
 
-- 
cgit v1.2.3