Merge branch 'develop'

18 files changed, 1500 insertions, 1461 deletions

diff --git a/README.org b/README.org
index 7bc75db..c16fd33 100644
--- a/README.org
+++ b/README.org
@@ -236,7 +236,7 @@ value of that hook is as follows:
 | =C-c C-l= | Set toot language                |
 |---------+----------------------------------|
 
-**** autocompletion of mentions and tags
+**** Autocompletion of mentions and tags
 
 Autocompletion of mentions and tags is provided by
 =completion-at-point-functions= (capf) backends.
@@ -335,6 +335,10 @@ See =M-x customize-group RET mastodon= to view all customize options.
    - Display toot being replied to
    - Set default reply visibility
 
+*** Commands and variables index
+
+An index of all user-facing commands and custom variables is available here: [[file:mastodon-index.org][mastodon-index.org]].
+
 *** Alternative timeline layout
 
 The incomparable Nicholas Rougier has written an alternative timeline layout
@@ -378,7 +382,8 @@ to your translator function as its text argument. Here's what
           (message "No toot to translate?"))))
 #+end_src
 
-*** bookmarks and =mastodon.el=
+*** Bookmarks and =mastodon.el=
+
 =mastodon.el= doesn’t currently implement its own bookmark record and handler,
 which means that emacs bookmarks will not work as is. Until we implement them,
 you can get bookmarks going immediately by using [[https://github.com/emacsmirror/emacswiki.org/blob/master/bookmark%2b.el][bookmark+.el]].
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 6588f13..4d43962 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -41,7 +41,7 @@
 (autoload 'mastodon-client--make-user-active "mastodon-client")
 (autoload 'mastodon-client--store-access-token "mastodon-client")
 (autoload 'mastodon-http--api "mastodon-http")
-(autoload 'mastodon-http--append-query-string "mastodon-http")
+(autoload 'mastodon-http--concat-params-to-url "mastodon-http")
 (autoload 'mastodon-http--get-json "mastodon-http")
 (autoload 'mastodon-http--post "mastodon-http")
 
@@ -83,7 +83,7 @@ We apologize for the inconvenience.
 
 (defun mastodon-auth--get-browser-login-url ()
   "Return properly formed browser login url."
-  (mastodon-http--append-query-string
+  (mastodon-http--concat-params-to-url
    (concat mastodon-instance-url "/oauth/authorize/")
    `(("response_type" . "code")
      ("redirect_uri" . ,mastodon-client-redirect-uri)
@@ -108,11 +108,9 @@ code. Copy this code and paste it in the minibuffer prompt."
 NOTICE is displayed in vertical split occupying 50% of total
 width.  The buffer name of the buffer being displayed in the
 window is BUFFER-NAME.
-
 When optional argument ASK is given which should be a string, use
 ASK as the minibuffer prompt.  Return whatever user types in
 response to the prompt.
-
 When ASK is absent return nil."
   (let ((buffer (get-buffer-create buffer-name))
         (inhibit-read-only t)
@@ -170,25 +168,21 @@ When ASK is absent return nil."
 
 (defun mastodon-auth--access-token ()
   "Return the access token to use with `mastodon-instance-url'.
-
 Generate/save token if none known yet."
   (cond (mastodon-auth--token-alist
-         ;; user variables are known and
-         ;; initialised already.
+         ;; user variables are known and initialised.
          (alist-get mastodon-instance-url mastodon-auth--token-alist
                     nil nil 'equal))
         ((plist-get (mastodon-client--active-user) :access_token)
-         ;; user variables needs to initialised by reading from
-         ;; plstore.
+         ;; user variables need to be read from plstore.
          (push (cons mastodon-instance-url
                      (plist-get (mastodon-client--active-user) :access_token))
                mastodon-auth--token-alist)
          (alist-get mastodon-instance-url mastodon-auth--token-alist
                     nil nil 'equal))
         ((null mastodon-active-user)
-         ;; user not aware of 2FA related changes and has not set the
-         ;; `mastodon-active-user' properly. Make user aware and error
-         ;; out.
+         ;; user not aware of 2FA-related changes and has not set
+         ;; `mastodon-active-user'. Make user aware and error out.
          (mastodon-auth--show-notice mastodon-auth--user-unaware
                                      "*mastodon-notice*")
          (error "Variables not set properly"))
@@ -199,9 +193,7 @@ Generate/save token if none known yet."
 
 (defun mastodon-auth--handle-token-response (response)
   "Add token RESPONSE to `mastodon-auth--token-alist'.
-
 The token is returned by `mastodon-auth--get-token'.
-
 Handle any errors from the server."
   (pcase response
     ((and (let token (plist-get response :access_token))
@@ -210,28 +202,23 @@ Handle any errors from the server."
       (mastodon-client--store-access-token token))
      (cdar (push (cons mastodon-instance-url token)
                  mastodon-auth--token-alist)))
-
     (`(:error ,class :error_description ,error)
      (error "Mastodon-auth--access-token: %s: %s" class error))
     (_ (error "Unknown response from mastodon-auth--get-token!"))))
 
 (defun mastodon-auth--get-account-name ()
   "Request user credentials and return an account name."
-  (alist-get
-   'acct
-   (mastodon-http--get-json
-    (mastodon-http--api
-     "accounts/verify_credentials")
-    nil
-    :silent)))
+  (alist-get 'acct
+             (mastodon-http--get-json (mastodon-http--api
+                                       "accounts/verify_credentials")
+                                      nil
+                                      :silent)))
 
 (defun mastodon-auth--get-account-id ()
   "Request user credentials and return an account name."
-  (alist-get
-   'id
-   (mastodon-http--get-json
-    (mastodon-http--api
-     "accounts/verify_credentials"))))
+  (alist-get 'id
+             (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-client.el b/lisp/mastodon-client.el
index b358ed7..9b4fee9 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -62,14 +62,13 @@
 
 (defun mastodon-client--register ()
   "POST client to Mastodon."
-  (mastodon-http--post
-   (mastodon-http--api "apps")
-   `(("client_name" . "mastodon.el")
-     ("redirect_uris" . ,mastodon-client-redirect-uri)
-     ("scopes" . ,mastodon-client-scopes)
-     ("website" . ,mastodon-client-website))
-   nil
-   :unauthenticated))
+  (mastodon-http--post (mastodon-http--api "apps")
+                       `(("client_name" . "mastodon.el")
+                         ("redirect_uris" . ,mastodon-client-redirect-uri)
+                         ("scopes" . ,mastodon-client-scopes)
+                         ("website" . ,mastodon-client-website))
+                       nil
+                       :unauthenticated))
 
 (defun mastodon-client--fetch ()
   "Return JSON from `mastodon-client--register' call."
@@ -154,7 +153,6 @@ Return the plist after the operation."
 
 (defun mastodon-client--form-user-from-vars ()
   "Create a username from user variable.  Return that username.
-
 Username in the form user@instance.com is formed from the
 variables `mastodon-instance-url' and `mastodon-active-user'."
   (concat mastodon-active-user
@@ -182,7 +180,6 @@ Otherwise return nil."
 
 (defun mastodon-client--active-user ()
   "Return the details of the currently active user.
-
 Details is a plist."
   (let ((active-user-details mastodon-client--active-user-details-plist))
     (unless active-user-details
@@ -195,7 +192,6 @@ Details is a plist."
 
 (defun mastodon-client ()
   "Return variable client secrets to use for `mastodon-instance-url'.
-
 Read plist from `mastodon-client--token-file' if variable is nil.
 Fetch and store plist if `mastodon-client--read' returns nil."
   (let ((client-details
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 57c4bd1..c1d28f3 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -79,7 +79,8 @@
         ("Views"
          ("h/?" "View mode help/keybindings" describe-mode)
          ("#" "Tag search" mastodon-tl--get-tag-timeline)
-         (":" "List followed tags" mastodon-tl--list-followed-tags)
+         ("\"" "List followed tags" mastodon-tl--list-followed-tags)
+         ("'" "Followed tags timeline" mastodon-tl--followed-tags-timeline)
          ("F" "Federated" mastodon-tl--get-federated-timeline)
          ("H" "Home" mastodon-tl--get-home-timeline)
          ("L" "Local" mastodon-tl--get-local-timeline)
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index dcde29a..551d4fd 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -80,15 +80,13 @@ SILENT means don't message."
     (url-retrieve-synchronously url (or silent nil) nil mastodon-http--timeout)))
 
 (defun mastodon-http--triage (response success)
-  "Determine if RESPONSE was successful. Call SUCCESS if successful.
-Message status and JSON error from RESPONSE if unsuccessful."
+  "Determine if RESPONSE was successful.
+Call SUCCESS if successful. Message status and JSON error from
+RESPONSE if unsuccessful."
   (let ((status (with-current-buffer response
                   (mastodon-http--status))))
     (if (string-prefix-p "2" status)
         (funcall success)
-      ;; don't switch to buffer, just with-current-buffer the response:
-      ;; (switch-to-buffer response)
-      ;; 404 sometimes returns http response so --process-json fails:
       (if (string-prefix-p "404" status)
           (message "Error %s: page not found" status)
         (let ((json-response (with-current-buffer response
@@ -104,7 +102,8 @@ Message status and JSON error from RESPONSE if unsuccessful."
 (defmacro mastodon-http--authorized-request (method body &optional unauthenticated-p)
   "Make a METHOD type request using BODY, with Mastodon authorization.
 Unless UNAUTHENTICATED-P is non-nil."
-  (declare (debug 'body))
+  (declare (debug 'body)
+           (indent 1))
   `(let ((url-request-method ,method)
          (url-request-extra-headers
           (unless ,unauthenticated-p
@@ -115,14 +114,12 @@ Unless UNAUTHENTICATED-P is non-nil."
 (defun mastodon-http--build-params-string (params)
   "Build a request parameters string from parameters alist PARAMS."
   ;; (url-build-query-string args nil))
-  ;; url-build-query-string adds 'nil' to empty params so lets stay with our
+  ;; url-build-query-string adds 'nil' for empty params so lets stick with our
   ;; own:
   (mapconcat (lambda (p)
                (concat (url-hexify-string (car p))
-                       "="
-                       (url-hexify-string (cdr p))))
-             params
-             "&"))
+                       "=" (url-hexify-string (cdr p))))
+             params "&"))
 
 (defun mastodon-http--build-array-params-alist (param-str array)
   "Return parameters alist using PARAM-STR and ARRAY param values.
@@ -133,33 +130,33 @@ Used for API form data parameters that take an array."
 (defun mastodon-http--post (url &optional params headers unauthenticated-p)
   "POST synchronously to URL, optionally with PARAMS and HEADERS.
 Authorization header is included by default unless UNAUTHENTICATED-P is non-nil."
-  (mastodon-http--authorized-request
-   "POST"
-   (let ((url-request-data
-          (when params
-            (mastodon-http--build-params-string params)))
-         (url-request-extra-headers
-          (append url-request-extra-headers ; auth set in macro
-                  ;; pleroma compat:
-                  (unless (assoc "Content-Type" headers)
-                    '(("Content-Type" . "application/x-www-form-urlencoded")))
-                  headers)))
-     (with-temp-buffer
-       (mastodon-http--url-retrieve-synchronously url)))
-   unauthenticated-p))
+  (mastodon-http--authorized-request "POST"
+    (let ((url-request-data (when params
+                              (mastodon-http--build-params-string params)))
+          (url-request-extra-headers
+           (append url-request-extra-headers ; auth set in macro
+                   (unless (assoc "Content-Type" headers) ; pleroma compat:
+                     '(("Content-Type" . "application/x-www-form-urlencoded")))
+                   headers)))
+      (with-temp-buffer
+        (mastodon-http--url-retrieve-synchronously url)))
+    unauthenticated-p))
+
+(defun mastodon-http--concat-params-to-url (url params)
+  "Build a query string with PARAMS and concat to URL."
+  (if params
+      (concat url "?"
+              (mastodon-http--build-params-string params))
+    url))
 
 (defun mastodon-http--get (url &optional params silent)
   "Make synchronous GET request to URL.
 PARAMS is an alist of any extra parameters to send with the request.
 SILENT means don't message."
-  (mastodon-http--authorized-request
-   "GET"
-   ;; url-request-data doesn't seem to work with GET requests:
-   (let ((url (if params
-                  (concat url "?"
-                          (mastodon-http--build-params-string params))
-                url)))
-     (mastodon-http--url-retrieve-synchronously url silent))))
+  (mastodon-http--authorized-request "GET"
+    ;; url-request-data doesn't seem to work with GET requests?:
+    (let ((url (mastodon-http--concat-params-to-url url params)))
+      (mastodon-http--url-retrieve-synchronously url silent))))
 
 (defun mastodon-http--get-response (url &optional params no-headers silent vector)
   "Make synchronous GET request to URL. Return JSON and response headers.
@@ -183,6 +180,15 @@ Callback to `mastodon-http--get-json-async', usually
 `mastodon-tl--init*', is run on the result."
   (car (mastodon-http--process-response :no-headers)))
 
+(defun mastodon-http--render-html-err (string)
+  "Render STRING as HTML in a temp buffer.
+STRING should be a HTML for a 404 errror."
+  (with-temp-buffer
+    (insert string)
+    (shr-render-buffer (current-buffer))
+    (view-mode) ; for 'q' to kill buffer and window
+    (error ""))) ; stop subsequent processing
+
 (defun mastodon-http--process-response (&optional no-headers vector)
   "Process http response.
 Return a cons of JSON list and http response headers.
@@ -197,18 +203,20 @@ Callback to `mastodon-http--get-response-async', usually
     (goto-char (point-min))
     (re-search-forward "^$" nil 'move)
     (let ((json-array-type (if vector 'vector 'list))
-          (json-string
-           (decode-coding-string
-            (buffer-substring-no-properties (point) (point-max))
-            'utf-8)))
+          (json-string (decode-coding-string
+                        (buffer-substring-no-properties (point) (point-max))
+                        'utf-8)))
       (kill-buffer)
-      ;; (unless (or (string-empty-p json-string) (null json-string))
       (cond ((or (string-empty-p json-string) (null json-string))
              nil)
-            ;; if we don't have json, maybe we have a plain string error
-            ;; message (misskey works like this for instance, but there are
-            ;; probably less dunce ways to do this):
-            ;; FIXME: friendica at least sends plain html if endpoint not found.
+            ;; if we get html, just render it and error:
+            ;; ideally we should handle the status code in here rather than
+            ;; this crappy hack?
+            ((string-prefix-p "\n<" json-string) ; html hack
+             (mastodon-http--render-html-err json-string))
+            ;; if no json or html, maybe we have a plain string error message
+            ;; (misskey does this, but there are probably better ways to do
+            ;; this):
             ((not (or (string-prefix-p "\n{" json-string)
                       (string-prefix-p "\n[" json-string)))
              (error "%s" json-string))
@@ -232,37 +240,24 @@ Callback to `mastodon-http--get-response-async', usually
   "Make DELETE request to URL.
 PARAMS is an alist of any extra parameters to send with the request."
   ;; url-request-data only works with POST requests?
-  (let ((url
-         (if params
-             (concat url "?"
-                     (mastodon-http--build-params-string params))
-           url)))
-    (mastodon-http--authorized-request
-     "DELETE"
-     (with-temp-buffer
-       (mastodon-http--url-retrieve-synchronously url)))))
+  (let ((url (mastodon-http--concat-params-to-url url params)))
+    (mastodon-http--authorized-request "DELETE"
+      (with-temp-buffer
+        (mastodon-http--url-retrieve-synchronously url)))))
 
 (defun mastodon-http--put (url &optional params headers)
   "Make PUT request to URL.
 PARAMS is an alist of any extra parameters to send with the request.
 HEADERS is an alist of any extra headers to send with the request."
-  (mastodon-http--authorized-request
-   "PUT"
-   (let ((url-request-data
-          (when params (mastodon-http--build-params-string params)))
-         (url-request-extra-headers
-          (append url-request-extra-headers ; auth set in macro
-                  ;; pleroma compat:
-                  (unless (assoc "Content-Type" headers)
-                    '(("Content-Type" . "application/x-www-form-urlencoded")))
-                  headers)))
-     (with-temp-buffer (mastodon-http--url-retrieve-synchronously url)))))
-
-(defun mastodon-http--append-query-string (url params)
-  "Append PARAMS to URL as query strings and return it.
-PARAMS should be an alist as required by `url-build-query-string'."
-  (let ((query-string (url-build-query-string params)))
-    (concat url "?" query-string)))
+  (mastodon-http--authorized-request "PUT"
+    (let ((url-request-data
+           (when params (mastodon-http--build-params-string params)))
+          (url-request-extra-headers
+           (append url-request-extra-headers ; auth set in macro
+                   (unless (assoc "Content-Type" headers) ; pleroma compat:
+                     '(("Content-Type" . "application/x-www-form-urlencoded")))
+                   headers)))
+      (with-temp-buffer (mastodon-http--url-retrieve-synchronously url)))))
 
 ;; profile update functions
 
@@ -275,12 +270,9 @@ Optionally specify the PARAMS to send."
 (defun mastodon-http--patch (base-url &optional params)
   "Make synchronous PATCH request to BASE-URL.
 Optionally specify the PARAMS to send."
-  (mastodon-http--authorized-request
-   "PATCH"
-   (let ((url
-          (concat base-url "?"
-                  (mastodon-http--build-params-string params))))
-     (mastodon-http--url-retrieve-synchronously url))))
+  (mastodon-http--authorized-request "PATCH"
+    (let ((url (mastodon-http--concat-params-to-url base-url params)))
+      (mastodon-http--url-retrieve-synchronously url))))
 
  ;; Asynchronous functions
 
@@ -288,13 +280,9 @@ Optionally specify the PARAMS to send."
   "Make GET request to URL.
 Pass response buffer to CALLBACK function with args CBARGS.
 PARAMS is an alist of any extra parameters to send with the request."
-  (let ((url (if params
-                 (concat url "?"
-                         (mastodon-http--build-params-string params))
-               url)))
-    (mastodon-http--authorized-request
-     "GET"
-     (url-retrieve url callback cbargs))))
+  (let ((url (mastodon-http--concat-params-to-url url params)))
+    (mastodon-http--authorized-request "GET"
+      (url-retrieve url callback cbargs))))
 
 (defun mastodon-http--get-response-async (url &optional params callback &rest cbargs)
   "Make GET request to URL. Call CALLBACK with http response and CBARGS.
@@ -303,7 +291,7 @@ PARAMS is an alist of any extra parameters to send with the request."
    url
    params
    (lambda (status)
-     (when status ;; only when we actually get sth?
+     (when status ; for flakey servers
        (apply callback (mastodon-http--process-response) cbargs)))))
 
 (defun mastodon-http--get-json-async (url &optional params callback &rest cbargs)
@@ -320,14 +308,12 @@ PARAMS is an alist of any extra parameters to send with the request."
   "POST asynchronously to URL with PARAMS and HEADERS.
 Then run function CALLBACK with arguements CBARGS.
 Authorization header is included by default unless UNAUTHENTICED-P is non-nil."
-  (mastodon-http--authorized-request
-   "POST"
-   (let ((request-timeout 5)
-         (url-request-data
-          (when params
-            (mastodon-http--build-params-string params))))
-     (with-temp-buffer
-       (url-retrieve url callback cbargs)))))
+  (mastodon-http--authorized-request "POST"
+    (let ((request-timeout 5)
+          (url-request-data (when params
+                              (mastodon-http--build-params-string params))))
+      (with-temp-buffer
+        (url-retrieve url callback cbargs)))))
 
 ;; TODO: test for curl first?
 (defun mastodon-http--post-media-attachment (url filename caption)
@@ -361,13 +347,16 @@ item uploaded, and `mastodon-toot--update-status-fields' is run."
                  ;; 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)))
+		  (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)) 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))
+                  (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))))))))
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index 112a753..c332dde 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -6,7 +6,6 @@
 ;;         Marty Hiatt <martianhiatus@riseup.net>
 ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net>
 ;; Version: 1.0.0
-;; Package-Requires: ((emacs "27.1"))
 ;; Homepage: https://codeberg.org/martianh/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 4d36f47..5ccc3c4 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -145,7 +145,7 @@ 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."
-  (when (marker-buffer marker) ; only if the buffer hasn't been kill in the meantime
+  (when (marker-buffer marker) ; if buffer hasn't been killed
     (let ((url-buffer (current-buffer))
           (is-error-response-p (eq :error (car status-plist))))
       (unwind-protect
@@ -193,8 +193,7 @@ REGION-LENGTH is the range from start to propertize."
                            `(:max-height ,mastodon-media--preview-max-height))))))
     (let ((buffer (current-buffer))
           (marker (copy-marker start))
-	  ;; Keep url.el from spamming us with messages about connecting to hosts:
-	  (url-show-status nil))
+	      (url-show-status nil)) ; stop url.el from spamming us about connecting
       (condition-case nil
           ;; catch any errors in url-retrieve so as to not abort
           ;; whatever called us
@@ -204,11 +203,12 @@ REGION-LENGTH is the range from start to propertize."
               (with-current-buffer (url-fetch-from-cache url)
                 (set-buffer-multibyte nil)
                 (goto-char (point-min))
-                (zlib-decompress-region (goto-char (search-forward "\n\n")) (point-max))
-                (mastodon-media--process-image-response nil marker image-options region-length url))
+                (zlib-decompress-region
+                 (goto-char (search-forward "\n\n")) (point-max))
+                (mastodon-media--process-image-response
+                 nil marker image-options region-length url))
             ;; else fetch as usual and process-image-response will cache it
-            (url-retrieve url
-                          #'mastodon-media--process-image-response
+            (url-retrieve url #'mastodon-media--process-image-response
                           (list marker image-options region-length url)))
         (error (with-current-buffer buffer
                  ;; TODO: Consider adding retries
@@ -224,20 +224,20 @@ Returns the list of (`start' . `end', `media-symbol') points of
 that line and string found or nil no more media links were
 found."
   (let ((next-pos (point)))
-    (while (and (setq next-pos (next-single-property-change next-pos 'media-state))
-                (or (not (eq 'needs-loading (get-text-property next-pos 'media-state)))
-                    (null (get-text-property next-pos 'media-url))
-                    (null (get-text-property next-pos 'media-type))))
+    (while
+        (and
+         (setq next-pos (next-single-property-change next-pos 'media-state))
+         (or (not (eq 'needs-loading (get-text-property next-pos 'media-state)))
+             (null (get-text-property next-pos 'media-url))
+             (null (get-text-property next-pos 'media-type))))
       ;; do nothing - the loop will proceed
       )
     (when (and next-pos (< next-pos end-pos))
       (let ((media-type (get-text-property next-pos 'media-type)))
         (cond
-         ;; Avatars are just one character in the buffer
-         ((eq media-type 'avatar)
+         ((eq media-type 'avatar) ; avatars are one character
           (list next-pos (+ next-pos 1) 'avatar))
-         ;; Media links are 5 character ("[img]")
-         ((eq media-type 'media-link)
+         ((eq media-type 'media-link) ; media links are 5 characters: [img]
           (list next-pos (+ next-pos 5) 'media-link)))))))
 
 (defun mastodon-media--valid-link-p (link)
@@ -254,11 +254,12 @@ Replace them with the referenced image."
   (save-excursion
     (goto-char search-start)
     (let (line-details)
-      (while (setq line-details (mastodon-media--select-next-media-line
-                                 search-end))
+      (while (setq line-details
+                   (mastodon-media--select-next-media-line search-end))
         (let* ((start (car line-details))
                (end (cadr line-details))
                (media-type (cadr (cdr line-details)))
+               (type (get-text-property start 'mastodon-media-type))
                (image-url (get-text-property start 'media-url)))
           (if (not (mastodon-media--valid-link-p image-url))
               ;; mark it at least as not needing loading any more
@@ -266,21 +267,25 @@ Replace them with the referenced image."
             ;; proceed to load this image asynchronously
             (put-text-property start end 'media-state 'loading)
             (mastodon-media--load-image-from-url
-             image-url media-type start (- end start))))))))
-            ;; (mastodon-media--moving-image-overlay start end)))))))
+             image-url media-type start (- end start))
+            (when (or (equal type "gifv")
+                      (equal type "video"))
+              (mastodon-media--moving-image-overlay start end))))))))
 
-;; (defun mastodon-media--moving-image-overlay (start end)
-;;   "Add play symbol overlay to moving image media items."
-;;   (let ((ov (make-overlay start end))
-;;         (type (get-text-property start 'mastodon-media-type)))
-;;     (when (or (equal type "gifv")
-;;               (equal type "video"))
-;;       (overlay-put
-;;        ov
-;;        'after-string
-;;        (propertize " "
-;;                    'face
-;;                    '((:height 1.5 :inherit 'font-lock-comment-face)))))))
+;; (defvar-local mastodon-media--overlays nil
+;;   "Holds a list of overlays in the buffer.")
+
+(defun mastodon-media--moving-image-overlay (start end)
+  "Add play symbol overlay to moving image media items."
+  (let ((ov (make-overlay start end)))
+    (overlay-put
+     ov
+     'after-string
+     (propertize ""
+                 'help-echo "Video"
+                 'face
+                 '((:height 3.5 :inherit font-lock-comment-face))))))
+;; (cl-pushnew ov mastodon-media--overlays)))
 
 (defun mastodon-media--get-avatar-rendering (avatar-url)
   "Return the string to be written that renders the avatar at AVATAR-URL."
@@ -302,17 +307,18 @@ Replace them with the referenced image."
                                  t image-options))
      " ")))
 
-(defun mastodon-media--get-media-link-rendering (media-url &optional full-remote-url
-                                                           type caption)
+(defun mastodon-media--get-media-link-rendering
+    (media-url &optional full-remote-url type caption)
   "Return the string to be written that renders the image at MEDIA-URL.
 FULL-REMOTE-URL is used for `shr-browse-image'.
 TYPE is the attachment's type field on the server.
 CAPTION is the image caption if provided."
-  (let* ((help-echo-base "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview")
+  (let* ((help-echo-base
+          "RET/i: load full image (prefix: copy URL), +/-: zoom,\
+ r: rotate, o: save preview")
          (help-echo (if caption
                         (concat help-echo-base
-                                "\n\""
-                                caption "\"")
+                                "\n\"" caption "\"")
                       help-echo-base)))
     (concat
      (mastodon-tl--propertize-img-str-or-url
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index bed2d9a..df96122 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -80,8 +80,7 @@
   "Alist of subjects for notification types.")
 
 (defvar mastodon-notifications--map
-  (let ((map
-         (copy-keymap mastodon-mode-map)))
+  (let ((map (copy-keymap mastodon-mode-map)))
     (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept)
     (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject)
     (define-key map (kbd "C-k") #'mastodon-notifications--clear-current)
@@ -90,11 +89,8 @@
 
 (defun mastodon-notifications--byline-concat (message)
   "Add byline for TOOT with MESSAGE."
-  (concat
-   " "
-   (propertize message 'face 'highlight)
-   " "
-   (cdr (assoc message mastodon-notifications--response-alist))))
+  (concat " " (propertize message 'face 'highlight)
+          " " (cdr (assoc message mastodon-notifications--response-alist))))
 
 (defun mastodon-notifications--follow-request-process (&optional reject)
   "Process the follow request at point.
@@ -108,31 +104,26 @@ follow-requests view."
                                    (plist-get mastodon-tl--buffer-spec 'endpoint)))
            (f-req-p (or (string= "follow_request" (alist-get 'type toot-json)) ;notifs
                         f-reqs-view-p)))
-      (if f-req-p
-          (let* ((account (or (alist-get 'account toot-json) ;notifs
-                              toot-json)) ;f-reqs
-                 (id (alist-get 'id account))
-                 (handle (alist-get 'acct account))
-                 (name (alist-get 'username account)))
-            (if id
-                (let ((response
-                       (mastodon-http--post
-                        (concat
-                         (mastodon-http--api "follow_requests")
-                         (format "/%s/%s" id (if reject
-                                                 "reject"
-                                               "authorize"))))))
-                  (mastodon-http--triage response
-                                         (lambda ()
-                                           (if f-reqs-view-p
-                                               (mastodon-views--view-follow-requests)
-                                             (mastodon-tl--reload-timeline-or-profile))
-                                           (message "Follow request of %s (@%s) %s!"
-                                                    name handle (if reject
-                                                                    "rejected"
-                                                                  "accepted")))))
-              (message "No account result at point?")))
-        (message "No follow request at point?")))))
+      (if (not f-req-p)
+          (message "No follow request at point?")
+        (let-alist (or (alist-get 'account toot-json) ;notifs
+                       toot-json) ;f-reqs
+          (if .id
+              (let ((response
+                     (mastodon-http--post
+                      (concat
+                       (mastodon-http--api "follow_requests")
+                       (format "/%s/%s" .id (if reject "reject" "authorize"))))))
+                (mastodon-http--triage response
+                                       (lambda ()
+                                         (if f-reqs-view-p
+                                             (mastodon-views--view-follow-requests)
+                                           (mastodon-tl--reload-timeline-or-profile))
+                                         (message "Follow request of %s (@%s) %s!"
+                                                  .username .acct (if reject
+                                                                      "rejected"
+                                                                    "accepted")))))
+            (message "No account result at point?")))))))
 
 (defun mastodon-notifications--follow-request-accept ()
   "Accept a follow request.
@@ -186,6 +177,7 @@ Status notifications are given when
         (status (mastodon-tl--field 'status note))
         (follower (alist-get 'username (alist-get 'account note))))
     (mastodon-notifications--insert-status
+     ;; toot
      (cond ((or (equal type 'follow)
                 (equal type 'follow-request))
             ;; Using reblog with an empty id will mark this as something
@@ -198,6 +190,7 @@ Status notifications are given when
             note)
            (t
             status))
+     ;; body
      (if (or (equal type 'follow)
              (equal type 'follow-request))
          (propertize (if (equal type 'follow)
@@ -209,13 +202,14 @@ Status notifications are given when
         (if (mastodon-tl--has-spoiler status)
             (mastodon-tl--spoiler status)
           (mastodon-tl--content status))))
+     ;; author-byline
      (if (or (equal type 'follow)
              (equal type 'follow-request)
              (equal type 'mention))
          'mastodon-tl--byline-author
        (lambda (_status)
-         (mastodon-tl--byline-author
-          note)))
+         (mastodon-tl--byline-author note)))
+     ;; action-byline
      (lambda (_status)
        (mastodon-notifications--byline-concat
         (cond ((equal type 'boost)
@@ -235,13 +229,13 @@ Status notifications are given when
               ((equal type 'edit)
                "Edited"))))
      id
+     ;; base toot
      (when (or (equal type 'favourite)
                (equal type 'boost))
        status))))
 
-(defun mastodon-notifications--insert-status (toot body
-                                                   author-byline action-byline id
-                                                   &optional base-toot)
+(defun mastodon-notifications--insert-status
+    (toot body author-byline action-byline id &optional base-toot)
   "Display the content and byline of timeline element TOOT.
 BODY will form the section of the toot above the byline.
 
@@ -306,8 +300,7 @@ Status notifications are created when you call
 
 (defun mastodon-notifications--filter-types-list (type)
   "Return a list of notification types with TYPE removed."
-  (let ((types
-         (mapcar #'car mastodon-notifications--types-alist)))
+  (let ((types (mapcar #'car mastodon-notifications--types-alist)))
     (remove type types)))
 
 (defun mastodon-notifications--clear-all ()
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 241fbbe..b8ac8be 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -63,7 +63,7 @@
 (autoload 'mastodon-tl--find-property-range "mastodon-tl.el")
 (autoload 'mastodon-tl--get-link-header-from-response "mastodon-tl")
 (autoload 'mastodon-tl--init "mastodon-tl.el")
-(autoload 'mastodon-tl--interactive-user-handles-get "mastodon-tl")
+(autoload 'mastodon-tl--user-handles-get "mastodon-tl")
 (autoload 'mastodon-tl--map-alist "mastodon-tl")
 (autoload 'mastodon-tl--map-alist-vals-to-alist "mastodon-tl")
 (autoload 'mastodon-tl--profile-buffer-p "mastodon tl")
@@ -91,11 +91,6 @@
 
 (defvar mastodon-profile-mode-map
   (let ((map (make-sparse-keymap)))
-    ;; conflicts with `s' keybinding to translate toot at point
-    ;; seeing as we now have the C-c C-c cycle functionality,
-    ;; maybe we can retire both of these awful bindings
-    ;; (define-key map (kbd "s") #'mastodon-profile--open-followers)
-    ;; (define-key map (kbd "g") #'mastodon-profile--open-following)
     (define-key map (kbd "C-c C-c") #'mastodon-profile--account-view-cycle)
     map)
   "Keymap for `mastodon-profile-mode'.")
@@ -105,7 +100,6 @@
 This minor mode is used for mastodon profile pages and adds a couple of
 extra keybindings."
   :init-value nil
-  ;; modeline indicator:
   :lighter " Profile"
   :keymap mastodon-profile-mode-map
   :group 'mastodon
@@ -169,7 +163,7 @@ NO-REBLOGS means do not display boosts in statuses."
       (mastodon-profile--make-profile-buffer-for
        mastodon-profile--account
        "following"
-       #'mastodon-profile--add-author-bylines
+       #'mastodon-profile--format-user
        nil
        :headers)
     (error "Not in a mastodon profile")))
@@ -181,7 +175,7 @@ NO-REBLOGS means do not display boosts in statuses."
       (mastodon-profile--make-profile-buffer-for
        mastodon-profile--account
        "followers"
-       #'mastodon-profile--add-author-bylines
+       #'mastodon-profile--format-user
        nil
        :headers)
     (error "Not in a mastodon profile")))
@@ -213,13 +207,14 @@ NO-REBLOGS means do not display boosts in statuses."
            (handle (alist-get 'acct profile)))
       (mastodon-views--add-account-to-list nil id handle))))
 
+
 ;;; ACCOUNT PREFERENCES
 
 (defun mastodon-profile--get-json-value (val)
   "Fetch current VAL ue from account."
   (let* ((url (mastodon-http--api "accounts/verify_credentials"))
          (response (mastodon-http--get-json url)))
-    (if (eq (alist-get val response) ':json-false)
+    (if (eq (alist-get val response) :json-false)
         nil
       (alist-get val response))))
 
@@ -230,7 +225,7 @@ NO-REBLOGS means do not display boosts in statuses."
 (defun mastodon-profile--get-source-value (pref)
   "Return account PREF erence from the \"source\" section on the server."
   (let ((source (mastodon-profile--get-source-values)))
-    (if (eq (alist-get pref source) ':json-false)
+    (if (eq (alist-get pref source) :json-false)
         nil
       (alist-get pref source))))
 
@@ -247,9 +242,7 @@ NO-REBLOGS means do not display boosts in statuses."
          (msg-str "Edit your profile note. C-c C-c to send, C-c C-k to cancel."))
     (switch-to-buffer-other-window buffer)
     (text-mode)
-    (mastodon-tl--set-buffer-spec (buffer-name buffer)
-                                  endpoint
-                                  nil)
+    (mastodon-tl--set-buffer-spec (buffer-name buffer) endpoint nil)
     (setq-local header-line-format
                 (propertize msg-str
                             'face font-lock-comment-face))
@@ -263,7 +256,7 @@ NO-REBLOGS means do not display boosts in statuses."
                         'note-header t)
             "\n")
     (make-local-variable 'after-change-functions)
-    (push #'mastodon-profile--update-note-count after-change-functions)
+    (cl-pushnew #'mastodon-profile--update-note-count after-change-functions)
     (let ((start-point (point)))
       (insert note)
       (goto-char start-point))
@@ -276,13 +269,12 @@ NO-REBLOGS means do not display boosts in statuses."
         (header-region (mastodon-tl--find-property-range 'note-header
                                                          (point-min)))
         (count-region (mastodon-tl--find-property-range 'note-counter
-                                                        (point-min))))
+                                                        (point-min)))
+        (count (number-to-string (mastodon-toot--count-toot-chars
+                                  (buffer-substring-no-properties
+                                   (cdr header-region) (point-max))))))
     (add-text-properties (car count-region) (cdr count-region)
-                         (list 'display
-                               (number-to-string
-                                (mastodon-toot--count-toot-chars
-                                 (buffer-substring-no-properties
-                                  (cdr header-region) (point-max))))))))
+                         (list 'display count))))
 
 (defun mastodon-profile--update-profile-note-cancel ()
   "Cancel updating user profile and kill buffer and window."
@@ -348,20 +340,16 @@ Only do so if `mastodon-profile-account-settings' is nil."
 Store the values in `mastodon-profile-account-settings'.
 Run in `mastodon-mode-hook'.
 If NO-FORCE, only fetch if `mastodon-profile-account-settings' is nil."
-  (unless
-      (and no-force
-           mastodon-profile-account-settings)
+  (unless (and no-force mastodon-profile-account-settings)
     (let ((keys '(locked discoverable display_name bot))
           (source-keys '(privacy sensitive language)))
       (mapc (lambda (k)
               (mastodon-profile--update-preference-plist
-               k
-               (mastodon-profile--get-json-value k)))
+               k (mastodon-profile--get-json-value k)))
             keys)
       (mapc (lambda (sk)
               (mastodon-profile--update-preference-plist
-               sk
-               (mastodon-profile--get-source-value sk)))
+               sk (mastodon-profile--get-source-value sk)))
             source-keys)
       ;; hack for max toot chars:
       (mastodon-toot--get-max-toot-chars :no-toot)
@@ -403,18 +391,16 @@ Current settings are fetched from the server."
                   (mastodon-profile--get-source-value key)
                 (mastodon-profile--get-json-value key)))
          (prompt (format "Account setting %s is %s. Toggle?" key val)))
-    (if val
-        (when (y-or-n-p prompt)
-          (mastodon-profile--update-preference (symbol-name key) "false" source))
-      (when (y-or-n-p prompt)
-        (mastodon-profile--update-preference (symbol-name key) "true" source)))))
+    (when (y-or-n-p prompt)
+      (mastodon-profile--update-preference (symbol-name key)
+                                           (if val "false" "true")
+                                           source))))
 
 (defun mastodon-profile--edit-string-value (key)
   "Edit the string for account preference KEY."
   (let* ((val (mastodon-profile--get-json-value key))
-         (new-val
-          (read-string (format "Edit account setting %s: " key)
-                       val)))
+         (new-val (read-string (format "Edit account setting %s: " key)
+                               val)))
     (mastodon-profile--update-preference (symbol-name key) new-val)))
 
 (defun mastodon-profile--update-display-name ()
@@ -430,10 +416,8 @@ Returns an alist."
                                      (format "fields_attributes[%s][value]" count)))))
     (cl-loop for a-pair in keys
              for b-pair in fields
-             append (list (cons (car a-pair)
-                                (car b-pair))
-                          (cons (cdr a-pair)
-                                (cdr b-pair))))))
+             append (list (cons (car a-pair) (car b-pair))
+                          (cons (cdr a-pair) (cdr b-pair))))))
 
 (defun mastodon-profile--update-meta-fields ()
   "Prompt for new metadata fields information and PATCH the server."
@@ -445,8 +429,8 @@ Returns an alist."
     (mastodon-http--triage response
                            (lambda ()
                              (mastodon-profile--fetch-server-account-settings)
-                             (message "Account setting %s updated to %s!"
-                                      "metadata fields" fields-updated)))))
+                             (message "Metadata fields updated to %s!"
+                                      fields-updated)))))
 
 (defun mastodon-profile--update-meta-fields-alist ()
   "Prompt for new metadata fields information.
@@ -457,19 +441,14 @@ Returns the results as an alist."
                      (mastodon-profile--get-source-value 'fields))))
     ;; offer empty fields if user currently has less than four filled:
     (while (< (length fields-old) 4)
-      (setq fields-old
-            (append fields-old '(("" . "")))))
-    (let ((alist
+      (setq fields-old (append fields-old '(("" . "")))))
+    (let ((f-str "Metadata %s [%s/4] (max. 255 chars): ")
+          (alist
            (cl-loop for f in fields-old
                     for x from 1 to 5
                     collect
-                    (cons (read-string
-                           (format "Metadata key [%s/4] (max. 255 chars): " x)
-                           (car f))
-                          (read-string
-                           (format "Metadata value [%s/4] (max. 255 chars): " x)
-                           (cdr f))))))
-      ;; hack to avoiding using `string-limit', which req. 28.1:
+                    (cons (read-string (format f-str "key" x) (car f))
+                          (read-string (format f-str "value" x) (cdr f))))))
       (mapcar (lambda (x)
                 (cons (mastodon-profile--limit-to-255 (car x))
                       (mastodon-profile--limit-to-255 (cdr x))))
@@ -499,37 +478,34 @@ This endpoint only holds a few preferences. For others, see
       (mastodon-tl--set-buffer-spec (buffer-name buf) "preferences" nil)
       (while response
         (let ((el (pop response)))
-          (insert
-           (format "%-30s %s"
-                   (prin1-to-string (car el))
-                   (prin1-to-string (cdr el)))
-           "\n\n")))
+          (insert (format "%-30s %s"
+                          (prin1-to-string (car el))
+                          (prin1-to-string (cdr el)))
+                  "\n\n")))
       (goto-char (point-min)))))
 
-;; PROFILE VIEW DETAILS
+
+;;; PROFILE VIEW DETAILS
 
 (defun mastodon-profile--relationships-get (id)
   "Fetch info about logged-in user's relationship to user with id ID."
   (let* ((their-id id)
          (args `(("id[]" . ,their-id)))
          (url (mastodon-http--api "accounts/relationships")))
-    ;; FIXME: not sure why we need to do this for relationships only!
-    (car (mastodon-http--get-json url args))))
+    (car (mastodon-http--get-json url args)))) ; API takes array, just get 1st
 
 (defun mastodon-profile--fields-get (&optional account fields)
   "Fetch the fields vector (aka profile metadata) from profile of ACCOUNT.
 Returns an alist.
 FIELDS means provide a fields vector fetched by other means."
-  (let ((fields (or fields
-                    (mastodon-profile--account-field account 'fields))))
+  (let ((fields (or fields (alist-get 'fields account))))
     (when fields
       (mastodon-tl--map-alist-vals-to-alist 'name 'value fields))))
 
 (defun mastodon-profile--fields-insert (fields)
   "Format and insert field pairs (a.k.a profile metadata) in FIELDS."
   (let* ((car-fields (mapcar #'car fields))
-         (left-width (cl-reduce
-                      #'max (mapcar #'length car-fields))))
+         (left-width (cl-reduce #'max (mapcar #'length car-fields))))
     (mapconcat (lambda (field)
                  (mastodon-tl--render-text
                   (concat
@@ -541,7 +517,7 @@ FIELDS means provide a fields vector fetched by other means."
 
 (defun mastodon-profile--get-statuses-pinned (account)
   "Fetch the pinned toots for ACCOUNT."
-  (let* ((id (mastodon-profile--account-field account 'id))
+  (let* ((id (alist-get 'id account))
          (args `(("pinned" . "true")))
          (url (mastodon-http--api (format "accounts/%s/statuses" id))))
     (mastodon-http--get-json url args)))
@@ -549,143 +525,123 @@ FIELDS means provide a fields vector fetched by other means."
 (defun mastodon-profile--insert-statuses-pinned (pinned-statuses)
   "Insert each of the PINNED-STATUSES for a given account."
   (mapc (lambda (pinned-status)
-          (insert (mastodon-tl--set-face
-                   "   :pinned: " 'success))
+          (insert (mastodon-tl--set-face "   :pinned: " 'success))
           (mastodon-tl--toot pinned-status))
         pinned-statuses))
 
-(defun mastodon-profile--make-profile-buffer-for (account endpoint-type
-                                                          update-function
-                                                          &optional no-reblogs headers)
+(defun mastodon-profile--follows-p (list)
+  "T if you have any relationship with the accounts in LIST."
+  (let (result)
+    (dolist (x list result)
+      (when (not (equal :json-false x))
+        (setq result x)))))
+
+(defun mastodon-profile--make-profile-buffer-for
+    (account endpoint-type update-function &optional no-reblogs headers)
   "Display profile of ACCOUNT, using ENDPOINT-TYPE and UPDATE-FUNCTION.
 NO-REBLOGS means do not display boosts in statuses.
 HEADERS means also fetch link headers for pagination."
-  (let* ((id (mastodon-profile--account-field account 'id))
-         (args `(("limit" . ,mastodon-tl--timeline-posts-count)))
-         (args (if no-reblogs (push '("exclude_reblogs" . "t") args) args))
-         (endpoint (format "accounts/%s/%s" id endpoint-type))
-         (url (mastodon-http--api endpoint))
-         (acct (mastodon-profile--account-field account 'acct))
-         (buffer (concat "*mastodon-" acct "-"
-                         (if no-reblogs
-                             (concat endpoint-type "-no-boosts")
-                           endpoint-type)
-                         "*"))
-         (response (if headers
-                       (mastodon-http--get-response url args)
-                     (mastodon-http--get-json url args)))
-         (json (if headers (car response) response))
-         (link-header (when headers
-                        (mastodon-tl--get-link-header-from-response
-                         (cdr response))))
-         (note (mastodon-profile--account-field account 'note))
-         (locked (mastodon-profile--account-field account 'locked))
-         (followers-count (mastodon-tl--as-string
-                           (mastodon-profile--account-field
-                            account 'followers_count)))
-         (following-count (mastodon-tl--as-string
-                           (mastodon-profile--account-field
-                            account 'following_count)))
-         (toots-count (mastodon-tl--as-string
-                       (mastodon-profile--account-field
-                        account 'statuses_count)))
-         (relationships (mastodon-profile--relationships-get id))
-         (requested-you (when (not (seq-empty-p relationships))
-                          (alist-get 'requested_by relationships)))
-         (followed-by-you (when (not (seq-empty-p relationships))
-                            (alist-get 'following relationships)))
-         (follows-you (when (not (seq-empty-p relationships))
-                        (alist-get 'followed_by relationships)))
-         (followsp (or (equal follows-you 't) (equal followed-by-you 't)
-                       (equal requested-you 't)))
-         (fields (mastodon-profile--fields-get account))
-         (pinned (mastodon-profile--get-statuses-pinned account))
-         (joined (mastodon-profile--account-field account 'created_at)))
-    (with-mastodon-buffer buffer #'mastodon-mode nil
-      (mastodon-profile-mode)
-      (setq mastodon-profile--account account)
-      (mastodon-tl--set-buffer-spec buffer
-                                    endpoint
-                                    update-function
-                                    link-header)
-      (let* ((inhibit-read-only t)
-             (is-statuses (string= endpoint-type "statuses"))
-             (is-followers (string= endpoint-type "followers"))
-             (is-following (string= endpoint-type "following"))
-             (endpoint-name (cond
-                             (is-statuses (if no-reblogs
-                                              "  TOOTS (no boosts)"
-                                            "    TOOTS    "))
-                             (is-followers "  FOLLOWERS  ")
-                             (is-following "  FOLLOWING  "))))
-        (insert
-         (propertize
-          (concat
-           "\n"
-           (mastodon-profile--image-from-account account 'avatar_static)
-           (mastodon-profile--image-from-account account 'header_static)
-           "\n"
-           (propertize (mastodon-profile--account-field
-                        account 'display_name)
-                       'face 'mastodon-display-name-face)
-           "\n"
-           (propertize (concat "@" acct)
-                       'face 'default)
-           (if (equal locked t)
-               (concat " " (mastodon-tl--symbol 'locked))
-             "")
-           "\n " mastodon-tl--horiz-bar "\n"
-           ;; profile note:
-           ;; account here to enable tab-stops in profile note
-           (mastodon-tl--render-text note account)
-           ;; meta fields:
-           (if fields
-               (concat "\n"
-                       (mastodon-tl--set-face
-                        (mastodon-profile--fields-insert fields)
-                        'success))
-             "")
-           "\n"
-           ;; Joined date:
+  (let-alist account
+    (let* ((args `(("limit" . ,mastodon-tl--timeline-posts-count)))
+           (args (if no-reblogs (push '("exclude_reblogs" . "t") args) args))
+           (endpoint (format "accounts/%s/%s" .id endpoint-type))
+           (url (mastodon-http--api endpoint))
+           (buffer (concat "*mastodon-" .acct "-"
+                           (if no-reblogs
+                               (concat endpoint-type "-no-boosts")
+                             endpoint-type)
+                           "*"))
+           (response (if headers
+                         (mastodon-http--get-response url args)
+                       (mastodon-http--get-json url args)))
+           (json (if headers (car response) response))
+           (link-header (when headers
+                          (mastodon-tl--get-link-header-from-response
+                           (cdr response))))
+           (fields (mastodon-profile--fields-get account))
+           (pinned (mastodon-profile--get-statuses-pinned account))
+           (relationships (mastodon-profile--relationships-get .id)))
+      (with-mastodon-buffer buffer #'mastodon-mode nil
+        (mastodon-profile-mode)
+        (remove-overlays)
+        (setq mastodon-profile--account account)
+        (mastodon-tl--set-buffer-spec buffer endpoint
+                                      update-function link-header)
+        (let* ((inhibit-read-only t)
+               (is-statuses (string= endpoint-type "statuses"))
+               (is-followers (string= endpoint-type "followers"))
+               (is-following (string= endpoint-type "following"))
+               (endpoint-name (cond
+                               (is-statuses (if no-reblogs
+                                                "  TOOTS (no boosts)"
+                                              "    TOOTS    "))
+                               (is-followers "  FOLLOWERS  ")
+                               (is-following "  FOLLOWING  "))))
+          (insert
            (propertize
-            (mastodon-profile--format-joined-date-string joined)
-            'face 'success)
-           "\n\n")
-          'profile-json account)
-         ;; insert counts
-         (mastodon-tl--set-face
-          (concat " " mastodon-tl--horiz-bar "\n"
-                  " TOOTS: " toots-count " | "
-                  "FOLLOWERS: " followers-count " | "
-                  "FOLLOWING: " following-count "\n"
-                  " " mastodon-tl--horiz-bar "\n\n")
-          'success)
-         ;; insert relationship (follows)
-         (if followsp
-             (mastodon-tl--set-face
-              (concat (when (equal follows-you 't)
-                        " | FOLLOWS YOU")
-                      (when (equal followed-by-you 't)
-                        " | FOLLOWED BY YOU")
-                      (when (equal requested-you 't)
-                        " | REQUESTED TO FOLLOW YOU")
-                      "\n\n")
-              'success)
-           "") ; if no followsp we still need str-or-char-p for insert
-         ;; insert endpoint
-         (mastodon-tl--set-face
-          (concat " " mastodon-tl--horiz-bar "\n"
-                  endpoint-name "\n"
-                  " " mastodon-tl--horiz-bar "\n")
-          'success))
-        (setq mastodon-tl--update-point (point))
-        (mastodon-media--inline-images (point-min) (point))
-        ;; 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
-        (funcall update-function json)))
-    (goto-char (point-min))))
+            (concat
+             "\n"
+             (mastodon-profile--image-from-account account 'avatar_static)
+             (mastodon-profile--image-from-account account 'header_static)
+             "\n"
+             (propertize .display_name 'face 'mastodon-display-name-face)
+             "\n"
+             (propertize (concat "@" .acct) 'face 'default)
+             (if (equal .locked t)
+                 (concat " " (mastodon-tl--symbol 'locked))
+               "")
+             "\n " mastodon-tl--horiz-bar "\n"
+             ;; profile note:
+             (mastodon-tl--render-text .note account) ; account = tab-stops in profile
+             ;; meta fields:
+             (if fields
+                 (concat "\n" (mastodon-tl--set-face
+                               (mastodon-profile--fields-insert fields)
+                               'success))
+               "")
+             "\n"
+             ;; Joined date:
+             (propertize
+              (mastodon-profile--format-joined-date-string .created_at)
+              'face 'success)
+             "\n\n")
+            'profile-json account)
+           ;; insert counts
+           (mastodon-tl--set-face
+            (concat " " mastodon-tl--horiz-bar "\n"
+                    " TOOTS: " (mastodon-tl--as-string .statuses_count) " | "
+                    "FOLLOWERS: " (mastodon-tl--as-string .followers_count) " | "
+                    "FOLLOWING: " (mastodon-tl--as-string .following_count) "\n"
+                    " " mastodon-tl--horiz-bar "\n\n")
+            'success)
+           ;; insert relationship (follows)
+           (let-alist relationships
+             (let ((followsp (mastodon-profile--follows-p
+                              (list .requested_by .following .followed_by))))
+               (if followsp
+                   (mastodon-tl--set-face
+                    (concat (when (equal .following 't)
+                              " | FOLLOWED BY YOU")
+                            (when (equal .followed_by 't)
+                              " | FOLLOWS YOU")
+                            (when (equal .requested_by 't)
+                              " | REQUESTED TO FOLLOW YOU")
+                            "\n\n")
+                    'success)
+                 ""))) ; for insert call
+           ;; insert endpoint
+           (mastodon-tl--set-face (concat " " mastodon-tl--horiz-bar "\n"
+                                          endpoint-name "\n"
+                                          " " mastodon-tl--horiz-bar "\n")
+                                  'success))
+          (setq mastodon-tl--update-point (point))
+          (mastodon-media--inline-images (point-min) (point))
+          ;; insert pinned toots first
+          (when (and pinned (equal endpoint-type "statuses"))
+            (mastodon-profile--insert-statuses-pinned pinned)
+            (setq mastodon-tl--update-point (point))) ; updates after pinned toots
+          (funcall update-function json)))
+      (goto-char (point-min)))))
 
 (defun mastodon-profile--format-joined-date-string (joined)
   "Format a human-readable Joined string from timestamp JOINED.
@@ -721,9 +677,9 @@ IMG-TYPE is the JSON key from the account data."
                          user-handles
                          nil ; predicate
                          'confirm)))))
-  (if (not (or
-            ;; own profile has no need for toot-json test:
+  (if (not (or ; own profile has no need for toot-json test:
             (equal user-handle (mastodon-auth--get-account-name))
+            (mastodon-tl--profile-buffer-p)
             (mastodon-tl--property 'toot-json :no-move)))
       (message "Looks like there's no toot or user at point?")
     (let ((account (mastodon-profile--lookup-account-in-status
@@ -741,35 +697,29 @@ IMG-TYPE is the JSON key from the account data."
   (message "Loading your profile...")
   (mastodon-profile--show-user (mastodon-auth--get-account-name)))
 
-(defun mastodon-profile--account-field (account field)
-  "Return FIELD from the ACCOUNT.
-FIELD is used to identify regions under `account'."
-  (cdr (assoc field account)))
-
-(defun mastodon-profile--add-author-bylines (tootv)
-  "Convert TOOTV into a author-bylines and insert.
+(defun mastodon-profile--format-user (tootv)
+  "Convert TOOTV into author-bylines and insert.
 Also insert their profile note.
 Used to view a user's followers and those they're following."
-  ;;FIXME change the name of this fun now that we've edited what it does!
   (let ((inhibit-read-only t))
     (unless (seq-empty-p tootv)
-      (mapc (lambda (toot)
-              (let ((start-pos (point)))
-                (insert "\n"
-                        (propertize
-                         (mastodon-tl--byline-author `((account . ,toot))
-                                                     :avatar)
-                         'byline  't
-                         '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"
-                        (propertize
-                         (mastodon-tl--render-text (alist-get 'note toot) nil)
-                         'toot-json toot)                         '
-                        "\n")))
-            tootv))))
+      (mapc
+       (lambda (toot)
+         (let ((start-pos (point)))
+           (insert "\n"
+                   (propertize
+                    (mastodon-tl--byline-author `((account . ,toot)) :avatar)
+                    'byline  't
+                    '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"
+                   (propertize
+                    (mastodon-tl--render-text (alist-get 'note toot) nil)
+                    'toot-json toot)
+                   "\n")))
+       tootv))))
 
 (defun mastodon-profile--search-account-by-handle (handle)
   "Return an account based on a user's HANDLE.
@@ -778,13 +728,12 @@ If the handle does not match a search return then retun NIL."
                      (substring handle 1 (length handle))
                    handle))
          (args `(("q" . ,handle)))
-         (matching-account
-          (seq-remove
-           (lambda (x)
-             (not (string= (alist-get 'acct x) handle)))
-           (mastodon-http--get-json
-            (mastodon-http--api "accounts/search")
-            args))))
+         (matching-account (seq-remove
+                            (lambda (x)
+                              (not (string= (alist-get 'acct x) handle)))
+                            (mastodon-http--get-json
+                             (mastodon-http--api "accounts/search")
+                             args))))
     (when (equal 1 (length matching-account))
       (elt matching-account 0))))
 
@@ -797,21 +746,19 @@ If the handle does not match a search return then retun NIL."
   "Return all user handles found in STATUS.
 These include the author, author of reblogged entries and any user mentioned."
   (when status
-    (let ((this-account
-           (or (alist-get 'account status) ; status is a toot
-               status)) ; status is a user listing
+    (let ((this-account (or (alist-get 'account status) ; status is a toot
+                            status)) ; status is a user listing
 	  (mentions (or (alist-get 'mentions (alist-get 'status status))
                         (alist-get 'mentions status)))
 	  (reblog (or (alist-get 'reblog (alist-get 'status status))
                       (alist-get 'reblog status))))
-      (seq-filter
-       #'stringp
-       (seq-uniq
-        (seq-concatenate
-         'list
-         (list (alist-get 'acct this-account))
-         (mastodon-profile--extract-users-handles reblog)
-         (mastodon-tl--map-alist 'acct mentions)))))))
+      (seq-filter #'stringp
+                  (seq-uniq
+                   (seq-concatenate
+                    'list
+                    (list (alist-get 'acct this-account))
+                    (mastodon-profile--extract-users-handles reblog)
+                    (mastodon-tl--map-alist 'acct mentions)))))))
 
 (defun mastodon-profile--lookup-account-in-status (handle status)
   "Return account for HANDLE using hints in STATUS if possible."
@@ -819,15 +766,12 @@ These include the author, author of reblogged entries and any user mentioned."
          (reblog-account (alist-get 'account (alist-get 'reblog status)))
          (mention-id (seq-some
                       (lambda (mention)
-                        (when (string= handle
-                                       (alist-get 'acct mention))
+                        (when (string= handle (alist-get 'acct mention))
                           (alist-get 'id mention)))
                       (alist-get 'mentions status))))
-    (cond ((string= handle
-                    (alist-get 'acct this-account))
+    (cond ((string= handle (alist-get 'acct this-account))
            this-account)
-          ((string= handle
-                    (alist-get 'acct reblog-account))
+          ((string= handle (alist-get 'acct reblog-account))
            reblog-account)
           (mention-id
            (mastodon-profile--account-from-id mention-id))
@@ -842,8 +786,7 @@ Optionally provide the ID of the account to remove."
          (id (or id (alist-get 'id account)))
          (handle (if account
                      (alist-get 'acct account)
-                   (let ((account
-                          (mastodon-profile--account-from-id id)))
+                   (let ((account (mastodon-profile--account-from-id id)))
                      (alist-get 'acct account))))
          (url (mastodon-http--api
                (format "accounts/%s/remove_from_followers" id))))
@@ -858,8 +801,7 @@ Optionally provide the ID of the account to remove."
   (interactive)
   (let* ((handles (mastodon-profile--extract-users-handles
                    (mastodon-profile--toot-json)))
-         (handle (completing-read "Remove from followers: "
-                                  handles nil))
+         (handle (completing-read "Remove from followers: " handles nil))
          (account (mastodon-profile--lookup-account-in-status
                    handle (mastodon-profile--toot-json)))
          (id (alist-get 'id account)))
@@ -873,11 +815,9 @@ Currently limited to 100 handles. If not found, try
   (let* ((endpoint (format "accounts/%s/followers"
                            (mastodon-auth--get-account-id)))
          (url (mastodon-http--api endpoint))
-         (response (mastodon-http--get-json url
-                                            `(("limit" . "100"))))
+         (response (mastodon-http--get-json url `(("limit" . "100"))))
          (handles (mastodon-tl--map-alist-vals-to-alist 'acct 'id response))
-         (choice (completing-read "Remove from followers: "
-                                  handles))
+         (choice (completing-read "Remove from followers: " handles))
          (id (alist-get choice handles nil nil 'equal)))
     (mastodon-profile--remove-user-from-followers id)))
 
@@ -927,11 +867,11 @@ NOTE-OLD is the text of any existing note."
 (defun mastodon-profile--add-or-view-private-note (action-fun &optional message view)
   "Add or view a private note for an account.
 ACTION-FUN does the adding or viewing, MESSAGE is a prompt for
-`mastodon-tl--interactive-user-handles-get', VIEW is a flag."
+`mastodon-tl--user-handles-get', VIEW is a flag."
   (let* ((profile-json (mastodon-profile--profile-json))
          (handle (if (mastodon-tl--profile-buffer-p)
                      (alist-get 'acct profile-json)
-                   (mastodon-tl--interactive-user-handles-get message)))
+                   (mastodon-tl--user-handles-get message)))
          (account (if (mastodon-tl--profile-buffer-p)
                       profile-json
                     (mastodon-profile--search-account-by-handle handle)))
@@ -953,7 +893,7 @@ the given account."
          (handle
           (if (mastodon-tl--profile-buffer-p)
               (alist-get 'acct profile-json)
-            (mastodon-tl--interactive-user-handles-get "show familiar followers of")))
+            (mastodon-tl--user-handles-get "show familiar followers of")))
          (account (if (mastodon-tl--profile-buffer-p)
                       profile-json
                     (mastodon-profile--search-account-by-handle handle)))
@@ -962,16 +902,15 @@ the given account."
 
 (defun mastodon-profile--get-familiar-followers (id)
   "Return JSON data of familiar followers for account ID."
-  ;; the server can handle multiple IDs, but for now we just handle one.
+  ;; the server handles multiple IDs, but we just handle one.
   (let* ((params `(("id" . ,id)))
          (url (mastodon-http--api "accounts/familiar_followers"))
          (json (mastodon-http--get-json url params))
-         (accounts (alist-get 'accounts (car json))) ; first id result
+         (accounts (alist-get 'accounts (car json))) ; first id
          (handles (mastodon-tl--map-alist 'acct accounts)))
     (if (null handles)
         (message "Looks like there are no familiar followers for this account")
-      (let ((choice (completing-read "Show profile of user: "
-                                     handles)))
+      (let ((choice (completing-read "Show profile of user: " handles)))
         (mastodon-profile--show-user choice)))))
 
 (provide 'mastodon-profile)
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 4b5f2e0..1d78cc2 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -62,9 +62,12 @@
   "Prompt for a search QUERY and return accounts synchronously.
 Returns a nested list containing user handle, display name, and URL."
   (let* ((url (mastodon-http--api "accounts/search"))
-         (response (if (equal mastodon-toot--completion-style-for-mentions "following")
-                       (mastodon-http--get-json url `(("q" . ,query) ("following" . "true")) :silent)
-                     (mastodon-http--get-json url `(("q" . ,query)) :silent))))
+         (response
+          (if (equal mastodon-toot--completion-style-for-mentions "following")
+              (mastodon-http--get-json
+               url `(("q" . ,query) ("following" . "true"))
+               :silent)
+            (mastodon-http--get-json url `(("q" . ,query)) :silent))))
     (mapcar #'mastodon-search--get-user-info-@ response)))
 
 ;; functions for tags completion:
@@ -73,8 +76,7 @@ Returns a nested list containing user handle, display name, and URL."
   "Return an alist containing tag strings plus their URLs.
 QUERY is the string to search."
   (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
-         (params `(("q" . ,query)
-                   ("type" . "hashtags")))
+         (params `(("q" . ,query) ("type" . "hashtags")))
          (response (mastodon-http--get-json url params :silent))
          (tags (alist-get 'hashtags response)))
     (mapcar #'mastodon-search--get-hashtag-info tags)))
@@ -95,10 +97,8 @@ QUERY is the string to search."
 
 (defun mastodon-search--get-full-statuses-data (response)
   "For statuses list in RESPONSE, fetch and return full status JSON."
-  (let ((status-ids-list
-         (mapcar #'mastodon-search--get-id-from-status response)))
-    (mapcar #'mastodon-search--fetch-full-status-from-id
-            status-ids-list)))
+  (let ((status-ids (mapcar #'mastodon-search--get-id-from-status response)))
+    (mapcar #'mastodon-search--fetch-full-status-from-id status-ids)))
 
 (defun mastodon-search--view-trending (type print-fun)
   "Display a list of tags trending on your instance.
@@ -108,18 +108,16 @@ PRINT-FUN is the function used to print the data from the response."
                (format "trends/%s" type)))
          ;; max for statuses = 40, for others = 20
          (params (if (equal type "statuses")
-                     `(("limit" . "40"))
-                   `(("limit" . "20")) ))
+                     '(("limit" . "40"))
+                   '(("limit" . "20"))))
          (response (mastodon-http--get-json url params))
          (data (cond ((equal type "tags")
-                      (mapcar #'mastodon-search--get-hashtag-info
-                              response))
+                      (mapcar #'mastodon-search--get-hashtag-info response))
                      ((equal type "statuses")
                       (mastodon-search--get-full-statuses-data response))
                      ((equal type "links")
                       (message "todo"))))
-         (buffer (get-buffer-create
-                  (format "*mastodon-trending-%s*" type))))
+         (buffer (get-buffer-create (format "*mastodon-trending-%s*" type))))
     (with-mastodon-buffer buffer #'mastodon-mode nil
       (mastodon-tl--set-buffer-spec (buffer-name buffer)
                                     (format "api/v1/trends/%s" type)
@@ -135,6 +133,14 @@ PRINT-FUN is the function used to print the data from the response."
 
 ;; functions for mastodon search
 
+(defun mastodon-search--format-heading (heading)
+  "Format HEADING as a heading."
+  (insert
+   (mastodon-tl--set-face (concat "\n " mastodon-tl--horiz-bar "\n "
+                                  heading "\n"
+                                  " " mastodon-tl--horiz-bar "\n")
+                          'success)))
+
 (defun mastodon-search--search-query (query)
   "Prompt for a search QUERY and return accounts, statuses, and hashtags."
   (interactive "sSearch mastodon for: ")
@@ -144,37 +150,18 @@ PRINT-FUN is the function used to print the data from the response."
          (accts (alist-get 'accounts response))
          (tags (alist-get 'hashtags response))
          (statuses (alist-get 'statuses response))
-         ;; this is now done in search--insert-users-propertized
-         ;; (user-ids (mapcar #'mastodon-search--get-user-info
-         ;; accts)) ; returns a list of three-item lists
-         (tags-list (mapcar #'mastodon-search--get-hashtag-info
-                            tags))
-         (toots-list-json
-          (mastodon-search--get-full-statuses-data statuses)))
+         (tags-list (mapcar #'mastodon-search--get-hashtag-info tags))
+         (toots-list-json (mastodon-search--get-full-statuses-data statuses)))
     (with-mastodon-buffer buffer #'mastodon-mode nil
-      (mastodon-tl--set-buffer-spec buffer
-                                    "api/v2/search"
-                                    nil)
+      (mastodon-tl--set-buffer-spec buffer "api/v2/search" nil)
       ;; user results:
-      (insert (mastodon-tl--set-face
-               (concat "\n " mastodon-tl--horiz-bar "\n"
-                       " USERS\n"
-                       " " mastodon-tl--horiz-bar "\n\n")
-               'success))
+      (mastodon-search--format-heading "USERS")
       (mastodon-search--insert-users-propertized accts :note)
       ;; hashtag results:
-      (insert (mastodon-tl--set-face
-               (concat "\n " mastodon-tl--horiz-bar "\n"
-                       " HASHTAGS\n"
-                       " " mastodon-tl--horiz-bar "\n\n")
-               'success))
+      (mastodon-search--format-heading "HASHTAGS")
       (mastodon-search--print-tags-list tags-list)
       ;; status results:
-      (insert (mastodon-tl--set-face
-               (concat "\n " mastodon-tl--horiz-bar "\n"
-                       " STATUSES\n"
-                       " " mastodon-tl--horiz-bar "\n")
-               'success))
+      (mastodon-search--format-heading "STATUSES")
       (mapc #'mastodon-tl--toot toots-list-json)
       (goto-char (point-min)))))
 
@@ -194,32 +181,32 @@ user's profile note. This is also called by
   "Propertize display string for ACCT, optionally including profile NOTE."
   (let ((user (mastodon-search--get-user-info acct)))
     (propertize
-     (concat (propertize (car user)
-                         'face 'mastodon-display-name-face
-                         'byline t
-                         'toot-id "0")
-             " : \n : "
-             (propertize (concat "@" (cadr user))
-                         'face 'mastodon-handle-face
-                         'mouse-face 'highlight
-		         'mastodon-tab-stop 'user-handle
-		         'keymap mastodon-tl--link-keymap
-                         'mastodon-handle (concat "@" (cadr user))
-		         'help-echo (concat "Browse user profile of @" (cadr user)))
-             " : \n"
-             (if note
-                 (mastodon-tl--render-text (cadddr user) acct)
-               "")
-             "\n")
-     'toot-json acct))) ; so named for compat w other processing functions
+     (concat
+      (propertize (car user)
+                  'face 'mastodon-display-name-face
+                  'byline t
+                  'toot-id "0")
+      " : \n : "
+      (propertize (concat "@" (cadr user))
+                  'face 'mastodon-handle-face
+                  'mouse-face 'highlight
+		          'mastodon-tab-stop 'user-handle
+		          'keymap mastodon-tl--link-keymap
+                  'mastodon-handle (concat "@" (cadr user))
+		          'help-echo (concat "Browse user profile of @" (cadr user)))
+      " : \n"
+      (if note
+          (mastodon-tl--render-text (cadddr user) acct)
+        "")
+      "\n")
+     'toot-json acct))) ; for compat w other processing functions
 
 (defun mastodon-search--print-tags-list (tags)
   "Insert a propertized list of TAGS."
   (mapc (lambda (el)
           (insert
            " : "
-           (propertize (concat "#"
-                               (car el))
+           (propertize (concat "#" (car el))
                        'face '(:box t)
                        'mouse-face 'highlight
                        'mastodon-tag (car el)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index f9db25a..360aeaa 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -60,7 +60,6 @@
 (autoload 'mastodon-media--inline-images "mastodon-media")
 (autoload 'mastodon-notifications--filter-types-list "mastodon-notifications")
 (autoload 'mastodon-notifications--get-mentions "mastodon-notifications")
-(autoload 'mastodon-profile--account-field "mastodon-profile")
 (autoload 'mastodon-profile--account-from-id "mastodon-profile")
 (autoload 'mastodon-profile--extract-users-handles "mastodon-profile")
 (autoload 'mastodon-profile--get-preferences-pref "mastodon-profile")
@@ -128,7 +127,7 @@ nil."
 
 (defcustom mastodon-tl--show-stats t
   "Whether to show toot stats (faves, boosts, replies counts)."
-  :type 'bool)
+  :type 'boolean)
 
 (defcustom mastodon-tl--symbols
   '((reply     . ("💬" . "R"))
@@ -258,7 +257,7 @@ types of mastodon links and not just shr.el-generated ones.")
 It is active where point is placed by `mastodon-tl--goto-next-toot.'")
 
 
-;;; BUFFER MACRO
+;;; MACROS
 
 (defmacro with-mastodon-buffer (buffer mode-fun other-window &rest body)
   "Evaluate BODY in a new or existing buffer called BUFFER.
@@ -276,6 +275,21 @@ than `switch-to-buffer'."
          (switch-to-buffer ,buffer))
        ,@body)))
 
+(defmacro mastodon-tl--do-if-toot (&rest body)
+  "Execute BODY if we have a toot or user at point."
+  (declare (debug t))
+  `(if (and (not (mastodon-tl--profile-buffer-p))
+            (not (mastodon-tl--property 'toot-json))) ; includes user listings
+       (message "Looks like there's no toot or user at point?")
+     ,@body))
+
+(defmacro mastodon-tl--do-if-toot-strict (&rest body)
+  "Execute BODY if we have a toot, and only a toot, at point."
+  (declare (debug t))
+  `(if (not (mastodon-tl--property 'toot-id :no-move))
+       (message "Looks like there's no toot at point?")
+     ,@body))
+
 
 ;;; NAV
 
@@ -283,7 +297,8 @@ than `switch-to-buffer'."
   "Move to the next interesting item.
 This could be the next toot, link, or image; whichever comes first.
 Don't move if nothing else to move to is found, i.e. near the end of the buffer.
-This also skips tab items in invisible text, i.e. hidden spoiler text."
+This also skips tab items in invisible text, i.e. hidden spoiler text.
+PREVIOUS means move to previous item."
   (interactive)
   (let (next-range
         (search-pos (point)))
@@ -326,6 +341,15 @@ Optionally start from POS."
           (mastodon-tl--message-help-echo))
       (funcall refresh))))
 
+(defun mastodon-tl--scroll-up-command ()
+  "Call `scroll-up-command', loading more toots if necessary.
+If we hit `point-max', call `mastodon-tl--more' then `scroll-up-command'."
+  (interactive)
+  (if (not (equal (point) (point-max)))
+      (scroll-up-command)
+    (mastodon-tl--more)
+    (scroll-up-command)))
+
 (defun mastodon-tl--goto-next-toot ()
   "Jump to next toot header."
   (interactive)
@@ -425,15 +449,12 @@ With a double PREFIX arg, limit results to your own instance."
       (let ((list (mastodon-http--build-array-params-alist "any[]" (cdr tag))))
         (while list
           (push (pop list) params))))
-    (mastodon-tl--init (if (listp tag)
-                           "tags-multiple"
-                         (concat "tag-" tag))
-                       (concat "timelines/tag/" (if (listp tag)
-                                                    ;; endpoint must be /tag/:sth
-                                                    (car tag) tag))
-                       'mastodon-tl--timeline
-                       nil
-                       params)))
+    (mastodon-tl--init
+     (if (listp tag) "tags-multiple" (concat "tag-" tag))
+     (concat "timelines/tag/" (if (listp tag) (car tag) tag)) ; must be /tag/:sth
+     'mastodon-tl--timeline
+     nil
+     params)))
 
 
 ;;; BYLINES, etc.
@@ -441,9 +462,8 @@ With a double PREFIX arg, limit results to your own instance."
 (defun mastodon-tl--message-help-echo ()
   "Call message on `help-echo' property at point.
 Do so if type of status at poins is not follow_request/follow."
-  (let ((type (alist-get
-               'type
-               (mastodon-tl--property 'toot-json :no-move)))
+  (let ((type (alist-get 'type
+                         (mastodon-tl--property 'toot-json :no-move)))
         (echo (mastodon-tl--property 'help-echo :no-move)))
     (when echo ; not for followers/following in profile
       (unless (or (string= type "follow_request")
@@ -453,25 +473,20 @@ Do so if type of status at poins is not follow_request/follow."
 (defun mastodon-tl--byline-author (toot &optional avatar)
   "Propertize author of TOOT.
 With arg AVATAR, include the account's avatar image."
-  (let* ((account (alist-get 'account toot))
-         (handle (alist-get 'acct account))
-         (name (if (not (string-empty-p (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)))
+  (let-alist toot
     (concat
-     ;; avatar insertion moved up to `mastodon-tl--byline' by default in order
-     ;; to be outside of text prop 'byline t. arg avatar is used by
-     ;; `mastodon-profile--add-author-bylines'
-     (when (and avatar
+     ;; avatar insertion moved up to `mastodon-tl--byline' by default to be
+     ;; outside 'byline propt.
+     (when (and avatar ; used by `mastodon-profile--format-user'
                 mastodon-tl--show-avatars
                 mastodon-tl--display-media-p
                 (if (version< emacs-version "27.1")
                     (image-type-available-p 'imagemagick)
                   (image-transforms-p)))
-       (mastodon-media--get-avatar-rendering avatar-url))
-     (propertize name
+       (mastodon-media--get-avatar-rendering .account.avatar))
+     (propertize (if (not (string-empty-p .account.display_name))
+                     .account.display_name
+                   .account.username)
                  'face 'mastodon-display-name-face
                  ;; enable playing of videos when point is on byline:
                  'attachments (mastodon-tl--get-attachments-for-byline toot)
@@ -485,15 +500,15 @@ With arg AVATAR, include the account's avatar image."
                              (string-suffix-p "-following*" (buffer-name)))
                    (mastodon-tl--format-byline-help-echo toot)))
      " ("
-     (propertize (concat "@" handle)
+     (propertize (concat "@" .account.acct)
                  'face 'mastodon-handle-face
                  'mouse-face 'highlight
 	         'mastodon-tab-stop 'user-handle
-                 'account account
-	         'shr-url profile-url
+                 'account .account
+	         'shr-url .account.url
 	         'keymap mastodon-tl--link-keymap
-                 'mastodon-handle (concat "@" handle)
-	         'help-echo (concat "Browse user profile of @" handle))
+                 'mastodon-handle (concat "@" .account.acct)
+	         'help-echo (concat "Browse user profile of @" .account.acct))
      ")")))
 
 (defun mastodon-tl--format-byline-help-echo (toot)
@@ -503,11 +518,10 @@ moving image media from the byline.
 Used when point is at the start of a byline, i.e. where
 `mastodon-tl--goto-next-toot' leaves point."
   (let* ((toot-to-count
-          (or
-           ;; simply praying this order works
+          (or ; simply praying this order works
            (alist-get 'status toot) ; notifications timeline
-           ;; fol-req notif, has 'type
-           ;; placed before boosts coz fol-reqs have a (useless) reblog entry:
+           ;; fol-req notif, has 'type placed before boosts coz fol-reqs have
+           ;; a (useless) reblog entry:
            (when (and (or (mastodon-tl--buffer-type-eq 'notifications)
                           (mastodon-tl--buffer-type-eq 'mentions))
                       (alist-get 'type toot))
@@ -521,9 +535,8 @@ Used when point is at the start of a byline, i.e. where
              (format-media (when media-types
                              (format "media: %s"
                                      (mapconcat #'identity media-types " "))))
-             (format-media-binding (when (and (or
-                                               (member "video" media-types)
-                                               (member "gifv" media-types))
+             (format-media-binding (when (and (or (member "video" media-types)
+                                                  (member "gifv" media-types))
                                               (require 'mpv nil :no-error))
                                      (format " | C-RET to view with mpv"))))
         (format "%s" (concat format-media format-media-binding))))))
@@ -537,25 +550,19 @@ Used when point is at the start of a byline, i.e. where
   "Return a list of attachment URLs and types for TOOT.
 The result is added as an attachments property to author-byline."
   (let ((media-attachments (mastodon-tl--field 'media_attachments toot)))
-    (mapcar
-     (lambda (attachement)
-       (let ((remote-url
-              (or (alist-get 'remote_url attachement)
-                  ;; fallback b/c notifications don't have remote_url
-                  (alist-get 'url attachement)))
-             (type (alist-get 'type attachement)))
-         `(:url ,remote-url :type ,type)))
-     media-attachments)))
+    (mapcar (lambda (attachment)
+              (let-alist attachment
+                (list :url (or .remote_url .url) ; fallback for notifications
+                      :type .type)))
+            media-attachments)))
 
 (defun mastodon-tl--byline-boosted (toot)
   "Add byline for boosted data from TOOT."
   (let ((reblog (alist-get 'reblog toot)))
     (when reblog
       (concat
-       "\n  "
-       (propertize "Boosted" 'face 'mastodon-boosted-face)
-       " "
-       (mastodon-tl--byline-author reblog)))))
+       "\n  " (propertize "Boosted" 'face 'mastodon-boosted-face)
+       " " (mastodon-tl--byline-author reblog)))))
 
 (defun mastodon-tl--format-faved-or-boosted-byline (letter)
   "Format the byline marker for a boosted or favourited status.
@@ -583,8 +590,7 @@ DETAILED-P means display more detailed info. For now
 this just means displaying toot client."
   (let* ((created-time
           ;; bosts and faves in notifs view
-          ;; (makes timestamps be for the original toot
-          ;; not the boost/fave):
+          ;; (makes timestamps be for the original toot not the boost/fave):
           (or (mastodon-tl--field 'created_at
                                   (mastodon-tl--field 'status toot))
               ;; all other toots, inc. boosts/faves in timelines:
@@ -597,6 +603,7 @@ this just means displaying toot client."
          (visibility (mastodon-tl--field 'visibility toot))
          (account (alist-get 'account toot))
          (avatar-url (alist-get 'avatar account))
+         (type (alist-get 'type toot))
          (edited-time (alist-get 'edited_at toot))
          (edited-parsed (when edited-time (date-to-time edited-time))))
     (concat
@@ -631,9 +638,11 @@ this just means displaying toot client."
        (funcall author-byline toot)
        ;; visibility:
        (cond ((equal visibility "direct")
-              (concat " " (mastodon-tl--symbol 'direct)))
+              (propertize (concat " " (mastodon-tl--symbol 'direct))
+                          'help-echo visibility))
              ((equal visibility "private")
-              (concat " " (mastodon-tl--symbol 'private))))
+              (propertize (concat " " (mastodon-tl--symbol 'private))
+                          'help-echo visibility)))
        (funcall action-byline toot)
        " "
        (propertize
@@ -673,7 +682,8 @@ this just means displaying toot client."
          "")
        (propertize (concat "\n  " mastodon-tl--horiz-bar)
                    'face 'default)
-       (if mastodon-tl--show-stats
+       (if (and mastodon-tl--show-stats
+                (not (member type '("follow" "follow_request"))))
            (mastodon-tl--toot-stats toot)
          "")
        "\n")
@@ -793,13 +803,10 @@ START and END are the boundaries of the link in the toot."
                          url toot-instance-url))
          (maybe-userhandle
           (if (proper-list-p toot) ; fails for profile buffers?
-              (or (mastodon-tl--userhandle-from-mentions toot
-                                                         link-str)
+              (or (mastodon-tl--userhandle-from-mentions toot link-str)
                   ;; FIXME: if prev always works, cut this:
-                  (mastodon-tl--extract-userhandle-from-url
-                   url link-str))
-            (mastodon-tl--extract-userhandle-from-url
-             url link-str))))
+                  (mastodon-tl--extract-userhandle-from-url url link-str))
+            (mastodon-tl--extract-userhandle-from-url url link-str))))
     (cond (;; Hashtags:
            maybe-hashtag
            (setq mastodon-tab-stop-type 'hashtag
@@ -820,9 +827,7 @@ START and END are the boundaries of the link in the toot."
                                      (when maybe-userid
                                        (list 'account-id maybe-userid))))))
           ;; Anything else:
-          (t
-           ;; Leave it as a url handled by shr.el.
-           ;; (We still have to replace the keymap so that tabbing works.)
+          (t ; Leave it as a url handled by shr.el.
            (setq keymap (if (eq shr-map (get-text-property start 'keymap))
                             mastodon-tl--shr-map-replacement
                           mastodon-tl--shr-image-map-replacement)
@@ -836,28 +841,26 @@ START and END are the boundaries of the link in the toot."
 
 (defun mastodon-tl--userhandle-from-mentions (toot link)
   "Extract a user handle from mentions in json TOOT.
-LINK is maybe the '@handle' to search for."
+LINK is maybe the `@handle' to search for."
   (mastodon-tl--extract-el-from-mentions 'acct toot link))
 
 (defun mastodon-tl--extract-userid-toot (toot link)
   "Extract a user id for an ACCT from mentions in a TOOT.
-LINK is maybe the '@handle' to search for."
+LINK is maybe the `@handle' to search for."
   (mastodon-tl--extract-el-from-mentions 'id toot link))
 
 (defun mastodon-tl--extract-el-from-mentions (el toot link)
   "Extract element EL from TOOT mentions that matches LINK.
-LINK should be a simple handle string with no domain, i.e. @user.
-Return nil if no matching element"
+LINK should be a simple handle string with no domain, i.e. \"@user\".
+Return nil if no matching element."
   ;; Must return nil if nothing found!
-  ;; TODO: we should break the while loop as soon as we get sth
   (let ((mentions (append (alist-get 'mentions toot) nil)))
     (when mentions
       (let* ((mention (pop mentions))
              (name (substring-no-properties link 1 (length link))) ; cull @
              return)
         (while mention
-          (when (string= (alist-get 'username mention)
-                         name)
+          (when (string= name (alist-get 'username mention))
             (setq return (alist-get el mention)))
           (setq mention (pop mentions)))
         return))))
@@ -871,10 +874,12 @@ this should be of the form <at-sign><user id>, e.g. \"@Gargon\"."
                    (url-host (url-generic-parse-url mastodon-instance-url))
                    (url-host parsed-url))))
     (when (and (string= "@" (substring buffer-text 0 1))
+               ;; don't error on domain only url (rare):
+               (not (string= "" (url-filename parsed-url)))
                (string= (downcase buffer-text)
                         (downcase (substring (url-filename parsed-url) 1))))
       (if local-p
-          buffer-text ; no instance suffic for local mention
+          buffer-text ; no instance suffix for local mention
         (concat buffer-text "@" (url-host parsed-url))))))
 
 (defun mastodon-tl--extract-hashtag-from-url (url instance-url)
@@ -898,17 +903,15 @@ the toot)."
 (defun mastodon-tl--make-link (string link-type)
   "Return a propertized version of STRING that will act like link.
 LINK-TYPE is the type of link to produce."
-  (let ((help-text (cond
-                    ((eq link-type 'content-warning)
-                     "Toggle hidden text")
-                    (t
-                     (error "Unknown link type %s" link-type)))))
-    (propertize
-     string
-     'mastodon-tab-stop link-type
-     'mouse-face 'highlight
-     'keymap mastodon-tl--link-keymap
-     'help-echo help-text)))
+  (let ((help-text (cond ((eq link-type 'content-warning)
+                          "Toggle hidden text")
+                         (t
+                          (error "Unknown link type %s" link-type)))))
+    (propertize string
+                'mastodon-tab-stop link-type
+                'mouse-face 'highlight
+                'keymap mastodon-tl--link-keymap
+                'help-echo help-text)))
 
 (defun mastodon-tl--do-link-action-at-point (position)
   "Do the action of the link at POSITION.
@@ -918,7 +921,8 @@ Used for hitting RET on a given link."
     (cond ((eq link-type 'content-warning)
            (mastodon-tl--toggle-spoiler-text position))
           ((eq link-type 'hashtag)
-           (mastodon-tl--show-tag-timeline nil (get-text-property position 'mastodon-tag)))
+           (mastodon-tl--show-tag-timeline
+            nil (get-text-property position 'mastodon-tag)))
           ;; 'account / 'account-id is not set for mentions, only bylines
           ((eq link-type 'user-handle)
            (let ((account-json (get-text-property position 'account))
@@ -994,8 +998,7 @@ content should be hidden."
 
 (defun mastodon-tl--clean-tabs-and-nl (string)
   "Remove tabs and newlines from STRING."
-  (replace-regexp-in-string
-   "[\t\n ]*\\'" "" string))
+  (replace-regexp-in-string "[\t\n ]*\\'" "" string))
 
 (defun mastodon-tl--spoiler (toot)
   "Render TOOT with spoiler message.
@@ -1005,17 +1008,15 @@ content warning message are displayed. The content warning
 message is a link which unhides/hides the main body."
   (let* ((spoiler (mastodon-tl--field 'spoiler_text toot))
          (string (mastodon-tl--set-face
-                  ;; remove trailing whitespace
                   (mastodon-tl--clean-tabs-and-nl
                    (mastodon-tl--render-text spoiler toot))
                   'default))
-         (message (concat
-                   " " mastodon-tl--horiz-bar "\n "
-                   (mastodon-tl--make-link
-                    (concat "CW: " string)
-                    'content-warning)
-                   "\n "
-                   mastodon-tl--horiz-bar "\n"))
+         (message (concat " " mastodon-tl--horiz-bar "\n "
+                          (mastodon-tl--make-link
+                           (concat "CW: " string)
+                           'content-warning)
+                          "\n "
+                          mastodon-tl--horiz-bar "\n"))
          (cw (mastodon-tl--set-face message 'mastodon-cw-face)))
     (concat
      cw
@@ -1047,36 +1048,25 @@ message is a link which unhides/hides the main body."
 
 (defun mastodon-tl--media-attachment (media-attachment)
   "Return a propertized string for MEDIA-ATTACHMENT."
-  (let* ((preview-url (alist-get 'preview_url media-attachment))
-         (remote-url
-          (or (alist-get 'remote_url media-attachment)
-              ;; fallback b/c notifications don't have remote_url
-              (alist-get 'url media-attachment)))
-         (type (alist-get 'type media-attachment))
-         (caption (alist-get 'description media-attachment))
-         (display-str
-          (if (and mastodon-tl--display-caption-not-url-when-no-media
-                   caption)
-              (concat "Media:: " caption)
-            (concat "Media:: " preview-url))))
-    (if mastodon-tl--display-media-p
-        ;; return placeholder [img]:
-        (mastodon-media--get-media-link-rendering
-         preview-url remote-url type caption) ; 2nd arg for shr-browse-url
-      ;; return URL/caption:
-      (concat (mastodon-tl--propertize-img-str-or-url
-               (concat "Media:: " preview-url) ;; string
-               preview-url remote-url type caption
-               display-str ;; display
-               ;; FIXME: shr-link underlining is awful for captions with
-               ;; newlines, as the underlining runs to the edge of the
-               ;; frame even if the text doesn'
-               'shr-link)
-              "\n"))))
-
-(defun mastodon-tl--propertize-img-str-or-url (str media-url full-remote-url
-                                                   type help-echo
-                                                   &optional display face)
+  (let-alist media-attachment
+    (let ((display-str
+           (if (and mastodon-tl--display-caption-not-url-when-no-media
+                    .description)
+               (concat "Media:: " .description)
+             (concat "Media:: " .preview_url))))
+      (if mastodon-tl--display-media-p
+          (mastodon-media--get-media-link-rendering ; placeholder: "[img]"
+           .preview_url (or .remote_url .url) .type .description) ; 2nd arg for shr-browse-url
+        ;; return URL/caption:
+        (concat (mastodon-tl--propertize-img-str-or-url
+                 (concat "Media:: " .preview_url) ; string
+                 .preview_url .remote_url .type .description
+                 display-str ; display
+                 'shr-link)
+                "\n")))))
+
+(defun mastodon-tl--propertize-img-str-or-url
+    (str media-url full-remote-url type help-echo &optional display face)
   "Propertize an media placeholder string \"[img]\" or media URL.
 STR is the string to propertize, MEDIA-URL is the preview link,
 FULL-REMOTE-URL is the link to the full resolution image on the
@@ -1095,62 +1085,61 @@ HELP-ECHO, DISPLAY, and FACE are the text properties to add."
               'keymap mastodon-tl--shr-image-map-replacement
               'help-echo (if (or (string= type "image")
                                  (string= type nil)
-                                 (string= type "unknown")) ;handle borked images
+                                 (string= type "unknown")) ; handle borked images
                              help-echo
                            (concat help-echo "\nC-RET: play " type " with mpv"))))
 
 
 ;; POLLS
 
+(defun mastodon-tl--format-poll-option (option option-counter longest-option)
+  "Format poll OPTION. OPTION-COUNTER is just a counter.
+LONGEST-OPTION is the option whose length determines the formatting."
+  (format "%s: %s%s%s\n"
+          option-counter
+          (propertize (alist-get 'title option)
+                      'face 'success)
+          (make-string (1+ (- (length longest-option)
+                              (length (alist-get 'title option))))
+                       ?\ )
+          ;; TODO: disambiguate no votes from hidden votes
+          (format "[%s votes]" (or (alist-get 'votes_count option)
+                                   "0"))))
+
 (defun mastodon-tl--get-poll (toot)
   "If TOOT includes a poll, return it as a formatted string."
-  (let* ((poll (mastodon-tl--field 'poll toot))
-         (expiry (mastodon-tl--field 'expires_at poll))
-         (expired-p (if (eq (mastodon-tl--field 'expired poll) :json-false) nil t))
-         ;; (multi (mastodon-tl--field 'multiple poll))
-         (voters-count (mastodon-tl--field 'voters_count poll))
-         (vote-count (mastodon-tl--field 'votes_count poll))
-         (options (mastodon-tl--field 'options poll))
-         (option-titles (mastodon-tl--map-alist 'title options))
-         (longest-option (car (sort option-titles
-                                    (lambda (x y)
-                                      (> (length x)
-                                         (length y))))))
-         (option-counter 0))
-    (concat "\nPoll: \n\n"
-            (mapconcat (lambda (option)
-                         (progn
-                           (format "%s: %s%s%s\n"
-                                   (setq option-counter (1+ option-counter))
-                                   (propertize (alist-get 'title option)
-                                               'face 'success)
-                                   (make-string
-                                    (1+
-                                     (- (length longest-option)
-                                        (length (alist-get 'title
-                                                           option))))
-                                    ?\ )
-                                   ;; TODO: disambiguate no votes from hidden votes
-                                   (format "[%s votes]" (or (alist-get 'votes_count option)
-                                                            "0")))))
-                       options
-                       "\n")
-            "\n"
-            (propertize
-             (cond (voters-count ; sometimes it is nil
-                    (if (= voters-count 1)
-                        (format "%s person | " voters-count)
-                      (format "%s people | " voters-count)))
-                   (vote-count
-                    (format "%s votes | " vote-count))
-                   (t
-                    ""))
-             'face 'font-lock-comment-face)
-            (let ((str (if expired-p
-                           "Poll expired."
-                         (mastodon-tl--format-poll-expiry expiry))))
-              (propertize str 'face 'font-lock-comment-face))
-            "\n")))
+  (let-alist (mastodon-tl--field 'poll toot) ; toot or reblog
+    (let* ((option-titles (mastodon-tl--map-alist 'title .options))
+           (longest-option (car (sort option-titles
+                                      (lambda (x y)
+                                        (> (length x)
+                                           (length y))))))
+           (option-counter 0))
+      (concat "\nPoll: \n\n"
+              (mapconcat (lambda (option)
+                           (setq option-counter (1+ option-counter))
+                           (mastodon-tl--format-poll-option
+                            option option-counter longest-option))
+                         .options
+                         "\n")
+              "\n"
+              (propertize
+               (cond (.voters_count ; sometimes it is nil
+                      (if (= .voters_count 1)
+                          (format "%s person | " .voters_count)
+                        (format "%s people | " .voters_count)))
+                     (.vote_count
+                      (format "%s votes | " .vote_count))
+                     (t
+                      ""))
+               'face 'font-lock-comment-face)
+              (let ((str (if (eq .expired :json-false)
+                             (if (eq .expires_at nil)
+                                 ""
+                               (mastodon-tl--format-poll-expiry .expires_at))
+                           "Poll expired.")))
+                (propertize str 'face 'font-lock-comment-face))
+              "\n"))))
 
 (defun mastodon-tl--format-poll-expiry (timestamp)
   "Convert poll expiry TIMESTAMP into a descriptive string."
@@ -1166,40 +1155,39 @@ HELP-ECHO, DISPLAY, and FACE are the text properties to add."
                    (plist-get parsed :minutes)))
           ((> (plist-get parsed :minutes) 0)
            (format "%s minutes left" (plist-get parsed :minutes)))
-          (t ;; we failed to guess:
+          (t ; we failed to guess:
            (format "%s days, %s hours, %s minutes left"
                    (plist-get parsed :days)
                    (plist-get parsed :hours)
                    (plist-get parsed :minutes))))))
 
+(defun mastodon-tl--read-poll-option ()
+  "Read a poll option to vote on a poll."
+  (let* ((toot (mastodon-tl--property 'toot-json))
+         (poll (mastodon-tl--field 'poll toot))
+         (options (mastodon-tl--field 'options poll))
+         (options-titles (mastodon-tl--map-alist 'title options))
+         (options-number-seq (number-sequence 1 (length options)))
+         (options-numbers (mapcar #'number-to-string options-number-seq))
+         (options-alist (cl-mapcar #'cons options-numbers options-titles))
+         ;; we display both option number and the option title
+         ;; 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))
+                             options-alist)))
+    (if (null poll)
+        (message "No poll here.")
+      (list
+       ;; var "option" = just the cdr, a cons of option number and desc
+       (cdr (assoc (completing-read "Poll option to vote for: "
+                                    candidates
+                                    nil t) ; require match
+                   candidates))))))
+
 (defun mastodon-tl--poll-vote (option)
   "If there is a poll at point, prompt user for OPTION to vote on it."
-  (interactive
-   (list
-    (let* ((toot (mastodon-tl--property 'toot-json))
-           (reblog (alist-get 'reblog toot))
-           (poll (or (alist-get 'poll reblog)
-                     (mastodon-tl--field 'poll toot)))
-           (options (mastodon-tl--field 'options poll))
-           (options-titles (mastodon-tl--map-alist 'title options))
-           (options-number-seq (number-sequence 1 (length options)))
-           (options-numbers (mapcar #'number-to-string options-number-seq))
-           (options-alist (cl-mapcar #'cons options-numbers options-titles))
-           ;; we display both option number and the option title
-           ;; 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))
-                               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))))))
+  (interactive (mastodon-tl--read-poll-option))
   (if (null (mastodon-tl--field 'poll (mastodon-tl--property 'toot-json)))
       (message "No poll here.")
     (let* ((toot (mastodon-tl--property 'toot-json))
@@ -1243,15 +1231,11 @@ HELP-ECHO, DISPLAY, and FACE are the text properties to add."
 URL and TYPE are provided when called while point is on byline,
 in which case play first video or gif from current toot."
   (interactive)
-  (let ((url (or
-              ;; point in byline:
-              url
-              ;; point in toot:
-              (mastodon-tl--property 'image-url :no-move)))
-        (type (or ;; in byline:
-               type
-               ;; point in toot:
-               (mastodon-tl--property 'mastodon-media-type :no-move))))
+  (let ((url (or url ; point in byline:
+                 (mastodon-tl--property 'image-url :no-move))) ; point in toot
+        (type (or type ; in byline
+                  ;; point in toot:
+                  (mastodon-tl--property 'mastodon-media-type :no-move))))
     (if url
         (if (or (equal type "gifv")
                 (equal type "video"))
@@ -1268,22 +1252,17 @@ in which case play first video or gif from current toot."
   "Retrieve text content from TOOT.
 Runs `mastodon-tl--render-text' and fetches poll or media."
   (let* ((content (mastodon-tl--field 'content toot))
-         (reblog (alist-get 'reblog toot))
-         (poll-p (if reblog
-                     (alist-get 'poll reblog)
-                   (alist-get 'poll toot))))
-    (concat
-     (mastodon-tl--render-text content toot)
-     (when poll-p
-       (mastodon-tl--get-poll toot))
-     (mastodon-tl--media toot))))
+         (poll-p (mastodon-tl--field 'poll toot)))
+    (concat (mastodon-tl--render-text content toot)
+            (when poll-p
+              (mastodon-tl--get-poll toot))
+            (mastodon-tl--media toot))))
 
 (defun mastodon-tl--prev-toot-id ()
   "Return the id of the last toot inserted into the buffer."
-  (let ((prev-pos (1- (save-excursion
-                        (previous-single-property-change
-                         (point)
-                         'base-toot-id)))))
+  (let ((prev-pos
+         (1- (save-excursion
+               (previous-single-property-change (point) 'base-toot-id)))))
     (get-text-property prev-pos 'base-toot-id)))
 
 (defun mastodon-tl--after-reply-status (reply-to-id)
@@ -1328,7 +1307,6 @@ THREAD means the status will be displayed in a thread view."
                          'line-prefix bar
                          'wrap-prefix bar))
          body)
-       ;; body
        " \n"
        (mastodon-tl--byline toot author-byline action-byline detailed-p))
       'toot-id      (or id ; notification's own id
@@ -1337,8 +1315,7 @@ THREAD means the status will be displayed in a thread view."
                      ;; if status is a notif, get id from base-toot
                      ;; (-tl--toot-id toot) will not work here:
                      (or base-toot
-                         ;; else normal toot with reblog check:
-                         toot))
+                         toot)) ; else normal toot with reblog check
       'toot-json    toot
       'base-toot    base-toot)
      "\n")
@@ -1366,38 +1343,31 @@ When the TOOT is a reblog (boost), statistics from reblogged
 toots are returned.
 To disable showing the stats, customize
 `mastodon-tl--show-stats'."
-  (when-let ((toot (mastodon-tl--toot-for-stats toot)))
-    (let* ((favourites-count (alist-get 'favourites_count toot))
-           (favourited (equal 't (alist-get 'favourited toot)))
-           (faves-prop (propertize (format "%s" favourites-count)
-                                   'favourites-count favourites-count))
-           (boosts-count (alist-get 'reblogs_count toot))
-           (boosted (equal 't (alist-get 'reblogged toot)))
-           (boosts-prop (propertize (format "%s" boosts-count)
-                                    'boosts-count boosts-count))
-           (replies-count (alist-get 'replies_count toot))
-           (favourites (format "%s %s" faves-prop ;favourites-count
-                               (mastodon-tl--symbol 'favourite)))
-           (boosts (format "%s %s" boosts-prop ;boosts-count
-                           (mastodon-tl--symbol 'boost)))
-           (replies (format "%s %s" replies-count (mastodon-tl--symbol 'reply)))
+  (let-alist (mastodon-tl--toot-for-stats toot)
+    (let* ((faves-prop (propertize (format "%s" .favourites_count)
+                                   'favourites-count .favourites_count))
+           (boosts-prop (propertize (format "%s" .reblogs_count)
+                                    'boosts-count .reblogs_count))
+           (faves (format "%s %s" faves-prop (mastodon-tl--symbol 'favourite)))
+           (boosts (format "%s %s" boosts-prop (mastodon-tl--symbol 'boost)))
+           (replies (format "%s %s" .replies_count (mastodon-tl--symbol 'reply)))
            (status (concat
-                    (propertize favourites
-                                'favourited-p favourited
+                    (propertize faves
+                                'favourited-p (eq 't .favourited)
                                 'favourites-field t
-                                'help-echo (format "%s favourites" favourites-count)
+                                'help-echo (format "%s favourites" .favourites_count)
                                 'face font-lock-comment-face)
                     (propertize " | " 'face font-lock-comment-face)
                     (propertize boosts
-                                'boosted-p boosted
+                                'boosted-p (eq 't .reblogged)
                                 'boosts-field t
-                                'help-echo (format "%s boosts" boosts-count)
+                                'help-echo (format "%s boosts" .reblogs_count)
                                 'face font-lock-comment-face)
                     (propertize " | " 'face font-lock-comment-face)
                     (propertize replies
                                 'replies-field t
-                                'replies-count replies-count
-                                'help-echo (format "%s replies" replies-count)
+                                'replies-count .replies_count
+                                'help-echo (format "%s replies" .replies_count)
                                 'face font-lock-comment-face)))
            (status
             (concat
@@ -1419,16 +1389,11 @@ this just means displaying toot client.
 THREAD means the status will be displayed in a thread view."
   (mastodon-tl--insert-status
    toot
-   (mastodon-tl--clean-tabs-and-nl
-    (if (mastodon-tl--has-spoiler toot)
-        (mastodon-tl--spoiler toot)
-      (mastodon-tl--content toot)))
-   'mastodon-tl--byline-author
-   'mastodon-tl--byline-boosted
-   nil
-   nil
-   detailed-p
-   thread))
+   (mastodon-tl--clean-tabs-and-nl (if (mastodon-tl--has-spoiler toot)
+                                       (mastodon-tl--spoiler toot)
+                                     (mastodon-tl--content toot)))
+   'mastodon-tl--byline-author 'mastodon-tl--byline-boosted
+   nil nil detailed-p thread))
 
 (defun mastodon-tl--timeline (toots &optional thread)
   "Display each toot in TOOTS.
@@ -1440,7 +1405,7 @@ THREAD means the status will be displayed in a thread view."
         (if (eq (mastodon-tl--get-buffer-type) 'profile-statuses)
             toots
           (if (or ; we were called via --more*:
-               (mastodon-tl--get-buffer-property 'hide-replies nil :no-error)
+               (mastodon-tl--buffer-property 'hide-replies nil :no-error)
                ;; loading a tl with a prefix arg:
                (mastodon-tl--hide-replies-p current-prefix-arg))
 	      (cl-remove-if-not #'mastodon-tl--is-reply toots)
@@ -1450,49 +1415,48 @@ THREAD means the status will be displayed in a thread view."
 
 ;;; BUFFER SPEC
 
-(defun mastodon-tl--get-update-function (&optional buffer)
+(defun mastodon-tl--update-function (&optional buffer)
   "Get the UPDATE-FUNCTION stored in `mastodon-tl--buffer-spec'.
 Optionally get it for BUFFER."
-  (mastodon-tl--get-buffer-property 'update-function buffer))
+  (mastodon-tl--buffer-property 'update-function buffer))
 
-(defun mastodon-tl--get-endpoint (&optional buffer no-error)
+(defun mastodon-tl--endpoint (&optional buffer no-error)
   "Get the ENDPOINT stored in `mastodon-tl--buffer-spec'.
 Optionally set it for BUFFER.
 NO-ERROR means to fail silently."
-  (mastodon-tl--get-buffer-property 'endpoint buffer no-error))
+  (mastodon-tl--buffer-property 'endpoint buffer no-error))
 
 (defun mastodon-tl--buffer-name (&optional buffer no-error)
   "Get the BUFFER-NAME stored in `mastodon-tl--buffer-spec'.
 Optionally get it for BUFFER.
 NO-ERROR means to fail silently."
-  (mastodon-tl--get-buffer-property 'buffer-name buffer no-error))
+  (mastodon-tl--buffer-property 'buffer-name buffer no-error))
 
 (defun mastodon-tl--link-header (&optional buffer)
   "Get the LINK HEADER stored in `mastodon-tl--buffer-spec'.
 Optionally get it for BUFFER."
-  (mastodon-tl--get-buffer-property 'link-header buffer :no-error))
+  (mastodon-tl--buffer-property 'link-header buffer :no-error))
 
 (defun mastodon-tl--update-params (&optional buffer)
   "Get the UPDATE PARAMS stored in `mastodon-tl--buffer-spec'.
 Optionally get it for BUFFER."
-  (mastodon-tl--get-buffer-property 'update-params buffer :no-error))
+  (mastodon-tl--buffer-property 'update-params buffer :no-error))
 
-(defun mastodon-tl--get-buffer-property (property &optional buffer no-error)
+(defun mastodon-tl--buffer-property (property &optional buffer no-error)
   "Get PROPERTY from `mastodon-tl--buffer-spec' in BUFFER or `current-buffer'.
 If NO-ERROR is non-nil, do not error when property is empty."
-  (with-current-buffer  (or buffer (current-buffer))
+  (with-current-buffer (or buffer (current-buffer))
     (if no-error
         (plist-get mastodon-tl--buffer-spec property)
       (or (plist-get mastodon-tl--buffer-spec property)
           (error "Mastodon-tl--buffer-spec is not defined for buffer %s"
                  (or buffer (current-buffer)))))))
 
-(defun mastodon-tl--set-buffer-spec (buffer endpoint update-function
-                                            &optional link-header update-params
-                                            hide-replies)
+(defun mastodon-tl--set-buffer-spec
+    (buffer endpoint update-fun &optional link-header update-params hide-replies)
   "Set `mastodon-tl--buffer-spec' for the current buffer.
 BUFFER is buffer name, ENDPOINT is buffer's enpoint,
-UPDATE-FUNCTION is its update function.
+UPDATE-FUN is its update function.
 LINK-HEADER is the http Link header if present.
 UPDATE-PARAMS is any http parameters needed for the update function.
 HIDE-REPLIES is a flag indicating if replies are hidden in the current buffer."
@@ -1501,17 +1465,18 @@ HIDE-REPLIES is a flag indicating if replies are hidden in the current buffer."
                          mastodon-instance-url)
                   buffer-name ,buffer
                   endpoint ,endpoint
-                  update-function ,update-function
+                  update-function ,update-fun
                   link-header ,link-header
                   update-params ,update-params
                   hide-replies ,hide-replies)))
 
 
 ;;; BUFFERS
+
 (defun mastodon-tl--endpoint-str-= (str &optional type)
   "Return T if STR is equal to the current buffer's endpoint.
 TYPE may be :prefix or :suffix, in which case, T if STR is a prefix or suffix."
-  (let ((endpoint-fun (mastodon-tl--get-endpoint nil :no-error)))
+  (let ((endpoint-fun (mastodon-tl--endpoint nil :no-error)))
     (cond ((eq type :prefix)
            (string-prefix-p str endpoint-fun))
           ((eq type :suffix)
@@ -1555,12 +1520,8 @@ call this function after it is set or use something else."
           ;; profiles:
           ((mastodon-tl--profile-buffer-p)
            (cond
-            ;; own profile:
-            ;; perhaps not needed, and needlessly confusing,
-            ;; e.g. for `mastodon-profile--account-view-cycle':
-            ;; ((equal (mastodon-tl--buffer-name)
-            ;; (concat "*mastodon-" (mastodon-auth--get-account-name) "-statuses*"))
-            ;; 'own-profile-statuses)
+            ;; an own profile option is needlessly confusing e.g. for
+            ;; `mastodon-profile--account-view-cycle'
             ;; profile note:
             ((string-suffix-p "update-profile*" buffer-name)
              'update-profile-note)
@@ -1615,12 +1576,12 @@ call this function after it is set or use something else."
 (defun mastodon-tl--profile-buffer-p ()
   "Return t if current buffer is a profile buffer of any kind.
 This includes the update profile note buffer, but not the preferences one."
-  (string-prefix-p "accounts" (mastodon-tl--get-endpoint nil :no-error)))
+  (string-prefix-p "accounts" (mastodon-tl--endpoint nil :no-error)))
 
 (defun mastodon-tl--timeline-proper-p ()
   "Return non-nil if the current buffer is a 'proper' timeline.
-A proper timeline excludes notifications, threads, and other toot
-buffers that aren't strictly mastodon timelines."
+A proper timeline excludes notifications, threads, profiles, and
+other toot buffers that aren't strictly mastodon timelines."
   (let ((timeline-buffers
          '(home federated local tag-timeline list-timeline profile-statuses)))
     (member (mastodon-tl--get-buffer-type) timeline-buffers)))
@@ -1708,9 +1669,8 @@ BACKWARD means move backward (up) the timeline."
   (cond ((numberp numeric)
          (number-to-string numeric))
         ((stringp numeric) numeric)
-        (t (error
-            "Numeric:%s must be either a string or a number"
-            numeric))))
+        (t (error "Numeric:%s must be either a string or a number"
+                  numeric))))
 
 (defun mastodon-tl--toot-id (json)
   "Find approproiate toot id in JSON.
@@ -1718,9 +1678,8 @@ 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 (alist-get 'id json))
-        (reblog (alist-get 'reblog json)))
-    (if reblog (alist-get 'id reblog) id)))
+  (let-alist json
+    (if .reblog .reblog.id .id)))
 
 (defun mastodon-tl--toot-or-base (json)
   "Return the base toot or just the toot from toot JSON."
@@ -1739,8 +1698,16 @@ ID is that of the toot to view."
     (if (equal (caar toot) 'error)
         (message "Error: %s" (cdar toot))
       (with-mastodon-buffer buffer #'mastodon-mode nil
-        (mastodon-tl--set-buffer-spec buffer (format "statuses/%s" id) nil)
-        (mastodon-tl--toot toot :detailed-p)))))
+        (mastodon-tl--set-buffer-spec buffer (format "statuses/%s" id)
+                                      #'mastodon-tl--update-toot)
+        (mastodon-tl--toot toot :detailed-p)
+        (goto-char (point-min))
+        (mastodon-tl--goto-next-item)))))
+
+(defun mastodon-tl--update-toot (json)
+  ""
+  (let ((id (alist-get 'id json)))
+    (mastodon-tl--single-toot id)))
 
 (defun mastodon-tl--view-whole-thread ()
   "From a thread view, view entire thread.
@@ -1765,12 +1732,9 @@ view all branches of a thread."
       (let* ((endpoint (format "statuses/%s/context" id))
              (url (mastodon-http--api endpoint))
              (buffer (format "*mastodon-thread-%s*" id))
-             (toot
-              ;; refetch current toot in case we just faved/boosted:
-              (mastodon-http--get-json
-               (mastodon-http--api (concat "statuses/" id))
-               nil
-               :silent))
+             (toot (mastodon-http--get-json ; refetch in case we just faved/boosted:
+                    (mastodon-http--api (concat "statuses/" id))
+                    nil :silent))
              (context (mastodon-http--get-json url nil :silent)))
         (if (equal (caar toot) 'error)
             (message "Error: %s" (cdar toot))
@@ -1782,8 +1746,7 @@ view all branches of a thread."
               ;; if we have a thread:
               (with-mastodon-buffer buffer #'mastodon-mode nil
                 (let ((marker (make-marker)))
-                  (mastodon-tl--set-buffer-spec buffer
-                                                endpoint
+                  (mastodon-tl--set-buffer-spec buffer endpoint
                                                 #'mastodon-tl--thread)
                   (mastodon-tl--timeline (alist-get 'ancestors context) :thread)
                   (goto-char (point-max))
@@ -1813,29 +1776,28 @@ Note that you can only (un)mute threads you have posted in."
 (defun mastodon-tl--mute-or-unmute-thread  (&optional unmute)
   "Mute a thread.
 If UNMUTE, unmute it."
-  (let ((endpoint (mastodon-tl--get-endpoint)))
-    (if (mastodon-tl--buffer-type-eq 'thread)
-        (let* ((id
+  (let ((endpoint (mastodon-tl--endpoint))
+        (mute-str (if unmute "unmute" "mute")))
+    (when (or (mastodon-tl--buffer-type-eq 'thread)
+              (mastodon-tl--buffer-type-eq 'notifications))
+      (let* ((id
+              (if (mastodon-tl--buffer-type-eq 'notifications)
+                  (get-text-property (point) 'base-toot-id)
                 (save-match-data
                   (string-match "statuses/\\(?2:[[:digit:]]+\\)/context"
                                 endpoint)
-                  (match-string 2 endpoint)))
-               (we-posted-p (mastodon-tl--user-in-thread-p id))
-               (url (mastodon-http--api
-                     (if unmute
-                         (format "statuses/%s/unmute" id)
-                       (format "statuses/%s/mute" id)))))
-          (if (not we-posted-p)
-              (message "You can only (un)mute a thread you have posted in.")
-            (when (if unmute
-                      (y-or-n-p "Unnute this thread? ")
-                    (y-or-n-p "Mute this thread? "))
-              (let ((response (mastodon-http--post url)))
-                (mastodon-http--triage response
-                                       (lambda ()
-                                         (if unmute
-                                             (message "Thread unmuted!")
-                                           (message "Thread muted!")))))))))))
+                  (match-string 2 endpoint))))
+             (we-posted-p (mastodon-tl--user-in-thread-p id))
+             (url (mastodon-http--api (format "statuses/%s/%s" id mute-str))))
+        (if (not we-posted-p)
+            (message "You can only (un)mute a thread you have posted in.")
+          (when (y-or-n-p (format "%s this thread? " (capitalize mute-str)))
+            (let ((response (mastodon-http--post url)))
+              (mastodon-http--triage response
+                                     (lambda ()
+                                       (if unmute
+                                           (message "Thread unmuted!")
+                                         (message "Thread muted!")))))))))))
 
 (defun mastodon-tl--map-account-id-from-toot (statuses)
   "Return a list of the account IDs of the author of each toot in STATUSES."
@@ -1860,21 +1822,6 @@ ID is that of the post the context is currently displayed for."
 
 ;;; FOLLOW/BLOCK/MUTE, ETC
 
-(defmacro mastodon-tl--do-if-toot (&rest body)
-  "Execute BODY if we have a toot or user at point."
-  (declare (debug t))
-  `(if (and (not (mastodon-tl--profile-buffer-p))
-            (not (mastodon-tl--property 'toot-json))) ; includes user listings
-       (message "Looks like there's no toot or user at point?")
-     ,@body))
-
-(defmacro mastodon-tl--do-if-toot-strict (&rest body)
-  "Execute BODY if we have a toot, and only a toot, at point."
-  (declare (debug t))
-  `(if (not (mastodon-tl--property 'toot-id :no-move))
-       (message "Looks like there's no toot at point?")
-     ,@body))
-
 (defun mastodon-tl--follow-user (user-handle &optional notify langs)
   "Query for USER-HANDLE from current status and follow that user.
 If NOTIFY is \"true\", enable notifications when that user posts.
@@ -1882,8 +1829,7 @@ If NOTIFY is \"false\", disable notifications when that user posts.
 Can be called to toggle NOTIFY on users already being followed.
 LANGS is an array parameters alist of languages to filer user's posts by."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "follow")))
+   (list (mastodon-tl--user-handles-get "follow")))
   (mastodon-tl--do-if-toot
    (mastodon-tl--do-user-action-and-response
     user-handle "follow" nil notify langs)))
@@ -1891,16 +1837,14 @@ LANGS is an array parameters alist of languages to filer user's posts by."
 (defun mastodon-tl--enable-notify-user-posts (user-handle)
   "Query for USER-HANDLE and enable notifications when they post."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "enable")))
+   (list (mastodon-tl--user-handles-get "enable")))
   (mastodon-tl--do-if-toot
    (mastodon-tl--follow-user user-handle "true")))
 
 (defun mastodon-tl--disable-notify-user-posts (user-handle)
   "Query for USER-HANDLE and disable notifications when they post."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "disable")))
+   (list (mastodon-tl--user-handles-get "disable")))
   (mastodon-tl--follow-user user-handle "false"))
 
 (defun mastodon-tl--filter-user-user-posts-by-language (user-handle)
@@ -1908,8 +1852,7 @@ LANGS is an array parameters alist of languages to filer user's posts by."
 This feature is experimental and for now not easily varified by
 the instance API."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "filter by language")))
+   (list (mastodon-tl--user-handles-get "filter by language")))
   (let ((langs (mastodon-tl--read-filter-langs)))
     (mastodon-tl--do-if-toot
      (mastodon-tl--follow-user user-handle nil langs))))
@@ -1923,8 +1866,7 @@ LANGS is the accumulated array param alist if we re-run recursively."
     (when choice
       (setq langs-alist
             (push `("languages[]" . ,(alist-get choice mastodon-iso-639-1
-                                                nil nil
-                                                #'string=))
+                                                nil nil #'string=))
                   langs-alist))
       (if (y-or-n-p "Filter by another language? ")
           (mastodon-tl--read-filter-langs langs-alist)
@@ -1933,24 +1875,21 @@ LANGS is the accumulated array param alist if we re-run recursively."
 (defun mastodon-tl--unfollow-user (user-handle)
   "Query for USER-HANDLE from current status and unfollow that user."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "unfollow")))
+   (list (mastodon-tl--user-handles-get "unfollow")))
   (mastodon-tl--do-if-toot
    (mastodon-tl--do-user-action-and-response user-handle "unfollow" t)))
 
 (defun mastodon-tl--block-user (user-handle)
   "Query for USER-HANDLE from current status and block that user."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "block")))
+   (list (mastodon-tl--user-handles-get "block")))
   (mastodon-tl--do-if-toot
    (mastodon-tl--do-user-action-and-response user-handle "block")))
 
 (defun mastodon-tl--unblock-user (user-handle)
   "Query for USER-HANDLE from list of blocked users and unblock that user."
   (interactive
-   (list
-    (mastodon-tl--interactive-blocks-or-mutes-list-get "unblock")))
+   (list (mastodon-tl--get-blocks-or-mutes-list "unblock")))
   (if (not user-handle)
       (message "Looks like you have no blocks to unblock!")
     (mastodon-tl--do-user-action-and-response user-handle "unblock" t)))
@@ -1958,16 +1897,14 @@ LANGS is the accumulated array param alist if we re-run recursively."
 (defun mastodon-tl--mute-user (user-handle)
   "Query for USER-HANDLE from current status and mute that user."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "mute")))
+   (list (mastodon-tl--user-handles-get "mute")))
   (mastodon-tl--do-if-toot
    (mastodon-tl--do-user-action-and-response user-handle "mute")))
 
 (defun mastodon-tl--unmute-user (user-handle)
   "Query for USER-HANDLE from list of muted users and unmute that user."
   (interactive
-   (list
-    (mastodon-tl--interactive-blocks-or-mutes-list-get "unmute")))
+   (list (mastodon-tl--get-blocks-or-mutes-list "unmute")))
   (if (not user-handle)
       (message "Looks like you have no mutes to unmute!")
     (mastodon-tl--do-user-action-and-response user-handle "unmute" t)))
@@ -1975,31 +1912,30 @@ LANGS is the accumulated array param alist if we re-run recursively."
 (defun mastodon-tl--dm-user (user-handle)
   "Query for USER-HANDLE from current status and compose a message to that user."
   (interactive
-   (list
-    (mastodon-tl--interactive-user-handles-get "message")))
+   (list (mastodon-tl--user-handles-get "message")))
   (mastodon-tl--do-if-toot
    (mastodon-toot--compose-buffer (concat "@" user-handle))
    (setq mastodon-toot--visibility "direct")
    (mastodon-toot--update-status-fields)))
 
-(defun mastodon-tl--interactive-user-handles-get (action)
+(defun mastodon-tl--user-handles-get (action)
   "Get the list of user-handles for ACTION from the current toot."
   (mastodon-tl--do-if-toot
    (let ((user-handles
-          (cond ((or (mastodon-tl--buffer-type-eq 'follow-suggestions)
-                     ;; follow suggests / search / foll requests compat:
-                     (mastodon-tl--buffer-type-eq 'search)
-                     (mastodon-tl--buffer-type-eq 'follow-requests)
-                     ;; profile view follows/followers compat:
-                     ;; but not for profile statuses:
-                     ;; fetch 'toot-json:
-                     (mastodon-tl--buffer-type-eq 'profile-followers)
-                     (mastodon-tl--buffer-type-eq 'profile-following))
+          (cond ((or ; follow suggests / search / foll requests compat:
+                  (mastodon-tl--buffer-type-eq 'follow-suggestions)
+                  (mastodon-tl--buffer-type-eq 'search)
+                  (mastodon-tl--buffer-type-eq 'follow-requests)
+                  ;; profile follows/followers but not statuses:
+                  (mastodon-tl--buffer-type-eq 'profile-followers)
+                  (mastodon-tl--buffer-type-eq 'profile-following))
+                 ;; fetch 'toot-json:
                  (list (alist-get 'acct
                                   (mastodon-tl--property 'toot-json :no-move))))
-                ;; profile view, no toots
+                ;; profile view, point in profile details, poss no toots
                 ;; needed for e.g. gup.pe groups which show no toots publically:
-                ((mastodon-tl--profile-buffer-p)
+                ((and (mastodon-tl--profile-buffer-p)
+                      (get-text-property (point) 'profile-json))
                  (list (alist-get 'acct
                                   (mastodon-profile--profile-json))))
                 (t
@@ -2016,7 +1952,7 @@ LANGS is the accumulated array param alist if we re-run recursively."
                         nil ; predicate
                         'confirm)))))
 
-(defun mastodon-tl--interactive-blocks-or-mutes-list-get (action)
+(defun mastodon-tl--get-blocks-or-mutes-list (action)
   "Fetch the list of accounts for ACTION from the server.
 Action must be either \"unblock\" or \"unmute\"."
   (let* ((endpoint (cond ((equal action "unblock")
@@ -2028,9 +1964,7 @@ Action must be either \"unblock\" or \"unmute\"."
          (accts (mastodon-tl--map-alist 'acct json)))
     (when accts
       (completing-read (format "Handle of user to %s: " action)
-                       accts
-                       nil ; predicate
-                       t))))
+                       accts nil t)))) ; require match
 
 (defun mastodon-tl--do-user-action-and-response
     (user-handle action &optional negp notify langs)
@@ -2041,23 +1975,20 @@ If NOTIFY is \"false\", disable notifications when that user posts.
 NOTIFY is only non-nil when called by `mastodon-tl--follow-user'.
 LANGS is an array parameters alist of languages to filer user's posts by."
   (let* ((account (if negp
-                      ;; if unmuting/unblocking, we got handle from mute/block list
-                      (mastodon-profile--search-account-by-handle
-                       user-handle)
-                    ;; if profile view, use 'profile-json as status:
+                      ;; unmuting/unblocking, handle from mute/block list
+                      (mastodon-profile--search-account-by-handle user-handle)
+                    ;; profile view, use 'profile-json as status:
                     (if (mastodon-tl--profile-buffer-p)
                         (mastodon-profile--lookup-account-in-status
                          user-handle (mastodon-profile--profile-json))
-                      ;; if muting/blocking, we select from handles in current status
+                      ;; muting/blocking, select from handles in current status
                       (mastodon-profile--lookup-account-in-status
                        user-handle (mastodon-profile--toot-json)))))
-         (user-id (mastodon-profile--account-field account 'id))
-         (name (if (not (string-empty-p
-                         (mastodon-profile--account-field account 'display_name)))
-                   (mastodon-profile--account-field account 'display_name)
-                 (mastodon-profile--account-field account 'username)))
-         (args (cond (notify
-                      `(("notify" . ,notify)))
+         (user-id (alist-get 'id account))
+         (name (if (string-empty-p (alist-get 'display_name account))
+                   (alist-get 'username account)
+                 (alist-get 'display_name account)))
+         (args (cond (notify `(("notify" . ,notify)))
                      (langs langs)
                      (t nil)))
          (url (mastodon-http--api (format "accounts/%s/%s" user-id action))))
@@ -2096,11 +2027,27 @@ ARGS is an alist of any parameters to send with the request."
 
 ;; FOLLOW TAGS
 
+(defun mastodon-tl--get-tags-list ()
+  "Return the list of tags of the toot at point."
+  (let* ((toot (or (mastodon-tl--property 'base-toot :no-move) ; fave/boost notifs
+                   (mastodon-tl--property 'toot-json :no-move)))
+         (tags (mastodon-tl--field 'tags toot)))
+    (mapcar (lambda (x)
+              (alist-get 'name x))
+            tags)))
+
 (defun mastodon-tl--follow-tag (&optional tag)
   "Prompt for a tag and follow it.
 If TAG provided, follow it."
   (interactive)
-  (let* ((tag (or tag (read-string "Tag to follow: ")))
+  (let* ((tags (unless tag (mastodon-tl--get-tags-list)))
+         (tag-at-point
+          (unless tag
+            (when (eq 'hashtag (get-text-property (point) 'mastodon-tab-stop))
+              (get-text-property (point) 'mastodon-tag))))
+         (tag (or tag (completing-read
+                       (format "Tag to follow [%s]: " tag-at-point)
+                       tags nil nil nil nil tag-at-point)))
          (url (mastodon-http--api (format "tags/%s/follow" tag)))
          (response (mastodon-http--post url)))
     (mastodon-http--triage response
@@ -2117,10 +2064,8 @@ If TAG provided, follow it."
 If TAG is provided, unfollow it."
   (interactive)
   (let* ((followed-tags-json (unless tag (mastodon-tl--followed-tags)))
-         (tags (unless tag
-                 (mastodon-tl--map-alist 'name followed-tags-json)))
-         (tag (or tag (completing-read "Unfollow tag: "
-                                       tags)))
+         (tags (unless tag (mastodon-tl--map-alist 'name followed-tags-json)))
+         (tag (or tag (completing-read "Unfollow tag: " tags)))
          (url (mastodon-http--api (format "tags/%s/unfollow" tag)))
          (response (mastodon-http--post url)))
     (mastodon-http--triage response
@@ -2149,7 +2094,7 @@ PREFIX is sent to `mastodon-tl--show-tag-timeline', which see."
 (defun mastodon-tl--some-followed-tags-timeline (&optional prefix)
   "Prompt for some tags, and open a timeline for them.
 The suggestions are from followed tags, but any other tags are also allowed.
-PREFIX us sent to `mastodon-tl--show-tag-timeline', which see."
+PREFIX is for `mastodon-tl--show-tag-timeline', which see."
   (interactive "p")
   (let* ((followed-tags-json (mastodon-tl--followed-tags))
          (tags (mastodon-tl--map-alist 'name followed-tags-json))
@@ -2169,7 +2114,7 @@ PREFIX us sent to `mastodon-tl--show-tag-timeline', which see."
 (defun mastodon-tl--report-params (account toot)
   "Query user and return report params alist.
 ACCOUNT and TOOT are the data to use."
-  (let* ((account-id (mastodon-profile--account-field account 'id))
+  (let* ((account-id (alist-get 'id account))
          (comment (read-string "Add comment [optional]: "))
          (toot-id (when (y-or-n-p "Also report status at point? ")
                     (mastodon-tl--toot-id toot))) ; base toot if poss
@@ -2219,7 +2164,6 @@ report the account for spam."
             (handle (alist-get 'acct account))
             (params (mastodon-tl--report-params account toot))
             (response (mastodon-http--post url params)))
-       ;; (setq masto-report-response response)
        (mastodon-http--triage response
                               (lambda ()
                                 (message "User %s reported!" handle)))))))
@@ -2227,7 +2171,7 @@ report the account for spam."
 (defvar crm-separator)
 
 (defun mastodon-tl--map-rules-alist (rules)
-  "Return an alist of the text and id fields of RULES."
+  "Convert RULES text and id fields into an alist."
   (mapcar (lambda (x)
             (let-alist x
               (cons .text .id)))
@@ -2240,7 +2184,7 @@ report the account for spam."
          (crm-separator (replace-regexp-in-string "," "|" crm-separator))
          (choices (completing-read-multiple
                    "rules [TAB for options, | to separate]: "
-                   alist nil :match)))
+                   alist nil t)))
     (mapcar (lambda (x)
               (alist-get x alist nil nil 'equal))
             choices)))
@@ -2254,7 +2198,8 @@ report the account for spam."
          (url (mastodon-http--api endpoint)))
     (mastodon-http--get-json url args)))
 
-(defun mastodon-tl--more-json-async (endpoint id &optional params callback &rest cbargs)
+(defun mastodon-tl--more-json-async
+    (endpoint id &optional params callback &rest cbargs)
   "Return JSON for timeline ENDPOINT before ID.
 Then run CALLBACK with arguments CBARGS.
 PARAMS is used to send any parameters needed to correctly update
@@ -2295,16 +2240,12 @@ POS is a number, where point will be placed."
            (mastodon-profile--my-profile))
           ((eq type 'thread)
            (save-match-data
-             (let ((endpoint (mastodon-tl--get-endpoint)))
-               (string-match
-                "statuses/\\(?2:[[:digit:]]+\\)/context"
-                endpoint)
-               (mastodon-tl--thread
-                (match-string 2 endpoint))))))
-    ;; TODO: sends point to POS, which was where point was in buffer before
-    ;; reload. This is very rough; we may have removed an item (deleted a
-    ;; toot, cleared a notif), so the buffer will be smaller, point will end
-    ;; up past where we were, etc.
+             (let ((endpoint (mastodon-tl--endpoint)))
+               (string-match "statuses/\\(?2:[[:digit:]]+\\)/context" endpoint)
+               (mastodon-tl--thread (match-string 2 endpoint))))))
+    ;; TODO: sends point to where point was in buffer. This is very rough; we
+    ;; may have removed an item , so the buffer will be smaller, point will
+    ;; end up past where we were, etc.
     (when pos
       (goto-char pos)
       (mastodon-tl--goto-prev-item))))
@@ -2347,7 +2288,7 @@ when showing followers or accounts followed."
             (mastodon-http--get-response-async url nil 'mastodon-tl--more* (current-buffer)
                                                (point) :headers))))
     (mastodon-tl--more-json-async
-     (mastodon-tl--get-endpoint)
+     (mastodon-tl--endpoint)
      (mastodon-tl--oldest-id)
      (mastodon-tl--update-params)
      'mastodon-tl--more* (current-buffer) (point))))
@@ -2368,20 +2309,21 @@ HEADERS is the http headers returned in the response, if any."
             ;; if thread view, call --thread with parent ID
             (progn (goto-char (point-min))
                    (mastodon-tl--goto-next-toot)
-                   (funcall (mastodon-tl--get-update-function)))
-          (funcall (mastodon-tl--get-update-function) json))
+                   (funcall (mastodon-tl--update-function)))
+          (funcall (mastodon-tl--update-function) json))
         (goto-char point-before)
         ;; update buffer spec to new link-header:
         ;; (other values should just remain as they were)
         (when headers
           (mastodon-tl--set-buffer-spec (mastodon-tl--buffer-name)
-                                        (mastodon-tl--get-endpoint)
-                                        (mastodon-tl--get-update-function)
+                                        (mastodon-tl--endpoint)
+                                        (mastodon-tl--update-function)
                                         link-header))
         (message "Loading older toots... done.")))))
 
-(defun mastodon-tl--find-property-range (property start-point &optional search-backwards)
-  "Return `nil` if no such range is found.
+(defun mastodon-tl--find-property-range (property start-point
+                                                  &optional search-backwards)
+  "Return nil if no such range is found.
 If PROPERTY is set at START-POINT returns a range around
 START-POINT otherwise before/after START-POINT.
 SEARCH-BACKWARDS determines whether we pick point
@@ -2402,14 +2344,13 @@ before (non-nil) or after (nil)"
                         (and (not (equal start-point (point-min)))
                              (get-text-property (1- start-point) property)
                              start-point)))
-               (start (and
-                       end
-                       (previous-single-property-change end property nil (point-min)))))
+               (start (and end (previous-single-property-change
+                                end property nil (point-min)))))
           (when end
             (cons start end)))
       (let* ((start (next-single-property-change start-point property))
-             (end (and start
-                       (next-single-property-change start property nil (point-max)))))
+             (end (and start (next-single-property-change
+                              start property nil (point-max)))))
         (when start
           (cons start end))))))
 
@@ -2458,7 +2399,8 @@ no-op."
           ;; We need to re-schedule for an earlier time
           (cancel-timer mastodon-tl--timestamp-update-timer)
           (setq mastodon-tl--timestamp-update-timer
-                (run-at-time (time-to-seconds (time-subtract this-update (current-time)))
+                (run-at-time (time-to-seconds (time-subtract this-update
+                                                             (current-time)))
                              nil ;; don't repeat
                              #'mastodon-tl--update-timestamps-callback
                              (current-buffer) nil)))))))
@@ -2468,7 +2410,7 @@ no-op."
 Start searching for more timestamps from PREVIOUS-MARKER or
 from the start if it is nil."
   ;; only do things if the buffer hasn't been killed in the meantime
-  (when (and mastodon-tl--enable-relative-timestamps ;; should be true but just in case...
+  (when (and mastodon-tl--enable-relative-timestamps ; just in case
              (buffer-live-p buffer))
     (save-excursion
       (with-current-buffer buffer
@@ -2478,8 +2420,7 @@ from the start if it is nil."
               (iteration 0)
               next-timestamp-range)
           (if previous-marker
-              ;; This is a follow-up call to process the next batch of
-              ;; timestamps.
+              ;; a follow-up call to process the next batch of timestamps.
               ;; Release the marker to not slow things down.
               (set-marker previous-marker nil)
             ;; Otherwise this is a rew run, so let's initialize the next-run time.
@@ -2498,8 +2439,9 @@ from the start if it is nil."
               (unless (string= current-display new-display)
                 (let ((inhibit-read-only t))
                   (add-text-properties
-                   start end (list 'display
-                                   (mastodon-tl--relative-time-description timestamp)))))
+                   start end
+                   (list 'display
+                         (mastodon-tl--relative-time-description timestamp)))))
               (mastodon-tl--consider-timestamp-for-updates timestamp)
               (setq iteration (1+ iteration)
                     previous-timestamp (1+ (cdr next-timestamp-range)))))
@@ -2521,29 +2463,29 @@ from the start if it is nil."
   "Set `mastodon-tl--after-update-marker' to the after-update location.
 This location is defined by a non-nil value of
 `mastodon-tl-position-after-update'."
-  (if mastodon-tl-position-after-update
-      (let ((marker (make-marker)))
-        (set-marker marker
-                    (cond
-                     ((eq 'keep-point mastodon-tl-position-after-update)
-                      (point))
-                     ((eq 'last-old-toot mastodon-tl-position-after-update)
-                      (next-single-property-change
-                       (or mastodon-tl--update-point (point-min))
-                       'byline))
-                     (t
-                      (error "Unknown mastodon-tl-position-after-update value %S"
-                             mastodon-tl-position-after-update))))
-        ;; Make the marker advance if text gets inserted there.
-        (set-marker-insertion-type marker t)
-        (setq mastodon-tl--after-update-marker marker))
-    (setq mastodon-tl--after-update-marker nil)))
+  (if (not mastodon-tl-position-after-update)
+      (setq mastodon-tl--after-update-marker nil)
+    (let ((marker (make-marker)))
+      (set-marker marker
+                  (cond
+                   ((eq 'keep-point mastodon-tl-position-after-update)
+                    (point))
+                   ((eq 'last-old-toot mastodon-tl-position-after-update)
+                    (next-single-property-change
+                     (or mastodon-tl--update-point (point-min))
+                     'byline))
+                   (t
+                    (error "Unknown mastodon-tl-position-after-update value %S"
+                           mastodon-tl-position-after-update))))
+      ;; Make the marker advance if text gets inserted there.
+      (set-marker-insertion-type marker t)
+      (setq mastodon-tl--after-update-marker marker))))
 
 (defun mastodon-tl--update ()
   "Update timeline with new toots."
   (interactive)
-  (let* ((endpoint (mastodon-tl--get-endpoint))
-         (update-function (mastodon-tl--get-update-function))
+  (let* ((endpoint (mastodon-tl--endpoint))
+         (update-function (mastodon-tl--update-function))
          (thread-id (mastodon-tl--property 'toot-id)))
     ;; update a thread, without calling `mastodon-tl--updated-json':
     (if (mastodon-tl--buffer-type-eq 'thread)
@@ -2575,12 +2517,12 @@ HIDE-REPLIES is a flag indicating if replies are hidden in the current buffer."
   (let ((url (mastodon-http--api endpoint))
         (buffer (concat "*mastodon-" buffer-name "*")))
     (if headers
-        (mastodon-http--get-response-async url params
-                                           'mastodon-tl--init* buffer endpoint update-function
-                                           headers params hide-replies)
-      (mastodon-http--get-json-async url params
-                                     'mastodon-tl--init* buffer endpoint update-function nil
-                                     params hide-replies))))
+        (mastodon-http--get-response-async
+         url params 'mastodon-tl--init*
+         buffer endpoint update-function headers params hide-replies)
+      (mastodon-http--get-json-async
+       url params 'mastodon-tl--init*
+       buffer endpoint update-function nil params hide-replies))))
 
 (defun mastodon-tl--init* (response buffer endpoint update-function
                                     &optional headers update-params hide-replies)
@@ -2595,31 +2537,12 @@ JSON and http headers, without it just the JSON."
       (let* ((headers (if headers (cdr response) nil))
              (link-header (mastodon-tl--get-link-header-from-response headers)))
         (with-mastodon-buffer buffer #'mastodon-mode nil
-          (mastodon-tl--set-buffer-spec buffer
-                                        endpoint
-                                        update-function
-                                        link-header
-                                        update-params
-                                        hide-replies)
-          (funcall update-function json)
-          (setq
-           ;; Initialize with a minimal interval; we re-scan at least once
-           ;; every 5 minutes to catch any timestamps we may have missed
-           mastodon-tl--timestamp-next-update (time-add (current-time)
-                                                        (seconds-to-time 300)))
-          (setq mastodon-tl--timestamp-update-timer
-                (when mastodon-tl--enable-relative-timestamps
-                  (run-at-time (time-to-seconds
-                                (time-subtract mastodon-tl--timestamp-next-update
-                                               (current-time)))
-                               nil ;; don't repeat
-                               #'mastodon-tl--update-timestamps-callback
-                               (current-buffer)
-                               nil)))
-          (unless (mastodon-tl--profile-buffer-p)
-            (mastodon-tl--goto-first-item)))))))
+          (mastodon-tl--set-buffer-spec buffer endpoint update-function
+                                        link-header update-params hide-replies)
+          (mastodon-tl--do-init json update-function))))))
 
-(defun mastodon-tl--init-sync (buffer-name endpoint update-function &optional note-type)
+(defun mastodon-tl--init-sync (buffer-name endpoint update-function
+                                           &optional note-type)
   "Initialize BUFFER-NAME with timeline targeted by ENDPOINT.
 UPDATE-FUNCTION is used to receive more toots.
 Runs synchronously.
@@ -2628,32 +2551,35 @@ Optional arg NOTE-TYPE means only get that type of note."
                           (mastodon-notifications--filter-types-list note-type)))
          (args (when note-type (mastodon-http--build-array-params-alist
                                 "exclude_types[]" exclude-types)))
-         ;; NB: we now store 'update-params separately in `mastodon-tl--buffer-spec'
-         ;; and -http.el handles all conversion of params alists into query strings.
          (url (mastodon-http--api endpoint))
          (buffer (concat "*mastodon-" buffer-name "*"))
          (json (mastodon-http--get-json url args)))
     (with-mastodon-buffer buffer #'mastodon-mode nil
-      (setq
-       ;; Initialize with a minimal interval; we re-scan at least once
-       ;; every 5 minutes to catch any timestamps we may have missed
-       mastodon-tl--timestamp-next-update (time-add (current-time)
-                                                    (seconds-to-time 300)))
-      (funcall update-function json)
       (mastodon-tl--set-buffer-spec buffer endpoint update-function nil args)
-      (setq mastodon-tl--timestamp-update-timer
-            (when mastodon-tl--enable-relative-timestamps
-              (run-at-time (time-to-seconds
-                            (time-subtract mastodon-tl--timestamp-next-update
-                                           (current-time)))
-                           nil ;; don't repeat
-                           #'mastodon-tl--update-timestamps-callback
-                           (current-buffer)
-                           nil)))
-      (unless (mastodon-tl--profile-buffer-p)
-        ;; FIXME: this breaks test (because test has empty buffer)
-        (mastodon-tl--goto-first-item)))
-    buffer))
+      (mastodon-tl--do-init json update-function)
+      buffer)))
+
+(defun mastodon-tl--do-init (json update-fun)
+  "Utility function for `mastodon-tl--init*' and `mastodon-tl--init-sync'.
+JSON is the data to call UPDATE-FUN on."
+  (remove-overlays) ; video overlays
+  (funcall update-fun json)
+  (setq
+   ;; Initialize with a minimal interval; we re-scan at least once
+   ;; every 5 minutes to catch any timestamps we may have missed
+   mastodon-tl--timestamp-next-update (time-add (current-time)
+                                                (seconds-to-time 300)))
+  (setq mastodon-tl--timestamp-update-timer
+        (when mastodon-tl--enable-relative-timestamps
+          (run-at-time (time-to-seconds
+                        (time-subtract mastodon-tl--timestamp-next-update
+                                       (current-time)))
+                       nil ;; don't repeat
+                       #'mastodon-tl--update-timestamps-callback
+                       (current-buffer)
+                       nil)))
+  (unless (mastodon-tl--profile-buffer-p)
+    (mastodon-tl--goto-first-item)))
 
 (provide 'mastodon-tl)
 ;;; mastodon-tl.el ends here
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index e77787c..14b9d68 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -225,6 +225,9 @@ For the moment we just put all composed toots in here, as we want
 to also capture toots that are 'sent' but that don't successfully
 send.")
 
+
+;;; REGEXES
+
 (defvar mastodon-toot-handle-regex
   (rx (| (any ?\( "\n" "\t "" ") bol) ; preceding things
       (group-n 2 (+ ?@ (* (any ?- ?_ ?. "A-Z" "a-z" "0-9" ))) ; handle
@@ -240,9 +243,12 @@ send.")
   ;; adapted from ffap-url-regexp
   (concat
    "\\(?2:\\(news\\(post\\)?:\\|mailto:\\|file:\\|\\(ftp\\|https?\\|telnet\\|gopher\\|www\\|wais\\)://\\)" ; uri prefix
-   "[^ \n\t]*\\)" ; any old thing that's, i.e. we allow invalid/unwise chars
+   "[^ \n\t]*\\)" ; any old thing, that is, i.e. we allow invalid/unwise chars
    "\\b")) ; boundary
 
+
+;;; MODE MAP
+
 (defvar mastodon-toot-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "C-c C-c") #'mastodon-toot--send)
@@ -281,13 +287,11 @@ NO-TOOT means we are not calling from a toot buffer."
   "Set max_toot_chars returned in JSON-RESPONSE and display in new toot buffer.
 NO-TOOT means we are not calling from a toot buffer."
   (let ((max-chars
-         (or
-          (alist-get 'max_toot_chars json-response)
-          ;; some servers have this instead:
-          (alist-get 'max_characters
-                     (alist-get 'statuses
-                                (alist-get 'configuration
-                                           json-response))))))
+         (or (alist-get 'max_toot_chars json-response)
+             (alist-get 'max_characters ; some servers have this instead
+                        (alist-get 'statuses
+                                   (alist-get 'configuration
+                                              json-response))))))
     (setq mastodon-toot--max-toot-chars max-chars)
     (unless no-toot
       (with-current-buffer "*new toot*"
@@ -327,10 +331,8 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
 Makes a POST request to the server. Used for favouriting,
 boosting, or bookmarking toots."
   (let* ((id (mastodon-tl--property 'base-toot-id))
-         (url (mastodon-http--api (concat "statuses/"
-                                          (mastodon-tl--as-string id)
-                                          "/"
-                                          action))))
+         (url (mastodon-http--api
+               (concat "statuses/" (mastodon-tl--as-string id) "/" action))))
     (let ((response (mastodon-http--post url)))
       (mastodon-http--triage response callback))))
 
@@ -339,9 +341,9 @@ boosting, or bookmarking toots."
 TYPE is a symbol, either `favourite' or `boost.'"
   (mastodon-tl--do-if-toot-strict
    (let* ((boost-p (equal type 'boost))
-          (has-id (mastodon-tl--property 'base-toot-id))
-          (byline-region (when has-id
-                           (mastodon-tl--find-property-range 'byline (point))))
+          ;;   (has-id (mastodon-tl--property 'base-toot-id))
+          (byline-region ;(when has-id
+           (mastodon-tl--find-property-range 'byline (point)))
           (id (when byline-region
                 (mastodon-tl--as-string (mastodon-tl--property 'base-toot-id))))
           (boosted (when byline-region
@@ -354,9 +356,9 @@ TYPE is a symbol, either `favourite' or `boost.'"
           (msg (if boosted "unboosted" "boosted"))
           (action-string (if boost-p "boost" "favourite"))
           (remove (if boost-p (when boosted t) (when faved t)))
-          (toot-type (alist-get 'type (mastodon-tl--property 'toot-json)))
-          (visibility (mastodon-tl--field 'visibility
-                                          (mastodon-tl--property 'toot-json))))
+          (toot-json (mastodon-tl--property 'toot-json))
+          (toot-type (alist-get 'type toot-json))
+          (visibility (mastodon-tl--field 'visibility toot-json)))
      (if byline-region
          (if (and (or (equal visibility "direct")
                       (equal visibility "private"))
@@ -387,11 +389,10 @@ TYPE is a symbol, either `favourite' or `boost.'"
                                            (list 'boosted-p (not boosted))
                                          (list 'favourited-p (not faved))))
                   (mastodon-toot--update-stats-on-action type remove)
-                  (mastodon-toot--action-success
-                   (if boost-p
-                       (mastodon-tl--symbol 'boost)
-                     (mastodon-tl--symbol 'favourite))
-                   byline-region remove))
+                  (mastodon-toot--action-success (if boost-p
+                                                     (mastodon-tl--symbol 'boost)
+                                                   (mastodon-tl--symbol 'favourite))
+                                                 byline-region remove))
                 (message (format "%s #%s" (if boost-p msg action) id)))))))
        (message (format "Nothing to %s here?!?" action-string))))))
 
@@ -413,16 +414,15 @@ SUBTRACT means we are un-favouriting or unboosting, so we decrement."
          (inhibit-read-only 1))
     ;; TODO another way to implement this would be to async fetch counts again
     ;;  and re-display from count-properties
-    (add-text-properties
-     (car count-prop-range)
-     (cdr count-prop-range)
-     (list 'display ; update the display prop:
-           (number-to-string
-            (mastodon-toot--inc-or-dec count subtract))
-           ;; update the count prop
-           ;; we rely on this for any subsequent actions:
-           count-prop
-           (mastodon-toot--inc-or-dec count subtract)))))
+    (add-text-properties (car count-prop-range)
+                         (cdr count-prop-range)
+                         (list 'display
+                               (number-to-string
+                                (mastodon-toot--inc-or-dec count subtract))
+                               ;; update the count prop
+                               ;; we rely on this for any subsequent actions:
+                               count-prop
+                               (mastodon-toot--inc-or-dec count subtract)))))
 
 (defun mastodon-toot--toggle-boost ()
   "Boost/unboost toot at `point'."
@@ -439,16 +439,13 @@ SUBTRACT means we are un-favouriting or unboosting, so we decrement."
   "Bookmark or unbookmark toot at point."
   (interactive)
   (mastodon-tl--do-if-toot-strict
-   (let* ( ;(toot (mastodon-tl--property 'toot-json))
-          (id (mastodon-tl--property 'base-toot-id))
-          ;; (mastodon-tl--as-string (mastodon-tl--toot-id toot)))
+   (let* ((id (mastodon-tl--property 'base-toot-id))
           (bookmarked-p (mastodon-tl--property 'bookmarked-p))
           (prompt (if bookmarked-p
                       (format "Toot already bookmarked. Remove? ")
                     (format "Bookmark this toot? ")))
-          (byline-region
-           (when id
-             (mastodon-tl--find-property-range 'byline (point))))
+          (byline-region (when id
+                           (mastodon-tl--find-property-range 'byline (point))))
           (action (if bookmarked-p "unbookmark" "bookmark"))
           (bookmark-str (mastodon-tl--symbol 'bookmark))
           (message (if bookmarked-p
@@ -464,9 +461,8 @@ SUBTRACT means we are un-favouriting or unboosting, so we decrement."
                 (add-text-properties (car byline-region)
                                      (cdr byline-region)
                                      (list 'bookmarked-p (not bookmarked-p))))
-              (mastodon-toot--action-success
-               bookmark-str
-               byline-region remove)
+              (mastodon-toot--action-success bookmark-str
+                                             byline-region remove)
               (message (format "%s #%s" message id)))))
        (message (format "Nothing to %s here?!?" action))))))
 
@@ -486,23 +482,20 @@ With FAVOURITE, list favouriters, else list boosters."
   (mastodon-tl--do-if-toot-strict
    (let* ((base-toot (mastodon-tl--property 'base-toot-id))
           (endpoint (if favourite "favourited_by" "reblogged_by"))
-          (url (mastodon-http--api
-                (format "statuses/%s/%s" base-toot endpoint)))
+          (url (mastodon-http--api (format "statuses/%s/%s" base-toot endpoint)))
           (params '(("limit" . "80")))
           (json (mastodon-http--get-json url params)))
      (if (eq (caar json) 'error)
-         (error "%s (Status does not exist or is private)"
-                (alist-get 'error json))
+         (error "%s (Status does not exist or is private)" (alist-get 'error json))
        (let ((handles (mastodon-tl--map-alist 'acct json))
              (type-string (if favourite "Favouriters" "Boosters")))
          (if (not handles)
              (error "Looks like this toot has no %s" type-string)
-           (let ((choice
-                  (completing-read
-                   (format "%s (enter to view profile): " type-string)
-                   handles
-                   nil
-                   t)))
+           (let ((choice (completing-read
+                          (format "%s (enter to view profile): " type-string)
+                          handles
+                          nil
+                          t)))
              (mastodon-profile--show-user choice))))))))
 
 (defun mastodon-toot--copy-toot-url ()
@@ -528,7 +521,6 @@ base toot."
     (kill-new (mastodon-tl--content toot))
     (message "Toot content copied to the clipboard.")))
 
-;; (when (require 'lingva nil :no-error)
 (defun mastodon-toot--translate-toot-text ()
   "Translate text of toot at point.
 Uses `lingva.el'."
@@ -536,13 +528,12 @@ Uses `lingva.el'."
   (if (not (require 'lingva nil :no-error))
       (message "Looks like you need to install lingva.el first.")
     (if mastodon-tl--buffer-spec
-        (let ((toot (mastodon-tl--property 'toot-json)))
-          (if toot
-              (lingva-translate nil
-                                (mastodon-tl--content toot)
-                                (when mastodon-tl--enable-proportional-fonts
-                                  t))
-            (message "No toot to translate?")))
+        (if-let ((toot (mastodon-tl--property 'toot-json)))
+            (lingva-translate nil
+                              (mastodon-tl--content toot)
+                              (when mastodon-tl--enable-proportional-fonts
+                                t))
+          (message "No toot to translate?"))
       (message "No mastodon buffer?"))))
 
 (defun mastodon-toot--own-toot-p (toot)
@@ -570,6 +561,9 @@ Uses `lingva.el'."
                                    (mastodon-tl--reload-timeline-or-profile))
                                  (message "Toot %s!" msg)))))))
 
+
+;;; DELETE, DRAFT, REDRAFT
+
 (defun mastodon-toot--delete-toot ()
   "Delete user's toot at point synchronously."
   (interactive)
@@ -614,6 +608,9 @@ NO-REDRAFT means delete toot only."
     (setq mastodon-toot--content-warning t)
     (setq mastodon-toot--content-warning-from-reply-or-redraft cw)))
 
+
+;;; REDRAFT
+
 (defun mastodon-toot--redraft (response &optional reply-id toot-visibility toot-cw)
   "Opens a new toot compose buffer using values from RESPONSE buffer.
 REPLY-ID, TOOT-VISIBILITY, and TOOT-CW of deleted toot are preseved."
@@ -629,9 +626,8 @@ REPLY-ID, TOOT-VISIBILITY, and TOOT-CW of deleted toot are preseved."
        ;; TODO set new lang/scheduled props here
        nil))))
 
-(defun mastodon-toot--set-toot-properties (reply-id visibility cw lang
-                                                    &optional scheduled
-                                                    scheduled-id)
+(defun mastodon-toot--set-toot-properties
+    (reply-id visibility cw lang &optional scheduled scheduled-id)
   "Set the toot properties for the current redrafted or edited toot.
 REPLY-ID, VISIBILITY, CW, SCHEDULED, and LANG are the properties to set."
   (when reply-id
@@ -687,22 +683,26 @@ TEXT-ONLY means don't check for attachments or polls."
        (string-empty-p (mastodon-tl--clean-tabs-and-nl
                         (mastodon-toot--remove-docs)))))
 
+
+;;; EMOJIS
+
 (defalias 'mastodon-toot--insert-emoji
   'emojify-insert-emoji
   "Prompt to insert an emoji.")
 
+(defun mastodon-toot--emoji-dir ()
+  "Return the file path for the mastodon custom emojis directory."
+  (concat (expand-file-name emojify-emojis-dir)
+          "/mastodon-custom-emojis/"))
+
 (defun mastodon-toot--download-custom-emoji ()
   "Download `mastodon-instance-url's custom emoji.
 Emoji images are stored in a subdir of `emojify-emojis-dir'.
 To use the downloaded emoji, run `mastodon-toot--enable-custom-emoji'."
   (interactive)
-  (let ((custom-emoji (mastodon-http--get-json
-                       (mastodon-http--api "custom_emojis")))
-        (mastodon-custom-emoji-dir (file-name-as-directory
-                                    (concat (file-name-as-directory
-                                             (expand-file-name
-                                              emojify-emojis-dir))
-                                            "mastodon-custom-emojis"))))
+  (let* ((url (mastodon-http--api "custom_emojis"))
+         (custom-emoji (mastodon-http--get-json url))
+         (mastodon-custom-emoji-dir (mastodon-toot--emoji-dir)))
     (if (not (file-directory-p emojify-emojis-dir))
         (message "Looks like you need to set up emojify first.")
       (unless (file-directory-p mastodon-custom-emoji-dir)
@@ -715,11 +715,10 @@ To use the downloaded emoji, run `mastodon-toot--enable-custom-emoji'."
                            (string-match-p "^[a-zA-Z0-9-_]+$" shortcode)
                            (string-match-p "^[a-zA-Z]+$" (file-name-extension url)))
                   (url-copy-file url
-                                 (concat
-                                  mastodon-custom-emoji-dir
-                                  shortcode
-                                  "."
-                                  (file-name-extension url))
+                                 (concat mastodon-custom-emoji-dir
+                                         shortcode
+                                         "."
+                                         (file-name-extension url))
                                  t))))
             custom-emoji)
       (message "Custom emoji for %s downloaded to %s"
@@ -729,13 +728,11 @@ To use the downloaded emoji, run `mastodon-toot--enable-custom-emoji'."
 (defun mastodon-toot--collect-custom-emoji ()
   "Return a list of `mastodon-instance-url's custom emoji.
 The list is formatted for `emojify-user-emojis', which see."
-  (let* ((mastodon-custom-emojis-dir (concat (expand-file-name
-                                              emojify-emojis-dir)
-                                             "/mastodon-custom-emojis/"))
+  (let* ((mastodon-custom-emojis-dir (mastodon-toot--emoji-dir))
          (custom-emoji-files (directory-files mastodon-custom-emojis-dir
                                               nil ; not full path
                                               "^[^.]")) ; no dot files
-         (mastodon-emojify-user-emojis))
+         mastodon-emojify-user-emojis)
     (mapc (lambda (x)
             (push
              `(,(concat ":"
@@ -753,9 +750,7 @@ Custom emoji must first be downloaded with
 `mastodon-toot--download-custom-emoji'. Custom emoji are appended
 to `emojify-user-emojis', and the emoji data is updated."
   (interactive)
-  (unless (file-exists-p (concat (expand-file-name
-                                  emojify-emojis-dir)
-                                 "/mastodon-custom-emojis/"))
+  (unless (file-exists-p (mastodon-toot--emoji-dir))
     (when (y-or-n-p "Looks like you haven't downloaded your
     instance's custom emoji yet. Download now? ")
       (mastodon-toot--download-custom-emoji)))
@@ -789,6 +784,9 @@ to `emojify-user-emojis', and the emoji data is updated."
     (read-string "Warning: "
                  mastodon-toot--content-warning-from-reply-or-redraft)))
 
+
+;;; SEND TOOT FUNCTION
+
 (defun mastodon-toot--send ()
   "POST contents of new-toot buffer to Mastodon instance and kill buffer.
 If media items have been attached and uploaded with
@@ -800,12 +798,9 @@ instance to edit a toot."
          (scheduled mastodon-toot--scheduled-for)
          (scheduled-id mastodon-toot--scheduled-id)
          (edit-id mastodon-toot--edit-toot-id)
-         (endpoint
-          (if edit-id
-              ;; we are sending an edit:
-              (mastodon-http--api (format "statuses/%s"
-                                          edit-id))
-            (mastodon-http--api "statuses")))
+         (endpoint (if edit-id ; we are sending an edit:
+                       (mastodon-http--api (format "statuses/%s" edit-id))
+                     (mastodon-http--api "statuses")))
          (cw (mastodon-toot--read-cw-string))
          (args-no-media (append `(("status" . ,toot)
                                   ("in_reply_to_id" . ,mastodon-toot--reply-to-id)
@@ -843,8 +838,7 @@ instance to edit a toot."
           ((mastodon-toot--empty-p)
            (message "Empty toot. Cowardly refusing to post this."))
           (t
-           (let ((response (if edit-id
-                               ;; we are sending an edit:
+           (let ((response (if edit-id ; we are sending an edit:
                                (mastodon-http--put endpoint args)
                              (mastodon-http--post endpoint args))))
              (mastodon-http--triage
@@ -863,12 +857,13 @@ instance to edit a toot."
                   (let ((pos (marker-position (cadr prev-window-config))))
                     (mastodon-tl--reload-timeline-or-profile pos))))))))))
 
-;; EDITING TOOTS:
+
+;;; EDITING TOOTS:
 
 (defun mastodon-toot--edit-toot-at-point ()
   "Edit the user's toot at point."
   (interactive)
-  (let ((toot (or (mastodon-tl--property 'base-toot); fave/boost notifs
+  (let ((toot (or (mastodon-tl--property 'base-toot) ; fave/boost notifs
                   (mastodon-tl--property 'toot-json))))
     (if (not (mastodon-toot--own-toot-p toot))
         (message "You can only edit your own toots.")
@@ -882,7 +877,6 @@ instance to edit a toot."
         (when (y-or-n-p "Edit this toot? ")
           (mastodon-toot--compose-buffer nil reply-id nil content :edit)
           (goto-char (point-max))
-          ;; (insert content)
           ;; adopt reply-to-id, visibility, CW, and language:
           (mastodon-toot--set-toot-properties reply-id toot-visibility
                                               source-cw toot-language)
@@ -943,7 +937,7 @@ Buffer-local variable `mastodon-toot-previous-window-config' holds the config."
   "Apply `mastodon-toot--process-local' function to each mention in MENTIONS.
 Remove empty string (self) from result and joins the sequence with whitespace."
   (mapconcat (lambda (mention) mention)
-	     (remove "" (mapcar #'mastodon-toot--process-local mentions))
+	         (remove "" (mapcar #'mastodon-toot--process-local mentions))
              " "))
 
 (defun mastodon-toot--process-local (acct)
@@ -958,30 +952,31 @@ eg. \"feduser@fed.social\" -> \"@feduser@fed.social\"."
         (t (concat "@" acct "@" ; local acct
                    (cadr (split-string mastodon-instance-url "/" t))))))
 
+
+;;; COMPLETION (TAGS, MENTIONS)
+
 (defun mastodon-toot--mentions (status)
   "Extract mentions (not the reply-to author or booster) from STATUS.
 The mentioned users look like this:
 Local user (including the logged in): `username`.
 Federated user: `username@host.co`."
   (let* ((boosted (mastodon-tl--field 'reblog status))
-         (mentions
-          (if boosted
-	      (alist-get 'mentions (alist-get 'reblog status))
-	    (alist-get 'mentions status))))
+         (mentions (if boosted
+	               (alist-get 'mentions (alist-get 'reblog status))
+	             (alist-get 'mentions status))))
     ;; reverse does not work on vectors in 24.5
     (mastodon-tl--map-alist 'acct (reverse mentions))))
 
 (defun mastodon-toot--get-bounds (regex)
   "Get bounds of tag or handle before point using REGEX."
-  ;; needed because # and @ are not part of any existing thing at point
+  ;; # and @ are not part of any existing thing at point
   (save-match-data
     (save-excursion
       ;; match full handle inc. domain, or tag including #
       ;; (see the regexes for subexp 2)
       (when (re-search-backward regex
-                                (save-excursion
-                                  (forward-whitespace -1)
-                                  (point))
+                                (save-excursion (forward-whitespace -1)
+                                                (point))
                                 :no-error)
         (cons (match-beginning 2)
               (match-end 2))))))
@@ -1004,51 +999,43 @@ If TAGS, we search for tags, else we search for handles."
 
 (defun mastodon-toot--mentions-capf ()
   "Build a mentions completion backend for `completion-at-point-functions'."
-  (let* ((bounds
-          (mastodon-toot--get-bounds mastodon-toot-handle-regex))
+  (let* ((bounds (mastodon-toot--get-bounds mastodon-toot-handle-regex))
          (start (car bounds))
          (end (cdr bounds)))
     (when bounds
       (list start
             end
-            ;; only search when necessary:
-            (completion-table-dynamic
+            (completion-table-dynamic ; only search when necessary
              (lambda (_)
-               ;; Interruptible candidate computation
-               ;; suggestion from minad (d mendler), thanks!
+               ;; Interruptible candidate computation, from minad/d mendler, thanks!
                (let ((result
                       (while-no-input
                         (mastodon-toot--fetch-completion-candidates start end))))
                  (and (consp result) result))))
             :exclusive 'no
             :annotation-function
-            (lambda (candidate)
-              (concat " "
-                      (mastodon-toot--mentions-annotation-fun candidate)))))))
+            (lambda (cand)
+              (concat " " (mastodon-toot--mentions-annotation-fun cand)))))))
 
 (defun mastodon-toot--tags-capf ()
   "Build a tags completion backend for `completion-at-point-functions'."
-  (let* ((bounds
-          (mastodon-toot--get-bounds mastodon-toot-tag-regex))
+  (let* ((bounds (mastodon-toot--get-bounds mastodon-toot-tag-regex))
          (start (car bounds))
          (end (cdr bounds)))
     (when bounds
       (list start
             end
-            ;; only search when necessary:
-            (completion-table-dynamic
+            (completion-table-dynamic ; only search when necessary:
              (lambda (_)
-               ;; Interruptible candidate computation
-               ;; suggestion from minad (d mendler), thanks!
+               ;; Interruptible candidate computation, from minad/d mendler, thanks!
                (let ((result
                       (while-no-input
                         (mastodon-toot--fetch-completion-candidates start end :tags))))
                  (and (consp result) result))))
             :exclusive 'no
             :annotation-function
-            (lambda (candidate)
-              (concat " "
-                      (mastodon-toot--tags-annotation-fun candidate)))))))
+            (lambda (cand)
+              (concat " " (mastodon-toot--tags-annotation-fun cand)))))))
 
 (defun mastodon-toot--mentions-annotation-fun (candidate)
   "Given a handle completion CANDIDATE, return its annotation string, a username."
@@ -1056,10 +1043,13 @@ If TAGS, we search for tags, else we search for handles."
 
 (defun mastodon-toot--tags-annotation-fun (candidate)
   "Given a tag string CANDIDATE, return an annotation, the tag's URL."
-  ;; FIXME check the list returned here? should be cadr
-  ;;or make it an alist and use cdr
+  ;; TODO: check the list returned here? should be cadr
+  ;; or make it an alist and use cdr
   (cadr (assoc candidate mastodon-toot-completions)))
 
+
+;;; REPLY
+
 (defun mastodon-toot--reply ()
   "Reply to toot at `point'.
 Customize `mastodon-toot-display-orig-in-reply-buffer' to display
@@ -1067,8 +1057,7 @@ text of the toot being replied to in the compose buffer."
   (interactive)
   (mastodon-tl--do-if-toot-strict
    (let* ((toot (mastodon-tl--property 'toot-json))
-          ;; no-move arg for base toot, because if it doesn't have one, it is
-          ;; fetched from next toot!
+          ;; no-move arg for base toot: don't try next toot
           (base-toot (mastodon-tl--property 'base-toot :no-move)) ; for new notifs handling
           (id (mastodon-tl--as-string (mastodon-tl--field 'id (or base-toot toot))))
           (account (mastodon-tl--field 'account toot))
@@ -1100,6 +1089,9 @@ text of the toot being replied to in the compose buffer."
       id
       (or base-toot toot)))))
 
+
+;;; COMPOSE TOOT SETTINGS
+
 (defun mastodon-toot--toggle-warning ()
   "Toggle `mastodon-toot--content-warning'."
   (interactive)
@@ -1131,6 +1123,20 @@ text of the toot being replied to in the compose buffer."
                  "public")))
     (mastodon-toot--update-status-fields)))
 
+(defun mastodon-toot--set-toot-language ()
+  "Prompt for a language and set `mastodon-toot--language'.
+Return its two letter ISO 639 1 code."
+  (interactive)
+  (let* ((choice (completing-read "Language for this toot: "
+                                  mastodon-iso-639-1)))
+    (setq mastodon-toot--language
+          (alist-get choice mastodon-iso-639-1 nil nil 'equal))
+    (message "Language set to %s" choice)
+    (mastodon-toot--update-status-fields)))
+
+
+;;; ATTACHMENTS
+
 (defun mastodon-toot--clear-all-attachments ()
   "Remove all attachments from a toot draft."
   (interactive)
@@ -1163,8 +1169,7 @@ File is actually attached to the toot upon posting."
   "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
-                    (alist-get :filename attachment)))
+  (let* ((filename (expand-file-name (alist-get :filename attachment)))
          (caption (alist-get :description attachment))
          (url (concat mastodon-instance-url "/api/v2/media")))
     (message "Uploading %s... (please wait before starting further uploads)"
@@ -1203,8 +1208,11 @@ which is used to attach it to a toot when posting."
                 mastodon-toot--media-attachments))
       (list "None")))
 
+
+;;; POLL
+
 (defun mastodon-toot--fetch-max-poll-options (instance)
-  "Return the maximum number of poll options from INSTANCE, which is json."
+  "Return the maximum number of poll options from JSON data INSTANCE."
   (mastodon-toot--fetch-poll-field 'max_options instance))
 
 (defun mastodon-toot--fetch-max-poll-option-chars (instance)
@@ -1216,7 +1224,7 @@ INSTANCE is JSON."
         50))) ; masto default
 
 (defun mastodon-toot--fetch-poll-field (field instance)
-  "Return FIELD from the poll settings from INSTANCE, which is json."
+  "Return FIELD from the poll settings from JSON data INSTANCE."
   (let* ((polls (if (alist-get 'pleroma instance)
                     (alist-get 'poll_limits instance)
                   (alist-get 'polls
@@ -1226,8 +1234,7 @@ INSTANCE is JSON."
 (defun mastodon-toot--read-poll-options-count (max)
   "Read the user's choice of the number of options the poll should have.
 MAX is the maximum number set by their instance."
-  (let ((number (read-number
-                 (format "Number of options [2-%s]: " max) 2)))
+  (let ((number (read-number (format "Number of options [2-%s]: " max) 2)))
     (if (> number max)
         (error "You need to choose a number between 2 and %s" max)
       number)))
@@ -1235,7 +1242,6 @@ MAX is the maximum number set by their instance."
 (defun mastodon-toot--create-poll ()
   "Prompt for new poll options and return as a list."
   (interactive)
-  ;; re length, API docs show a poll 9 options.
   (let* ((instance (mastodon-http--get-json (mastodon-http--api "instance")))
          (max-options (mastodon-toot--fetch-max-poll-options instance))
          (count (mastodon-toot--read-poll-options-count max-options))
@@ -1252,11 +1258,10 @@ MAX is the maximum number set by their instance."
 (defun mastodon-toot--read-poll-options (count length)
   "Read a list of options for poll with COUNT options.
 LENGTH is the maximum character length allowed for a poll option."
-  (let* ((choices
-          (cl-loop for x from 1 to count
-                   collect (read-string
-                            (format "Poll option [%s/%s] [max %s chars]: "
-                                    x count length))))
+  (let* ((choices (cl-loop for x from 1 to count
+                           collect (read-string
+                                    (format "Poll option [%s/%s] [max %s chars]: "
+                                            x count length))))
          (longest (cl-reduce #'max (mapcar #'length choices))))
     (if (> longest length)
         (progn
@@ -1277,7 +1282,7 @@ LENGTH is the maximum character length allowed for a poll option."
           response))))
 
 (defun mastodon-toot--poll-expiry-options-alist ()
-  "Return an alist of seconds options."
+  "Return an alist of expiry options options in seconds."
   `(("5 minutes" . ,(number-to-string (* 60 5)))
     ("30 minutes" . ,(number-to-string (* 60 30)))
     ("1 hour" . ,(number-to-string (* 60 60)))
@@ -1288,16 +1293,8 @@ LENGTH is the maximum character length allowed for a poll option."
     ("14 days" . ,(number-to-string (* 60 60 24 14)))
     ("30 days" . ,(number-to-string (* 60 60 24 30)))))
 
-(defun mastodon-toot--set-toot-language ()
-  "Prompt for a language and set `mastodon-toot--language'.
-Return its two letter ISO 639 1 code."
-  (interactive)
-  (let* ((choice (completing-read "Language for this toot: "
-                                  mastodon-iso-639-1)))
-    (setq mastodon-toot--language
-          (alist-get choice mastodon-iso-639-1 nil nil 'equal))
-    (message "Language set to %s" choice)
-    (mastodon-toot--update-status-fields)))
+
+;;; SCHEDULE
 
 (defun mastodon-toot--schedule-toot (&optional reschedule)
   "Read a date (+ time) in the minibuffer and schedule the current toot.
@@ -1309,29 +1306,27 @@ With RESCHEDULE, reschedule the scheduled toot at point without editing."
          (message "You can't schedule toots you're editing."))
         ((not (or (mastodon-tl--buffer-type-eq 'new-toot)
                   (mastodon-tl--buffer-type-eq 'scheduled-statuses)))
-         (message "You can only schedule toots from the compose toot buffer or the scheduled toots view."))
+         (message "You can only schedule toots from the compose buffer or scheduled toots view."))
         (t
          (let* ((id (when reschedule (mastodon-tl--property 'id :no-move)))
                 (ts (when reschedule
                       (alist-get 'scheduled_at
                                  (mastodon-tl--property 'scheduled-json :no-move))))
-                (time-value
-                 (org-read-date t t nil "Schedule toot:"
-                                ;; default to scheduled timestamp if already set:
-                                (mastodon-toot--iso-to-org
-                                 ;; we are rescheduling without editing:
-                                 (or ts
-                                     ;; we are maybe editing the scheduled toot:
-                                     mastodon-toot--scheduled-for))))
+                (time-value (org-read-date t t nil "Schedule toot:"
+                                           ;; default to scheduled timestamp if already set:
+                                           (mastodon-toot--iso-to-org
+                                            ;; we are rescheduling without editing:
+                                            (or ts
+                                                ;; we are maybe editing the scheduled toot:
+                                                mastodon-toot--scheduled-for))))
                 (iso8601-str (format-time-string "%FT%T%z" time-value))
                 (msg-str (format-time-string "%d-%m-%y at %H:%M[%z]" time-value)))
            (if (not reschedule)
                (progn
                  (setq-local mastodon-toot--scheduled-for iso8601-str)
                  (message (format "Toot scheduled for %s." msg-str)))
-             (let* ((args (when reschedule `(("scheduled_at" . ,iso8601-str))))
-                    (url (when reschedule (mastodon-http--api
-                                           (format "scheduled_statuses/%s" id))))
+             (let* ((args `(("scheduled_at" . ,iso8601-str)))
+                    (url (mastodon-http--api (format "scheduled_statuses/%s" id)))
                     (response (mastodon-http--put url args)))
                (mastodon-http--triage response
                                       (lambda ()
@@ -1351,13 +1346,15 @@ With RESCHEDULE, reschedule the scheduled toot at point without editing."
   (when ts (let* ((decoded (iso8601-parse ts)))
              (encode-time decoded))))
 
-;; we'll need to revisit this if the binds get
-;; more diverse than two-chord bindings
+
+;;; DISPLAY KEYBINDINGS
+
 (defun mastodon-toot--get-mode-kbinds ()
   "Get a list of the keybindings in the mastodon-toot-mode."
   (let* ((binds (copy-tree mastodon-toot-mode-map))
          (prefix (car (cadr binds)))
-         (bindings (remove nil (mapcar (lambda (i) (if (listp i) i))
+         (bindings (remove nil (mapcar (lambda (i)
+                                         (when (listp i) i))
                                        (cadr binds)))))
     (mapcar (lambda (b)
               (setf (car b) (vector prefix (car b)))
@@ -1403,17 +1400,17 @@ LONGEST is the length of the longest binding."
 
 (defun mastodon-toot--formatted-kbinds-longest (kbinds-list)
   "Return the length of the longest item in KBINDS-LIST."
-  (let ((lengths (mapcar (lambda (x)
-                           (length x))
-                         kbinds-list)))
+  (let ((lengths (mapcar #'length kbinds-list)))
     (car (sort lengths #'>))))
 
+
+;;; DISPLAY DOCS
+
 (defun mastodon-toot--make-mode-docs ()
   "Create formatted documentation text for the mastodon-toot-mode."
   (let* ((kbinds (mastodon-toot--get-mode-kbinds))
-         (longest-kbind
-          (mastodon-toot--formatted-kbinds-longest
-           (mastodon-toot--format-kbinds kbinds))))
+         (longest-kbind (mastodon-toot--formatted-kbinds-longest
+                         (mastodon-toot--format-kbinds kbinds))))
     (concat
      " Compose a new toot here. The following keybindings are available:"
      (mapconcat #'identity
@@ -1426,15 +1423,12 @@ LONGEST is the length of the longest binding."
   "Format a REPLY-TEXT for display in compose buffer docs."
   (let* ((rendered (mastodon-tl--render-text reply-text))
          (no-props (substring-no-properties rendered))
-         ;; FIXME: this regex replaces \n at end of every post
-         ;; so we have to trim:
+         ;; FIXME: this replaces \n at end of every post, so we have to trim:
          (no-newlines (string-trim
                        (replace-regexp-in-string "[\n]+" " " no-props)))
          (reply-to (concat " Reply to: \"" no-newlines "\""))
-         (crop (truncate-string-to-width
-                ;; (string-limit
-                reply-to
-                mastodon-toot-orig-in-reply-length)))
+         (crop (truncate-string-to-width reply-to
+                                         mastodon-toot-orig-in-reply-length)))
     (if (> (length no-newlines)
            (length crop)) ; we cropped:
         (concat crop "\n")
@@ -1492,17 +1486,16 @@ REPLY-TEXT is the text of the toot being replied to."
 The default is given by `mastodon-toot--default-reply-visibility'."
   (unless (null reply-visibility)
     (let ((less-restrictive (member (intern mastodon-toot--default-reply-visibility)
-				    mastodon-toot-visibility-list)))
+				                    mastodon-toot-visibility-list)))
       (if (member (intern reply-visibility) less-restrictive)
-	  mastodon-toot--default-reply-visibility reply-visibility))))
+	      mastodon-toot--default-reply-visibility reply-visibility))))
 
 (defun mastodon-toot--setup-as-reply (reply-to-user reply-to-id reply-json)
   "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
-	 (mastodon-toot--most-restrictive-visibility
-	  (alist-get 'visibility reply-json)))
+  (let ((reply-visibility (mastodon-toot--most-restrictive-visibility
+	                       (alist-get 'visibility reply-json)))
         (reply-cw (alist-get 'spoiler_text reply-json)))
     (when reply-to-user
       (when (> (length reply-to-user) 0) ; self is "" unforch
@@ -1578,18 +1571,19 @@ CW is the content warning, which contributes to the character count."
     (insert toot-string)
     (goto-char (point-min))
     ;; handle URLs
-    (while (search-forward-regexp "\\w+://[^ \n]*" nil t) ; URL
+    (while (search-forward-regexp mastodon-toot-url-regex nil t)
+                                        ; "\\w+://[^ \n]*" old regex
       (replace-match "xxxxxxxxxxxxxxxxxxxxxxx")) ; 23 x's
     ;; handle @handles
     (goto-char (point-min))
-    (while (search-forward-regexp (concat "\\(?2:@[^ @\n]+\\)" ; a handle only
-                                          "\\(@[^ \n]+\\)?" ; with poss domain
-                                          "\\b")
-                                  nil t)
+    (while (search-forward-regexp mastodon-toot-handle-regex nil t)
       (replace-match (match-string 2))) ; replace with handle only
     (+ (length cw)
        (length (buffer-substring (point-min) (point-max))))))
 
+
+;;; DRAFTS
+
 (defun mastodon-toot--save-toot-text (&rest _args)
   "Save the current toot text in `mastodon-toot-current-toot-text'.
 Added to `after-change-functions' in new toot buffers."
@@ -1629,8 +1623,7 @@ Added to `after-change-functions' in new toot buffers."
                                     mastodon-toot-draft-toots-list
                                     nil t)))
         (setq mastodon-toot-draft-toots-list
-              (cl-delete draft mastodon-toot-draft-toots-list
-                         :test 'equal))
+              (cl-delete draft mastodon-toot-draft-toots-list :test 'equal))
         (message "Draft deleted!"))
     (message "No drafts to delete.")))
 
@@ -1640,13 +1633,15 @@ Added to `after-change-functions' in new toot buffers."
   (setq mastodon-toot-draft-toots-list nil)
   (message "All drafts deleted!"))
 
+
+;;; PROPERTIZE TAGS AND HANDLES
+
 (defun mastodon-toot--propertize-tags-and-handles (&rest _args)
   "Propertize tags and handles in toot compose buffer.
 Added to `after-change-functions'."
   (when (mastodon-toot--compose-buffer-p)
-    (let ((header-region
-           (mastodon-tl--find-property-range 'toot-post-header
-                                             (point-min)))
+    (let ((header-region (mastodon-tl--find-property-range 'toot-post-header
+                                                           (point-min)))
           (face (when mastodon-toot--proportional-fonts-compose
                   'variable-pitch)))
       ;; cull any prev props:
@@ -1682,14 +1677,13 @@ Added to `after-change-functions'."
     (save-match-data
       (let* ((fill-column 67))
         (goto-char (point-min))
-        ;; while-let shoulndn't be needed here, as we really should only have
-        ;; one. if we have more, the bug is elsewhere.
         (when-let ((prop (text-property-search-forward 'toot-reply)))
           (fill-region (prop-match-beginning prop)
                        (point)))))))
 
-;; NB: now that we have toot drafts, to ensure offline composing remains
-;; possible, avoid any direct requests here:
+
+;;; COMPOSE BUFFER FUNCTION
+
 (defun mastodon-toot--compose-buffer
     (&optional reply-to-user reply-to-id reply-json initial-text edit)
   "Create a new buffer to capture text for a new toot.
@@ -1733,10 +1727,9 @@ EDIT means we are editing an existing toot, not composing a new one."
       (mastodon-toot--get-max-toot-chars))
     ;; set up completion:
     (when mastodon-toot--enable-completion
-      (set ; (setq-local
-       (make-local-variable 'completion-at-point-functions)
-       (add-to-list 'completion-at-point-functions
-                    #'mastodon-toot--mentions-capf))
+      (set (make-local-variable 'completion-at-point-functions)
+           (add-to-list 'completion-at-point-functions
+                        #'mastodon-toot--mentions-capf))
       (add-to-list 'completion-at-point-functions
                    #'mastodon-toot--tags-capf)
       ;; company
@@ -1748,10 +1741,10 @@ EDIT means we are editing an existing toot, not composing a new one."
         (company-mode-on)))
     ;; after-change:
     (make-local-variable 'after-change-functions)
-    (cl-pushnew #'mastodon-toot--update-status-fields after-change-functions)
     (cl-pushnew #'mastodon-toot--save-toot-text after-change-functions)
-    (cl-pushnew #'mastodon-toot--propertize-tags-and-handles after-change-functions)
+    (cl-pushnew #'mastodon-toot--update-status-fields after-change-functions)
     (mastodon-toot--update-status-fields)
+    (cl-pushnew #'mastodon-toot--propertize-tags-and-handles after-change-functions)
     (mastodon-toot--propertize-tags-and-handles)
     (mastodon-toot--refresh-attachments-display)
     ;; draft toot text saving:
@@ -1765,6 +1758,7 @@ EDIT means we are editing an existing toot, not composing a new one."
 
 ;; flyspell ignore masto toot regexes:
 (defvar flyspell-generic-check-word-predicate)
+
 (defun mastodon-toot-mode-flyspell-verify ()
   "A predicate function for `flyspell'.
 Only text that is not one of these faces will be spell-checked."
diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el
index 4f102a6..9809365 100644
--- a/lisp/mastodon-views.el
+++ b/lisp/mastodon-views.el
@@ -168,26 +168,23 @@ provides the JSON data."
   (insert (mastodon-tl--set-face
            (concat "\n " mastodon-tl--horiz-bar "\n "
                    (upcase view-name)
-                   "\n "
-                   mastodon-tl--horiz-bar "\n\n")
+                   "\n " mastodon-tl--horiz-bar "\n\n")
            'success)
           (if bindings-string
-              (mastodon-tl--set-face
-               (concat "[" bindings-string "]"
-                       "\n\n")
-               'font-lock-comment-face)
+              (mastodon-tl--set-face (concat "[" bindings-string "]\n\n")
+                                     'font-lock-comment-face)
             ""))
   (if (seq-empty-p data)
       (insert (propertize
                (format "Looks like you have no %s for now." view-name)
                'face font-lock-comment-face
                'byline t
-               'toot-id "0")) ; so point can move here when no filters
+               'toot-id "0")) ; so point can move here when no item
     (funcall insert-fun data)
     (goto-char (point-min)))
-  ;; (when json
+  ;; (when data
   ;; FIXME: this seems to trigger a new request, but ideally would run.
-  ;; (mastodon-tl--goto-next-toot))))
+  ;; (mastodon-tl--goto-next-toot))
   )
 
 
@@ -196,8 +193,7 @@ provides the JSON data."
 (defun mastodon-views--view-lists ()
   "Show the user's lists in a new buffer."
   (interactive)
-  (mastodon-tl--init-sync "lists"
-                          "lists"
+  (mastodon-tl--init-sync "lists" "lists"
                           'mastodon-views--insert-lists)
   (with-current-buffer "*mastodon-lists*"
     (use-local-map mastodon-views--view-lists-keymap)))
@@ -214,8 +210,7 @@ provides the JSON data."
 
 (defun mastodon-views--print-list-set (lists)
   "Print each account plus a separator for each list in LISTS."
-  (let ((lists-names
-         (mastodon-tl--map-alist 'title lists)))
+  (let ((lists-names (mastodon-tl--map-alist 'title lists)))
     (mapc (lambda (x)
             (mastodon-views--print-list-accounts x)
             (insert (propertize (concat " " mastodon-tl--horiz-bar "\n\n")
@@ -237,16 +232,14 @@ a: add account to this list, r: remove account from this list"
                  'keymap mastodon-views--list-name-keymap
                  'list-name list-name
                  'list-id id)
-     (propertize
-      "\n\n"
-      'list t
-      'keymap mastodon-views--list-name-keymap
-      'list-name list-name
-      'list-id id)
+     (propertize "\n\n"
+                 'list t
+                 'keymap mastodon-views--list-name-keymap
+                 'list-name list-name
+                 'list-id id)
      (propertize
       (mapconcat #'mastodon-search--propertize-user accounts
                  " ")
-      ;; (mastodon-search--insert-users-propertized accounts)
       'list t
       'keymap mastodon-views--list-name-keymap
       'list-name list-name
@@ -293,8 +286,7 @@ If ID is provided, use that list."
   (let* ((list-names (unless id (mastodon-views--get-lists-names)))
          (name-old (if id
                        (mastodon-tl--property 'list-name :no-move)
-                     (completing-read "Edit list: "
-                                      list-names)))
+                     (completing-read "Edit list: " list-names)))
          (id (or id (mastodon-views--get-list-id name-old)))
          (name-choice (read-string "List name: " name-old))
          (replies-policy (completing-read "Replies policy: " ; give this a proper name
@@ -346,8 +338,8 @@ Prompt for name and replies policy."
                                         `(("title" . ,title)
                                           ("replies_policy" . ,replies-policy))
                                         nil)))
-    (mastodon-views--list-action-triage response
-                                        (message "list %s created!" title))))
+    (mastodon-views--list-action-triage
+     response "list %s created!" title)))
 
 (defun mastodon-views--delete-list-at-point ()
   "Delete list at point."
@@ -362,14 +354,13 @@ If ID is provided, delete that list."
   (let* ((list-names (unless id (mastodon-views--get-lists-names)))
          (name (if id
                    (mastodon-views--get-list-name id)
-                 (completing-read "Delete list: "
-                                  list-names)))
+                 (completing-read "Delete list: " list-names)))
          (id (or id (mastodon-views--get-list-id name)))
          (url (mastodon-http--api (format "lists/%s" id))))
     (when (y-or-n-p (format "Delete list %s?" name))
       (let ((response (mastodon-http--delete url)))
-        (mastodon-views--list-action-triage response
-                                            (message "list %s deleted!" name))))))
+        (mastodon-views--list-action-triage
+         response "list %s deleted!" name)))))
 
 (defun mastodon-views--get-users-followings ()
   "Return the list of followers of the logged in account."
@@ -402,11 +393,9 @@ If ACCOUNT-ID and HANDLE are provided use them rather than prompting."
                                               handles nil t)))
          (account-id (or account-id (alist-get account handles nil nil 'equal)))
          (url (mastodon-http--api (format "lists/%s/accounts" list-id)))
-         (response (mastodon-http--post url
-                                        `(("account_ids[]" . ,account-id)))))
+         (response (mastodon-http--post url `(("account_ids[]" . ,account-id)))))
     (mastodon-views--list-action-triage
-     response
-     (message "%s added to list %s!" account list-name))))
+     response "%s added to list %s!" account list-name)))
 
 (defun mastodon-views--add-toot-account-at-point-to-list ()
   "Prompt for a list, and add the account of the toot at point to it."
@@ -441,16 +430,15 @@ If ID is provided, use that list."
          (args (mastodon-http--build-array-params-alist "account_ids[]" `(,account-id)))
          (response (mastodon-http--delete url args)))
     (mastodon-views--list-action-triage
-     response
-     (message "%s removed from list %s!" account list-name))))
+     response "%s removed from list %s!" account list-name)))
 
-(defun mastodon-views--list-action-triage (response message)
-  "Call `mastodon-http--triage' on RESPONSE and display MESSAGE."
+(defun mastodon-views--list-action-triage (response &rest args)
+  "Call `mastodon-http--triage' on RESPONSE and call message on ARGS."
   (mastodon-http--triage response
                          (lambda ()
                            (when (mastodon-tl--buffer-type-eq 'lists)
                              (mastodon-views--view-lists))
-                           message)))
+                           (apply #'message args))))
 
 (defun mastodon-views--accounts-in-list (list-id)
   "Return the JSON of the accounts in list with LIST-ID."
@@ -505,20 +493,17 @@ JSON is the data returned by the server."
 
 (defun mastodon-views--insert-scheduled-toot (toot)
   "Insert scheduled TOOT into the buffer."
-  (let* ((id (alist-get 'id toot))
-         (scheduled (alist-get 'scheduled_at toot))
-         (params (alist-get 'params toot))
-         (text (alist-get 'text params)))
+  (let-alist toot
     (insert
-     (propertize (concat text
+     (propertize (concat .params.text
                          " | "
-                         (mastodon-toot--iso-to-human scheduled))
+                         (mastodon-toot--iso-to-human .scheduled_at))
                  'byline t ; so we nav here
                  'toot-id "0" ; so we nav here
                  'face 'font-lock-comment-face
                  'keymap mastodon-views--scheduled-map
                  'scheduled-json toot
-                 'id id)
+                 'id .id)
      "\n")))
 
 (defun mastodon-views--get-scheduled-toots (&optional id)
@@ -571,21 +556,16 @@ NO-CONFIRM means there is no ask or message, there is only do."
     (if (null id)
         (message "no scheduled toot at point?")
       (let* ((toot (mastodon-tl--property 'scheduled-json :no-move))
-             (scheduled (alist-get 'scheduled_at toot))
-             (params (alist-get 'params toot))
-             (text (alist-get 'text params))
-             (visibility (alist-get 'visibility params))
-             (cw (alist-get 'spoiler_text params))
-             (lang (alist-get 'language params))
-             ;; (poll (alist-get 'poll params))
-             (reply-id (alist-get 'in_reply_to_id params)))
-        ;; (media (alist-get 'media_attachments toot)))
-        (mastodon-toot--compose-buffer)
-        (goto-char (point-max))
-        (insert text)
-        ;; adopt properties from scheduled toot:
-        (mastodon-toot--set-toot-properties reply-id visibility cw
-                                            lang scheduled id)))))
+             (scheduled (alist-get 'scheduled_at toot)))
+        (let-alist (alist-get 'params toot)
+          ;; (poll (alist-get 'poll params))
+          ;; (media (alist-get 'media_attachments toot)))
+          (mastodon-toot--compose-buffer)
+          (goto-char (point-max))
+          (insert .text)
+          ;; adopt properties from scheduled toot:
+          (mastodon-toot--set-toot-properties
+           .in_reply_to_id .visibility .spoiler_text .language scheduled id))))))
 
 
 ;;; FILTERS
@@ -593,8 +573,7 @@ NO-CONFIRM means there is no ask or message, there is only do."
 (defun mastodon-views--view-filters ()
   "View the user's filters in a new buffer."
   (interactive)
-  (mastodon-tl--init-sync "filters"
-                          "filters"
+  (mastodon-tl--init-sync "filters" "filters"
                           'mastodon-views--insert-filters)
   (with-current-buffer "*mastodon-filters*"
     (use-local-map mastodon-views--view-filters-keymap)))
@@ -611,10 +590,7 @@ JSON is what is returned by by the server."
 (defun mastodon-views--insert-filter-string-set (json)
   "Insert a filter string plus a blank line.
 JSON is the filters data."
-  (mapc (lambda (x)
-          (mastodon-views--insert-filter-string x)
-          (insert "\n\n"))
-        json))
+  (mapc #'mastodon-views--insert-filter-string json))
 
 (defun mastodon-views--insert-filter-string (filter)
   "Insert a single FILTER."
@@ -627,9 +603,8 @@ JSON is the filters data."
      (propertize filter-string
                  'toot-id id ;for goto-next-filter compat
                  'phrase phrase
-                 ;;'help-echo "n/p to go to next/prev filter, c to create new filter, d to delete filter at point."
-                 ;;'keymap mastodon-views--view-filters-keymap
-                 'byline t)))) ;for goto-next-filter compat
+                 'byline t) ;for goto-next-filter compat
+     "\n\n")))
 
 (defun mastodon-views--create-filter ()
   "Create a filter for a word.
@@ -646,8 +621,7 @@ Prompt for a context, must be a list containting at least one of \"home\",
             (completing-read-multiple
              "Contexts to filter [TAB for options]: "
              '("home" "notifications" "public" "thread")
-             nil ; no predicate
-             t))) ; require-match, as context is mandatory
+             nil t)))
          (contexts-processed
           (if (equal nil contexts)
               (error "You must select at least one context for a filter")
@@ -660,7 +634,6 @@ Prompt for a context, must be a list containting at least one of \"home\",
     (mastodon-http--triage response
                            (lambda ()
                              (message "Filter created for %s!" word)
-                             ;; reload if we are in filters view:
                              (when (mastodon-tl--buffer-type-eq 'filters)
                                (mastodon-views--view-filters))))))
 
@@ -669,15 +642,15 @@ Prompt for a context, must be a list containting at least one of \"home\",
   (interactive)
   (let* ((filter-id (mastodon-tl--property 'toot-id :no-move))
          (phrase (mastodon-tl--property 'phrase :no-move))
-         (url (mastodon-http--api
-               (format "filters/%s" filter-id))))
+         (url (mastodon-http--api (format "filters/%s" filter-id))))
     (if (null phrase)
         (error "No filter at point?")
       (when (y-or-n-p (format "Delete filter %s? " phrase)))
       (let ((response (mastodon-http--delete url)))
-        (mastodon-http--triage response (lambda ()
-                                          (mastodon-views--view-filters)
-                                          (message "Filter for \"%s\" deleted!" phrase)))))))
+        (mastodon-http--triage
+         response (lambda ()
+                    (mastodon-views--view-filters)
+                    (message "Filter for \"%s\" deleted!" phrase)))))))
 
 
 ;;; FOLLOW SUGGESTIONS
@@ -751,17 +724,13 @@ INSTANCE is an instance domain name."
   (interactive)
   (if user
       (let ((response (mastodon-http--get-json
-                       (mastodon-http--api "instance")
-                       nil ; params
-                       nil ; silent
-                       :vector)))
+                       (mastodon-http--api "instance") nil nil :vector)))
         (mastodon-views--instance-response-fun response brief instance))
     (mastodon-tl--do-if-toot
      (let* ((toot (if (mastodon-tl--profile-buffer-p)
                       ;; we may be on profile description itself:
                       (or (mastodon-tl--property 'profile-json)
-                          ;; or on profile account listings, which use toot-json:
-                          ;; or just toots:
+                          ;; or on profile account listings, or just toots:
                           (mastodon-tl--property 'toot-json))
                     ;; normal timeline/account listing:
                     (mastodon-tl--property 'toot-json)))
@@ -769,28 +738,21 @@ INSTANCE is an instance domain name."
             (account (or (alist-get 'account reblog)
                          (alist-get 'account toot)
                          toot)) ; else `toot' is already an account listing.
-            ;; we can't use --profile-buffer-p as our test here because we may
-            ;; be looking at toots/boosts/users in a profile buffer.
-            ;; profile-json works as a defacto test for if point is on the
-            ;; profile details at the top of a profile buffer.
-            (url (if (and (mastodon-tl--profile-buffer-p)
-                          ;; only call this in profile buffers:
-                          (mastodon-tl--property 'profile-json))
+            ;; we may be at toots/boosts/users in a profile buffer.
+            ;; profile-json is a defacto test for if point is on the profile
+            ;; details at the top of a profile buffer.
+            (profile-note-p (and (mastodon-tl--profile-buffer-p)
+                                 ;; only call this in profile buffers:
+                                 (mastodon-tl--property 'profile-json)))
+            (url (if profile-note-p
                      (alist-get 'url toot) ; profile description
                    (alist-get 'url account)))
-            (username (if (and (mastodon-tl--profile-buffer-p)
-                               ;; only call this in profile buffers:
-                               (mastodon-tl--property 'profile-json))
+            (username (if profile-note-p
                           (alist-get 'username toot) ;; profile
                         (alist-get 'username account)))
             (instance (mastodon-views--get-instance-url url username instance))
             (response (mastodon-http--get-json
-                       (if user
-                           (mastodon-http--api "instance")
-                         (concat instance "/api/v1/instance"))
-                       nil ; params
-                       nil ; silent
-                       :vector)))
+                       (concat instance "/api/v1/instance") nil nil :vector)))
        (mastodon-views--instance-response-fun response brief instance)))))
 
 (defun mastodon-views--instance-response-fun (response brief instance)
@@ -823,53 +785,44 @@ INSTANCE is the instance were are working with."
   (format (concat "%-"
                   (number-to-string pad)
                   "s: ")
-          (propertize
-           (prin1-to-string (car el))
-           'face '(:underline t))))
+          (propertize (prin1-to-string (car el))
+                      'face '(:underline t))))
 
 (defun mastodon-views--print-json-keys (response &optional ind)
   "Print the JSON keys and values in RESPONSE.
 IND is the optional indentation level to print at."
-  (let* ((cars (mapcar
-                (lambda (x) (symbol-name (car x)))
-                response))
+  (let* ((cars (mapcar (lambda (x) (symbol-name (car x)))
+                       response))
          (pad (1+ (cl-reduce #'max (mapcar #'length cars)))))
     (while response
       (let ((el (pop response)))
         (cond
-         ;; vector of alists (fields, instance rules):
-         ((and (vectorp (cdr el))
+         ((and (vectorp (cdr el)) ; vector of alists (fields, instance rules):
                (not (seq-empty-p (cdr el)))
                (consp (seq-elt (cdr el) 0)))
-          (insert
-           (mastodon-views--format-key el pad)
-           "\n\n")
+          (insert (mastodon-views--format-key el pad)
+                  "\n\n")
           (seq-do #'mastodon-views--print-instance-rules-or-fields (cdr el))
           (insert "\n"))
-         ;; vector of strings (media types):
-         ((and (vectorp (cdr el))
+         ((and (vectorp (cdr el)) ; vector of strings (media types):
                (not (seq-empty-p (cdr el)))
                (< 1 (seq-length (cdr el)))
                (stringp (seq-elt (cdr el) 0)))
           (when ind (indent-to ind))
-          (insert
-           (mastodon-views--format-key el pad)
-           "\n"
-           (seq-mapcat
-            (lambda (x) (concat x ", "))
-            (cdr el) 'string)
-           "\n\n"))
-         ;; basic nesting:
-         ((consp (cdr el))
+          (insert (mastodon-views--format-key el pad)
+                  "\n"
+                  (seq-mapcat
+                   (lambda (x) (concat x ", "))
+                   (cdr el) 'string)
+                  "\n\n"))
+         ((consp (cdr el)) ; basic nesting:
           (when ind (indent-to ind))
-          (insert
-           (mastodon-views--format-key el pad)
-           "\n\n")
+          (insert (mastodon-views--format-key el pad)
+                  "\n\n")
           (mastodon-views--print-json-keys
            (cdr el) (if ind (+ ind 4) 4)))
-         (t
-          ;; basic handling of raw booleans:
-          (let ((val (cond ((equal (cdr el) ':json-false)
+         (t ; basic handling of raw booleans:
+          (let ((val (cond ((equal (cdr el) :json-false)
                             "no")
                            ((equal (cdr el) 't)
                             "yes")
@@ -879,31 +832,23 @@ IND is the optional indentation level to print at."
             (insert (mastodon-views--format-key el pad)
                     " "
                     (mastodon-views--newline-if-long (cdr el))
-                    ;; only send strings straight to --render-text
-                    ;; this makes hyperlinks work:
-                    (if (not (stringp val))
-                        (mastodon-tl--render-text
-                         (prin1-to-string val))
-                      (mastodon-tl--render-text val))
+                    ;; only send strings to --render-text (for hyperlinks):
+                    (mastodon-tl--render-text
+                     (if (stringp val) val (prin1-to-string val)))
                     "\n"))))))))
 
 (defun mastodon-views--print-instance-rules-or-fields (alist)
   "Print ALIST of instance rules or contact account or emoji fields."
-  (let ((key (or (alist-get 'id alist)
-                 (alist-get 'name alist)
-                 (alist-get 'shortcode alist)))
-        (value (or (alist-get 'text alist)
-                   (alist-get 'value alist)
-                   (alist-get 'url alist))))
-    (indent-to 4)
-    (insert
-     (format "%-5s: "
-             (propertize key
-                         'face '(:underline t)))
-     (mastodon-views--newline-if-long value)
-     (format "%s" (mastodon-tl--render-text
-                   value))
-     "\n")))
+  (let-alist alist
+    (let ((key (or .id .name .shortcode))
+          (value (or .text .value .url)))
+      (indent-to 4)
+      (insert (format "%-5s: "
+                      (propertize key 'face '(:underline t)))
+              (mastodon-views--newline-if-long value)
+              (format "%s" (mastodon-tl--render-text
+                            value))
+              "\n"))))
 
 (defun mastodon-views--newline-if-long (el)
   "Return a newline string if the cdr of EL is over 50 characters long."
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 21bd763..53986cf 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -155,8 +155,8 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "l") #'recenter-top-bottom)
     ;; navigation between timelines
     (define-key map (kbd "#") #'mastodon-tl--get-tag-timeline)
-    (define-key map (kbd ":") #'mastodon-tl--list-followed-tags)
-    (define-key map (kbd "C-:") #'mastodon-tl--followed-tags-timeline)
+    (define-key map (kbd "\"") #'mastodon-tl--list-followed-tags)
+    (define-key map (kbd "'") #'mastodon-tl--followed-tags-timeline)
     (define-key map (kbd "A") #'mastodon-profile--get-toot-author)
     (define-key map (kbd "F") #'mastodon-tl--get-federated-timeline)
     (define-key map (kbd "H") #'mastodon-tl--get-home-timeline)
@@ -180,6 +180,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "v") #'mastodon-tl--poll-vote)
     (define-key map (kbd "E") #'mastodon-toot--view-toot-edits)
     (define-key map (kbd "T") #'mastodon-tl--thread)
+    (define-key map (kbd "m") #'mastodon-tl--dm-user)
     (when (require 'lingva nil :no-error)
       (define-key map (kbd "a") #'mastodon-toot--translate-toot-text))
     (define-key map (kbd ",") #'mastodon-toot--list-toot-favouriters)
@@ -215,6 +216,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "I") #'mastodon-views--view-filters)
     (define-key map (kbd "G") #'mastodon-views--view-follow-suggestions)
     (define-key map (kbd "X") #'mastodon-views--view-lists)
+    (define-key map (kbd "SPC") #'mastodon-tl--scroll-up-command)
     map)
   "Keymap for `mastodon-mode'.")
 
@@ -306,11 +308,10 @@ from the server and load anew."
         (progn (switch-to-buffer buffer)
                (mastodon-tl--update))
       (message "Loading your notifications...")
-      (mastodon-tl--init-sync
-       (or buffer-name "notifications")
-       "notifications"
-       'mastodon-notifications--timeline
-       type)
+      (mastodon-tl--init-sync (or buffer-name "notifications")
+                              "notifications"
+                              'mastodon-notifications--timeline
+                              type)
       (with-current-buffer buffer
         (use-local-map mastodon-notifications--map)))))
 
@@ -329,11 +330,7 @@ not, just browse the URL in the normal fashion."
                     (mastodon-tl--property 'shr-url :no-move)
                     (read-string "Lookup URL: "))))
     (if (not (mastodon--masto-url-p query))
-        ;; this doesn't work as shr-browse-url doesn't take a url arg
-        ;; and with no args it can't use our read-string query, but only
-        ;; looks for a url at point
-        ;; (if (equal major-mode 'mastodon-mode)
-        ;; (shr-browse-url query) ;; keep our shr keymap
+        ;; (shr-browse-url query) ; doesn't work (keep our shr keymap)
         (browse-url query)
       (message "Performing lookup...")
       (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
@@ -371,7 +368,10 @@ not, just browse the URL in the normal fashion."
           (string-match "^/profile/[[:alpha:]]+$" query)
           (string-match "^/p/[[:alpha:]]+/[[:digit:]]+$" query)
           (string-match "^/[[:alpha:]]+$" query)
-          (string-match "^/u/[[:alpha:]]+$" query)))))
+          (string-match "^/u/[[:alpha:]]+$" query)
+          (string-match "^/c/[[:alnum:]]+$" query)
+          (string-match "^/post/[[:digit:]]+$" query)
+          (string-match "^/comment/[[:digit:]]+$" query))))) ; lemmy
 
 (defun mastodon-live-buffers ()
   "Return a list of open mastodon buffers.
diff --git a/mastodon-index.org b/mastodon-index.org
new file mode 100644
index 0000000..ef5bc14
--- /dev/null
+++ b/mastodon-index.org
@@ -0,0 +1,253 @@
+
+* mastodon commands index
+
+#+BEGIN_SRC emacs-lisp :results table :colnames '("Binding" "Command" "Description") :exports results
+  (let ((rows))
+    (mapatoms
+     (lambda (symbol)
+       (when (and (string-match "^mastodon"
+                                (symbol-name symbol))
+                  (commandp symbol))
+         (let* ((doc (car
+                      (split-string
+                       (or (documentation symbol t) "")
+                       "\n")))
+                ;; add more keymaps here
+                ;; some keys are in sub 'keymap keys inside a map
+                (maps (list mastodon-mode-map
+                            mastodon-toot-mode-map
+                            mastodon-profile-mode-map
+                            mastodon-notifications--map
+                            mastodon-tl--shr-image-map-replacement
+                            mastodon-profile-update-mode-map
+                            mastodon-views-map
+                            mastodon-views--follow-suggestions-map
+                            mastodon-views--scheduled-map
+                            mastodon-views--view-lists-keymap
+                            mastodon-views--view-follow-requests-keymap
+                            mastodon-views--view-filters-keymap))
+                (binding-code
+                 (let ((keys (where-is-internal symbol maps nil nil (command-remapping symbol))))
+                   ;; just take first 2 bindings:
+                   (if (> (length keys) 2)
+                       (list (car keys) (cadr keys))
+                     keys)))
+                ;; (or (car (rassoc symbol mastodon-mode-map))
+                ;; (car (rassoc symbol (cadr mastodon-toot-mode-map)))
+                ;; (car (rassoc symbol (cadr mastodon-profile-mode-map)))
+                ;; (car (rassoc symbol mastodon-notifications--map))))
+                (binding-str (if binding-code
+                                 (mapconcat #'help--key-description-fontified
+                                            binding-code ", ")
+                               "")))
+           (push `(,binding-str ,symbol ,doc) rows)
+           rows))))
+    (sort rows (lambda (x y) (string-lessp (cadr x) (cadr y)))))
+#+END_SRC
+
+#+RESULTS:
+| Binding          | Command                                           | Description                                                                    |
+|------------------+---------------------------------------------------+--------------------------------------------------------------------------------|
+|                  | mastodon                                          | Connect Mastodon client to `mastodon-instance-url' instance.                   |
+|                  | mastodon-async-mode                               | Async Mastodon.                                                                |
+|                  | mastodon-discover                                 | Plug Mastodon functionality into `discover'.                                   |
+| C-M-q            | mastodon-kill-all-buffers                         | Kill any and all open mastodon buffers, hopefully.                             |
+|                  | mastodon-mode                                     | Major mode for Mastodon, the federated microblogging network.                  |
+|                  | mastodon-notifications--clear-all                 | Clear all notifications.                                                       |
+| C-k              | mastodon-notifications--clear-current             | Dismiss the notification at point.                                             |
+|                  | mastodon-notifications--follow-request-accept     | Accept a follow request.                                                       |
+| j                | mastodon-notifications--follow-request-reject     | Reject a follow request.                                                       |
+|                  | mastodon-notifications--get-boosts                | Display boost notifications in buffer.                                         |
+|                  | mastodon-notifications--get-favourites            | Display favourite notifications in buffer.                                     |
+| @                | mastodon-notifications--get-mentions              | Display mention notifications in buffer.                                       |
+|                  | mastodon-notifications--get-polls                 | Display poll notifications in buffer.                                          |
+|                  | mastodon-notifications--get-statuses              | Display status notifications in buffer.                                        |
+| N                | mastodon-notifications-get                        | Display NOTIFICATIONS in buffer.                                               |
+|                  | mastodon-profile--account-bot-toggle              | Toggle the bot status of your account.                                         |
+|                  | mastodon-profile--account-discoverable-toggle     | Toggle the discoverable status of your account.                                |
+|                  | mastodon-profile--account-locked-toggle           | Toggle the locked status of your account.                                      |
+|                  | mastodon-profile--account-sensitive-toggle        | Toggle the sensitive status of your account.                                   |
+|                  | mastodon-profile--account-view-cycle              | Cycle through profile view: toots, toot sans boosts, followers, and following. |
+|                  | mastodon-profile--add-account-to-list             | Add account of current profile buffer to a list.                               |
+|                  | mastodon-profile--add-private-note-to-account     | Add a private note to an account.                                              |
+| A                | mastodon-profile--get-toot-author                 | Open profile of author of toot under point.                                    |
+| O                | mastodon-profile--my-profile                      | Show the profile of the currently signed in user.                              |
+|                  | mastodon-profile--open-followers                  | Open a profile buffer showing the accounts following the current profile.      |
+|                  | mastodon-profile--open-following                  | Open a profile buffer showing the accounts that current profile follows.       |
+|                  | mastodon-profile--open-statuses-no-reblogs        | Open a profile buffer showing statuses without reblogs.                        |
+|                  | mastodon-profile--remove-from-followers-at-point  | Prompt for a user in the item at point and remove from followers.              |
+|                  | mastodon-profile--remove-from-followers-list      | Select a user from your followers and remove from followers.                   |
+|                  | mastodon-profile--remove-user-from-followers      | Remove a user from your followers.                                             |
+|                  | mastodon-profile--show-familiar-followers         | Show a list of familiar followers.                                             |
+| P                | mastodon-profile--show-user                       | Query for USER-HANDLE from current status and show that user's profile.        |
+|                  | mastodon-profile--toot-json                       | Get the next toot-json.                                                        |
+|                  | mastodon-profile--update-display-name             | Update display name for your account.                                          |
+|                  | mastodon-profile--update-meta-fields              | Prompt for new metadata fields information and PATCH the server.               |
+|                  | mastodon-profile--update-profile-note-cancel      | Cancel updating user profile and kill buffer and window.                       |
+| U                | mastodon-profile--update-user-profile-note        | Fetch user's profile note and display for editing.                             |
+|                  | mastodon-profile--user-profile-send-updated       | Send PATCH request with the updated profile note.                              |
+|                  | mastodon-profile--view-account-private-note       | Display the private note about a user.                                         |
+| K                | mastodon-profile--view-bookmarks                  | Open a new buffer displaying the user's bookmarks.                             |
+| V                | mastodon-profile--view-favourites                 | Open a new buffer displaying the user's favourites.                            |
+|                  | mastodon-profile--view-preferences                | View user preferences in another window.                                       |
+|                  | mastodon-profile-mode                             | Toggle mastodon profile minor mode.                                            |
+|                  | mastodon-profile-update-mode                      | Minor mode to update Mastodon user profile.                                    |
+| s                | mastodon-search--search-query                     | Prompt for a search QUERY and return accounts, statuses, and hashtags.         |
+|                  | mastodon-search--trending-statuses                | Display a list of statuses trending on your instance.                          |
+|                  | mastodon-search--trending-tags                    | Display a list of tags trending on your instance.                              |
+| B                | mastodon-tl--block-user                           | Query for USER-HANDLE from current status and block that user.                 |
+|                  | mastodon-tl--disable-notify-user-posts            | Query for USER-HANDLE and disable notifications when they post.                |
+| m                | mastodon-tl--dm-user                              | Query for USER-HANDLE from current status and compose a message to that user.  |
+|                  | mastodon-tl--do-link-action                       | Do the action of the link at point.                                            |
+|                  | mastodon-tl--do-link-action-at-point              | Do the action of the link at POSITION.                                         |
+|                  | mastodon-tl--enable-notify-user-posts             | Query for USER-HANDLE and enable notifications when they post.                 |
+|                  | mastodon-tl--filter-user-user-posts-by-language   | Query for USER-HANDLE and enable notifications when they post.                 |
+|                  | mastodon-tl--follow-tag                           | Prompt for a tag and follow it.                                                |
+| W                | mastodon-tl--follow-user                          | Query for USER-HANDLE from current status and follow that user.                |
+| '                | mastodon-tl--followed-tags-timeline               | Open a timeline of all your followed tags.                                     |
+| F                | mastodon-tl--get-federated-timeline               | Open federated timeline.                                                       |
+| H                | mastodon-tl--get-home-timeline                    | Open home timeline.                                                            |
+| L                | mastodon-tl--get-local-timeline                   | Open local timeline.                                                           |
+| #                | mastodon-tl--get-tag-timeline                     | Prompt for tag and opens its timeline.                                         |
+|                  | mastodon-tl--goto-next-item                       | Jump to next item, e.g. filter or follow request.                              |
+| n, C-<down>      | mastodon-tl--goto-next-toot                       | Jump to next toot header.                                                      |
+|                  | mastodon-tl--goto-prev-item                       | Jump to previous item, e.g. filter or follow request.                          |
+| p, C-<up>        | mastodon-tl--goto-prev-toot                       | Jump to last toot header.                                                      |
+| "                | mastodon-tl--list-followed-tags                   | List followed tags. View timeline of tag user choses.                          |
+| C-<return>       | mastodon-tl--mpv-play-video-at-point              | Play the video or gif at point with an mpv process.                            |
+|                  | mastodon-tl--mpv-play-video-from-byline           | Run `mastodon-tl--mpv-play-video-at-point' on first moving image in post.      |
+|                  | mastodon-tl--mute-thread                          | Mute the thread displayed in the current buffer.                               |
+| M                | mastodon-tl--mute-user                            | Query for USER-HANDLE from current status and mute that user.                  |
+| TAB, M-n         | mastodon-tl--next-tab-item                        | Move to the next interesting item.                                             |
+| v                | mastodon-tl--poll-vote                            | If there is a poll at point, prompt user for OPTION to vote on it.             |
+| S-TAB, <backtab> | mastodon-tl--previous-tab-item                    | Move to the previous interesting item.                                         |
+| Z                | mastodon-tl--report-to-mods                       | Report the author of the toot at point to your instance moderators.            |
+| SPC              | mastodon-tl--scroll-up-command                    | Call `scroll-up-command', loading more toots if necessary.                     |
+|                  | mastodon-tl--single-toot                          | View toot at point in separate buffer.                                         |
+|                  | mastodon-tl--some-followed-tags-timeline          | Prompt for some tags, and open a timeline for them.                            |
+| T                | mastodon-tl--thread                               | Open thread buffer for toot at point or with ID.                               |
+| c                | mastodon-tl--toggle-spoiler-text-in-toot          | Toggle the visibility of the spoiler text in the current toot.                 |
+| C-S-b            | mastodon-tl--unblock-user                         | Query for USER-HANDLE from list of blocked users and unblock that user.        |
+|                  | mastodon-tl--unfollow-tag                         | Prompt for a followed tag, and unfollow it.                                    |
+| C-S-w            | mastodon-tl--unfollow-user                        | Query for USER-HANDLE from current status and unfollow that user.              |
+|                  | mastodon-tl--unmute-thread                        | Mute the thread displayed in the current buffer.                               |
+| S-RET            | mastodon-tl--unmute-user                          | Query for USER-HANDLE from list of muted users and unmute that user.           |
+| u, g             | mastodon-tl--update                               | Update timeline with new toots.                                                |
+|                  | mastodon-tl--view-whole-thread                    | From a thread view, view entire thread.                                        |
+| t                | mastodon-toot                                     | Update instance with new toot. Content is captured in a new buffer.            |
+| C-c C-a          | mastodon-toot--attach-media                       | Prompt for an attachment FILE with DESCRIPTION.                                |
+| C-c C-k          | mastodon-toot--cancel                             | Kill new-toot buffer/window. Does not POST content to Mastodon.                |
+| C-c C-v          | mastodon-toot--change-visibility                  | Change the current visibility to the next valid value.                         |
+| C-c !            | mastodon-toot--clear-all-attachments              | Remove all attachments from a toot draft.                                      |
+|                  | mastodon-toot--copy-toot-text                     | Copy text of toot at point.                                                    |
+| C                | mastodon-toot--copy-toot-url                      | Copy URL of toot at point.                                                     |
+| C-c C-p          | mastodon-toot--create-poll                        | Prompt for new poll options and return as a list.                              |
+|                  | mastodon-toot--delete-all-drafts                  | Delete all drafts.                                                             |
+| D                | mastodon-toot--delete-and-redraft-toot            | Delete and redraft user's toot at point synchronously.                         |
+|                  | mastodon-toot--delete-draft-toot                  | Prompt for a draft toot and delete it.                                         |
+| d                | mastodon-toot--delete-toot                        | Delete user's toot at point synchronously.                                     |
+|                  | mastodon-toot--download-custom-emoji              | Download `mastodon-instance-url's custom emoji.                                |
+| e                | mastodon-toot--edit-toot-at-point                 | Edit the user's toot at point.                                                 |
+|                  | mastodon-toot--enable-custom-emoji                | Add `mastodon-instance-url's custom emoji to `emojify'.                        |
+| C-c C-e          | mastodon-toot--insert-emoji                       | Prompt to insert an emoji.                                                     |
+| .                | mastodon-toot--list-toot-boosters                 | List the boosters of toot at point.                                            |
+| ,                | mastodon-toot--list-toot-favouriters              | List the favouriters of toot at point.                                         |
+|                  | mastodon-toot--open-draft-toot                    | Prompt for a draft and compose a toot with it.                                 |
+| i                | mastodon-toot--pin-toot-toggle                    | Pin or unpin user's toot at point.                                             |
+| r                | mastodon-toot--reply                              | Reply to toot at `point'.                                                      |
+|                  | mastodon-toot--save-draft                         | Save the current compose toot text as a draft.                                 |
+| C-c C-s          | mastodon-toot--schedule-toot                      | Read a date (+ time) in the minibuffer and schedule the current toot.          |
+| C-c C-c          | mastodon-toot--send                               | POST contents of new-toot buffer to Mastodon instance and kill buffer.         |
+|                  | mastodon-toot--set-default-visibility             | Set the default visibility for toots on the server.                            |
+| C-c C-l          | mastodon-toot--set-toot-language                  | Prompt for a language and set `mastodon-toot--language'.                       |
+| k                | mastodon-toot--toggle-bookmark                    | Bookmark or unbookmark toot at point.                                          |
+| b                | mastodon-toot--toggle-boost                       | Boost/unboost toot at `point'.                                                 |
+| f                | mastodon-toot--toggle-favourite                   | Favourite/unfavourite toot at `point'.                                         |
+| C-c C-n          | mastodon-toot--toggle-nsfw                        | Toggle `mastodon-toot--content-nsfw'.                                          |
+| C-c C-w          | mastodon-toot--toggle-warning                     | Toggle `mastodon-toot--content-warning'.                                       |
+| a                | mastodon-toot--translate-toot-text                | Translate text of toot at point.                                               |
+| E                | mastodon-toot--view-toot-edits                    | View editing history of the toot at point in a popup buffer.                   |
+|                  | mastodon-toot-mode                                | Minor mode to capture Mastodon toots.                                          |
+|                  | mastodon-turn-on-discover                         | Turns on discover support                                                      |
+|                  | mastodon-url-lookup                               | If a URL resembles a mastodon link, try to load in `mastodon.el'.              |
+|                  | mastodon-views--add-account-to-list               | Prompt for a list and for an account, add account to list.                     |
+|                  | mastodon-views--add-account-to-list-at-point      | Prompt for account and add to list at point.                                   |
+|                  | mastodon-views--add-toot-account-at-point-to-list | Prompt for a list, and add the account of the toot at point to it.             |
+|                  | mastodon-views--cancel-scheduled-toot             | Cancel the scheduled toot at point.                                            |
+|                  | mastodon-views--copy-scheduled-toot-text          | Copy the text of the scheduled toot at point.                                  |
+|                  | mastodon-views--create-filter                     | Create a filter for a word.                                                    |
+|                  | mastodon-views--create-list                       | Create a new list.                                                             |
+|                  | mastodon-views--delete-filter                     | Delete filter at point.                                                        |
+|                  | mastodon-views--delete-list                       | Prompt for a list and delete it.                                               |
+|                  | mastodon-views--delete-list-at-point              | Delete list at point.                                                          |
+|                  | mastodon-views--edit-list                         | Prompt for a list and edit the name and replies policy.                        |
+|                  | mastodon-views--edit-list-at-point                | Edit list at point.                                                            |
+|                  | mastodon-views--edit-scheduled-as-new             | Edit scheduled status as new toot.                                             |
+|                  | mastodon-views--remove-account-from-list          | Prompt for a list, select an account and remove from list.                     |
+|                  | mastodon-views--remove-account-from-list-at-point | Prompt for account and remove from list at point.                              |
+|                  | mastodon-views--reschedule-toot                   | Reschedule the scheduled toot at point.                                        |
+| I                | mastodon-views--view-filters                      | View the user's filters in a new buffer.                                       |
+| R                | mastodon-views--view-follow-requests              | Open a new buffer displaying the user's follow requests.                       |
+| G                | mastodon-views--view-follow-suggestions           | Display a buffer of suggested accounts to follow.                              |
+| ;                | mastodon-views--view-instance-description         | View the details of the instance the current post's author is on.              |
+|                  | mastodon-views--view-instance-description-brief   | View brief details of the instance the current post's author is on.            |
+|                  | mastodon-views--view-list-timeline                | Prompt for a list and view its timeline.                                       |
+| X                | mastodon-views--view-lists                        | Show the user's lists in a new buffer.                                         |
+|                  | mastodon-views--view-own-instance                 | View details of your own instance.                                             |
+|                  | mastodon-views--view-own-instance-brief           | View brief details of your own instance.                                       |
+| S                | mastodon-views--view-scheduled-toots              | Show the user's scheduled toots in a new buffer.                               |
+|                  | mastodon-views--view-timeline-list-at-point       | View timeline of list at point.                                                |
+
+* mastodon custom variables index
+ 
+#+BEGIN_SRC emacs-lisp :results table :colnames '("Custom variable" "Description") :exports results
+  (let ((rows))
+    (mapatoms
+     (lambda (symbol)
+       (when (and (string-match "^mastodon"
+                                (symbol-name symbol))
+                  (custom-variable-p symbol))
+         (let* ((doc (car (split-string
+                           (or (get (indirect-variable symbol)
+                                    'variable-documentation)
+                               (get symbol 'variable-documentation)
+                               "")
+                           "\n"))))
+           (push `(,symbol ,doc) rows)
+           rows))))
+    (sort rows (lambda (x y) (string-lessp (car x) (car y)))))
+#+end_src
+
+#+RESULTS:
+| Custom variable                                    | Description                                                          |
+|----------------------------------------------------+----------------------------------------------------------------------|
+| mastodon-active-user                               | Username of the active user.                                         |
+| mastodon-client--token-file                        | File path where Mastodon access tokens are stored.                   |
+| mastodon-instance-url                              | Base URL for the Mastodon instance you want to be active.            |
+| mastodon-media--avatar-height                      | Height of the user avatar images (if shown).                         |
+| mastodon-media--enable-image-caching               | Whether images should be cached.                                     |
+| mastodon-media--preview-max-height                 | Max height of any media attachment preview to be shown in timelines. |
+| mastodon-mode-hook                                 | Hook run when entering Mastodon mode.                                |
+| mastodon-profile-mode-hook                         | Hook run after entering or leaving `mastodon-profile-mode'.          |
+| mastodon-profile-update-mode-hook                  | Hook run after entering or leaving `mastodon-profile-update-mode'.   |
+| mastodon-tl--display-caption-not-url-when-no-media | Display an image's caption rather than URL.                          |
+| mastodon-tl--enable-proportional-fonts             | Nonnil to enable using proportional fonts when rendering HTML.       |
+| mastodon-tl--enable-relative-timestamps            | Whether to show relative (to the current time) timestamps.           |
+| mastodon-tl--hide-replies                          | Whether to hide replies from the timelines.                          |
+| mastodon-tl--show-avatars                          | Whether to enable display of user avatars in timelines.              |
+| mastodon-tl--show-stats                            | Whether to show toot stats (faves, boosts, replies counts).          |
+| mastodon-tl--symbols                               | A set of symbols (and fallback strings) to be used in timeline.      |
+| mastodon-tl--timeline-posts-count                  | Number of posts to display when loading a timeline.                  |
+| mastodon-tl-position-after-update                  | Defines where `point' should be located after a timeline update.     |
+| mastodon-toot--attachment-height                   | Height of the attached images preview in the toot draft buffer.      |
+| mastodon-toot--completion-style-for-mentions       | The company completion style to use for mentions.                    |
+| mastodon-toot--default-media-directory             | The default directory when prompting for a media file to upload.     |
+| mastodon-toot--default-reply-visibility            | Default visibility settings when replying.                           |
+| mastodon-toot--enable-completion                   | Whether to enable completion of mentions and hashtags.               |
+| mastodon-toot--enable-custom-instance-emoji        | Whether to enable your instance's custom emoji by default.           |
+| mastodon-toot--proportional-fonts-compose          | Nonnil to enable using proportional fonts in the compose buffer.     |
+| mastodon-toot--use-company-for-completion          | Whether to enable company for completion.                            |
+| mastodon-toot-display-orig-in-reply-buffer         | Display a copy of the toot replied to in the compose buffer.         |
+| mastodon-toot-mode-hook                            | Hook run after entering or leaving `mastodon-toot-mode'.             |
+| mastodon-toot-orig-in-reply-length                 | Length to crop toot replied to in the compose buffer to.             |
+| mastodon-toot-timestamp-format                     | Format to use for timestamps.                                        |
diff --git a/mastodon.info b/mastodon.info
index 12f5da4..caae4d9 100644
--- a/mastodon.info
+++ b/mastodon.info
@@ -38,6 +38,7 @@ Usage
 * Composing toots::
 * Other commands and account settings::
 * Customization::
+* Commands and variables index::
 * Alternative timeline layout::
 * Live-updating timelines mastodon-async-mode::
 * Translating toots::
@@ -161,6 +162,7 @@ File: mastodon.info,  Node: Usage,  Next: Dependencies,  Prev: Installation,  Up
 * Composing toots::
 * Other commands and account settings::
 * Customization::
+* Commands and variables index::
 * Alternative timeline layout::
 * Live-updating timelines mastodon-async-mode::
 * Translating toots::
@@ -332,7 +334,7 @@ is as follows:
      ‘C-c C-p’   Create a poll
      ‘C-c C-l’   Set toot language
 
-  2. autocompletion of mentions and tags
+  2. Autocompletion of mentions and tags
 
      Autocompletion of mentions and tags is provided by
      ‘completion-at-point-functions’ (capf) backends.
@@ -424,7 +426,7 @@ and should work without first loading ‘mastodon.el’:
      posts are marked as sensitive (nsfw) by default.
 
 
-File: mastodon.info,  Node: Customization,  Next: Alternative timeline layout,  Prev: Other commands and account settings,  Up: Usage
+File: mastodon.info,  Node: Customization,  Next: Commands and variables index,  Prev: Other commands and account settings,  Up: Usage
 
 1.2.5 Customization
 -------------------
@@ -449,9 +451,18 @@ See ‘M-x customize-group RET mastodon’ to view all customize options.
         • Set default reply visibility
 
 
-File: mastodon.info,  Node: Alternative timeline layout,  Next: Live-updating timelines mastodon-async-mode,  Prev: Customization,  Up: Usage
+File: mastodon.info,  Node: Commands and variables index,  Next: Alternative timeline layout,  Prev: Customization,  Up: Usage
 
-1.2.6 Alternative timeline layout
+1.2.6 Commands and variables index
+----------------------------------
+
+An index of all user-facing commands and custom variables is available
+here: mastodon-index.org (mastodon-index.org).
+
+
+File: mastodon.info,  Node: Alternative timeline layout,  Next: Live-updating timelines mastodon-async-mode,  Prev: Commands and variables index,  Up: Usage
+
+1.2.7 Alternative timeline layout
 ---------------------------------
 
 The incomparable Nicholas Rougier has written an alternative timeline
@@ -463,7 +474,7 @@ layout for ‘mastodon.el’.
 
 File: mastodon.info,  Node: Live-updating timelines mastodon-async-mode,  Next: Translating toots,  Prev: Alternative timeline layout,  Up: Usage
 
-1.2.7 Live-updating timelines: ‘mastodon-async-mode’
+1.2.8 Live-updating timelines: ‘mastodon-async-mode’
 ----------------------------------------------------
 
 (code taken from mastodon-future
@@ -482,7 +493,7 @@ Then you can view a timeline with one of the commands that begin with
 
 File: mastodon.info,  Node: Translating toots,  Next: bookmarks and mastodonel,  Prev: Live-updating timelines mastodon-async-mode,  Up: Usage
 
-1.2.8 Translating toots
+1.2.9 Translating toots
 -----------------------
 
 You can translate toots with ‘mastodon-toot--translate-toot-text’ (‘a’
@@ -509,8 +520,8 @@ looks like:
 
 File: mastodon.info,  Node: bookmarks and mastodonel,  Prev: Translating toots,  Up: Usage
 
-1.2.9 bookmarks and ‘mastodon.el’
----------------------------------
+1.2.10 bookmarks and ‘mastodon.el’
+----------------------------------
 
 ‘mastodon.el’ doesn’t currently implement its own bookmark record and
 handler, which means that emacs bookmarks will not work as is.  Until we
@@ -645,34 +656,35 @@ File: mastodon.info,  Node: Contributors,  Prev: Supporting mastodonel,  Up: REA
 
 Tag Table:
 Node: Top210
-Node: README911
-Node: Installation1327
-Node: MELPA1863
-Node: Emoji2231
-Node: Discover2563
-Node: Usage3115
-Node: Logging in to your instance3525
-Node: Timelines4522
-Ref: Keybindings4997
-Ref: Toot byline legend9570
-Node: Composing toots9879
-Ref: Keybindings (1)11118
-Ref: autocompletion of mentions and tags11636
-Ref: Draft toots12349
-Node: Other commands and account settings12820
-Node: Customization15978
-Node: Alternative timeline layout16764
-Node: Live-updating timelines mastodon-async-mode17154
-Node: Translating toots18006
-Node: bookmarks and mastodonel19188
-Node: Dependencies19658
-Node: Network compatibility20264
-Node: Contributing20750
-Node: Bug reports21039
-Node: Fixes and features21945
-Node: Coding style22428
-Node: Supporting mastodonel23052
-Node: Contributors23574
+Node: README944
+Node: Installation1360
+Node: MELPA1896
+Node: Emoji2264
+Node: Discover2596
+Node: Usage3148
+Node: Logging in to your instance3591
+Node: Timelines4588
+Ref: Keybindings5063
+Ref: Toot byline legend9636
+Node: Composing toots9945
+Ref: Keybindings (1)11184
+Ref: Autocompletion of mentions and tags11702
+Ref: Draft toots12415
+Node: Other commands and account settings12886
+Node: Customization16044
+Node: Commands and variables index16831
+Node: Alternative timeline layout17151
+Node: Live-updating timelines mastodon-async-mode17556
+Node: Translating toots18408
+Node: bookmarks and mastodonel19590
+Node: Dependencies20062
+Node: Network compatibility20668
+Node: Contributing21154
+Node: Bug reports21443
+Node: Fixes and features22349
+Node: Coding style22832
+Node: Supporting mastodonel23456
+Node: Contributors23978
 
 End Tag Table
 
diff --git a/mastodon.texi b/mastodon.texi
index 1850844..1f2cd14 100644
--- a/mastodon.texi
+++ b/mastodon.texi
@@ -52,6 +52,7 @@ Usage
 * Composing toots::
 * Other commands and account settings::
 * Customization::
+* Commands and variables index::
 * Alternative timeline layout::
 * Live-updating timelines @samp{mastodon-async-mode}::
 * Translating toots::
@@ -163,6 +164,7 @@ Or, with @samp{use-package}:
 * Composing toots::
 * Other commands and account settings::
 * Customization::
+* Commands and variables index::
 * Alternative timeline layout::
 * Live-updating timelines @samp{mastodon-async-mode}::
 * Translating toots::
@@ -416,7 +418,7 @@ value of that hook is as follows:
 @end multitable
 
 @item
-@anchor{autocompletion of mentions and tags}autocompletion of mentions and tags
+@anchor{Autocompletion of mentions and tags}Autocompletion of mentions and tags
 
 
 Autocompletion of mentions and tags is provided by
@@ -593,6 +595,11 @@ Set default reply visibility
 @end itemize
 @end itemize
 
+@node Commands and variables index
+@subsection Commands and variables index
+
+An index of all user-facing commands and custom variables is available here: @uref{mastodon-index.org, mastodon-index.org}.
+
 @node Alternative timeline layout
 @subsection Alternative timeline layout
 
diff --git a/test/mastodon-profile-tests.el b/test/mastodon-profile-tests.el
index 56cb852..1936b99 100644
--- a/test/mastodon-profile-tests.el
+++ b/test/mastodon-profile-tests.el
@@ -122,48 +122,48 @@ When formatting Gargon's state we want to see
 - the url of the avatar (yet to be loaded)
 - the info attached to the name"
   (with-mock
-    ;; Don't start any image loading:
-    (mock (mastodon-media--inline-images * *) => nil)
-    ;; Let's not do formatting as that makes it hard to not rely on
-    ;; window width and reflowing the text.
-    (mock (shr-render-region * *) => nil)
-    (if (version< emacs-version "27.1")
-        (mock (image-type-available-p 'imagemagick) => t)
-      (mock (image-transforms-p) => t))
+   ;; Don't start any image loading:
+   (mock (mastodon-media--inline-images * *) => nil)
+   ;; Let's not do formatting as that makes it hard to not rely on
+   ;; window width and reflowing the text.
+   (mock (shr-render-region * *) => nil)
+   (if (version< emacs-version "27.1")
+       (mock (image-type-available-p 'imagemagick) => t)
+     (mock (image-transforms-p) => t))
 
-    (with-temp-buffer
-      (let ((mastodon-tl--show-avatars t)
-            (mastodon-tl--display-media-p t))
-        (mastodon-profile--add-author-bylines (list gargron-profile-json)))
+   (with-temp-buffer
+     (let ((mastodon-tl--show-avatars t)
+           (mastodon-tl--display-media-p t))
+       (mastodon-profile--format-user (list gargron-profile-json)))
 
-      (should
-       (equal
-        (buffer-substring-no-properties (point-min) (point-max))
-        "\n  Eugen (@Gargron)\n<p>Developer of Mastodon and administrator of mastodon.social. I post service announcements, development updates, and personal stuff.</p>\n"))
+     (should
+      (equal
+       (buffer-substring-no-properties (point-min) (point-max))
+       "\n  Eugen (@Gargron)\n<p>Developer of Mastodon and administrator of mastodon.social. I post service announcements, development updates, and personal stuff.</p>\n"))
 
-      ;; Check the avatar at pos 2
-      (should
-       (equal
-        (get-text-property 2 'media-url)
-        "https://files.mastodon.social/accounts/avatars/000/000/001/original/d96d39a0abb45b92.jpg"))
-      (should
-       (equal
-        (get-text-property 2 'media-state)
-        'needs-loading))
+     ;; Check the avatar at pos 2
+     (should
+      (equal
+       (get-text-property 2 'media-url)
+       "https://files.mastodon.social/accounts/avatars/000/000/001/original/d96d39a0abb45b92.jpg"))
+     (should
+      (equal
+       (get-text-property 2 'media-state)
+       'needs-loading))
 
-      ;; Check the byline state
-      (should
-       (equal
-        (get-text-property 4 'byline)
-        t))
-      (should
-       (equal
-        (get-text-property 4 'toot-id)
-        (alist-get 'id gargron-profile-json)))
-      (should
-       (equal
-        (get-text-property 4 'toot-json)
-        gargron-profile-json)))))
+     ;; Check the byline state
+     (should
+      (equal
+       (get-text-property 4 'byline)
+       t))
+     (should
+      (equal
+       (get-text-property 4 'toot-id)
+       (alist-get 'id gargron-profile-json)))
+     (should
+      (equal
+       (get-text-property 4 'toot-json)
+       gargron-profile-json)))))
 
 (ert-deftest mastodon-profile--search-account-by-handle--removes-at ()
   "Should ignore a leading at-sign in user handle.