From 788577427993c97302d29ee8e6fbfc841f550138 Mon Sep 17 00:00:00 2001
From: "Nicolas P. Rougier" <Nicolas.Rougier@inria.fr>
Date: Sun, 20 Nov 2022 15:29:33 +0100
Subject: Added a user customizable symbol list

---
 lisp/mastodon-tl.el | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 86a7b56..0cdb421 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -106,6 +106,21 @@ width fonts when rendering HTML text"))
   :group 'mastodon-tl
   :type '(boolean :tag "Whether to display user avatars in timelines"))
 
+;; Various symbols using throughout timeline
+;; Default comes from nerd-font (www.nerdfonts.com)
+(defcustom mastodon-tl-symbols '((reply     . ("" . "R"))
+                                 (boost     . ("" . "B"))
+                                 (favourite . ("" . "F"))
+                                 (bookmark  . ("" . "K"))
+                                 (media     . ("" . "M"))
+                                 (verified  . ("" . "V"))
+                                 (private   . ("" . "P"))
+                                 (direct    . ("" . "D")))
+  "Set of symbols (or strings) to be used in timeline. If a symbol does not look right (tofu), it means your font settings do not support it."
+  :type '(alist :key-type symbol :value-type string)
+  :group 'mastodon-tl)
+
+
 (defvar-local mastodon-tl--update-point nil
   "When updating a mastodon buffer this is where new toots will be inserted.
 
@@ -200,6 +215,19 @@ types of mastodon links and not just shr.el-generated ones.")
   "The keymap to be set for the author byline.
 It is active where point is placed by `mastodon-tl--goto-next-toot.'")
 
+(defun mastodon-tl--symbol (name)
+  "Return the unicode symbol (as a string) corresponding to NAME.
+
+If symbol is not displayable, an ASCII equivalent is returned. If
+NAME is not part of the symbol table, '?' is returned."
+
+  (if-let* ((symbol (alist-get name mastodon-tl-symbols)))
+    (if (char-displayable-p (string-to-char (car symbol)))
+        (car symbol)
+      (cdr symbol))
+    "?"))
+
+
 (defun mastodon-tl--next-tab-item ()
   "Move to the next interesting item.
 
@@ -551,9 +579,7 @@ this just means displaying toot client."
          (faved (equal 't (mastodon-tl--field 'favourited toot)))
          (boosted (equal 't (mastodon-tl--field 'reblogged toot)))
          (bookmarked (equal 't (mastodon-tl--field 'bookmarked toot)))
-         (bookmark-str (if (fontp (char-displayable-p #10r128278))
-                           "🔖"
-                         "K"))
+         (bookmark-str (mastodon-tl--symbol 'bookmark))
          (visibility (mastodon-tl--field 'visibility toot)))
     (concat
      ;; Boosted/favourited markers are not technically part of the byline, so
@@ -575,13 +601,9 @@ this just means displaying toot client."
        ;; in `mastodon-tl--byline-author'
        (funcall author-byline toot)
        (cond ((equal visibility "direct")
-              (if (fontp (char-displayable-p #10r9993))
-                  " ✉"
-                " [direct]"))
+              (mastodon-tl--symbol 'direct))
              ((equal visibility "private")
-              (if (fontp (char-displayable-p #10r128274))
-                  " 🔒"
-                " [followers]")))
+              (mastodon-tl--symbol 'private))
        (funcall action-byline toot)
        " "
        ;; TODO: Once we have a view for toot (responses etc.) make
-- 
cgit v1.2.3


From 25bb8619e215bdc8715aeb3f53724ad1f9af35b1 Mon Sep 17 00:00:00 2001
From: "Nicolas P. Rougier" <Nicolas.Rougier@inria.fr>
Date: Sun, 20 Nov 2022 15:59:49 +0100
Subject: Fix a missing parenthesis & added links to default icons

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

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 0cdb421..1a26a54 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -108,14 +108,23 @@ width fonts when rendering HTML text"))
 
 ;; Various symbols using throughout timeline
 ;; Default comes from nerd-font (www.nerdfonts.com)
-(defcustom mastodon-tl-symbols '((reply     . ("" . "R"))
-                                 (boost     . ("" . "B"))
-                                 (favourite . ("" . "F"))
-                                 (bookmark  . ("" . "K"))
-                                 (media     . ("" . "M"))
-                                 (verified  . ("" . "V"))
-                                 (private   . ("" . "P"))
-                                 (direct    . ("" . "D")))
+(defcustom mastodon-tl-symbols
+  '(;; See https://icon-sets.iconify.design/octicon/comment-24/
+    (reply     . ("" . "R"))
+    ;; See https://icon-sets.iconify.design/octicon/reply-24/
+    (boost     . ("" . "B"))
+    ;; See https://icon-sets.iconify.design/octicon/star-fill-24/
+    (favourite . ("" . "F"))
+    ;; See https://icon-sets.iconify.design/octicon/bookmark-24/
+    (bookmark  . ("" . "K"))
+    ;; See https://icon-sets.iconify.design/octicon/file-media-24/
+    (media     . ("" . "M"))
+    ;; See https://icon-sets.iconify.design/octicon/verified-24/
+    (verified  . ("" . "V"))
+    ;; See https://icon-sets.iconify.design/octicon/person-fill-24/
+    (private   . ("" . "P"))
+    ;; See https://icon-sets.iconify.design/octicon/location-24/
+    (direct    . ("" . "D")))
   "Set of symbols (or strings) to be used in timeline. If a symbol does not look right (tofu), it means your font settings do not support it."
   :type '(alist :key-type symbol :value-type string)
   :group 'mastodon-tl)
@@ -603,7 +612,7 @@ this just means displaying toot client."
        (cond ((equal visibility "direct")
               (mastodon-tl--symbol 'direct))
              ((equal visibility "private")
-              (mastodon-tl--symbol 'private))
+              (mastodon-tl--symbol 'private)))
        (funcall action-byline toot)
        " "
        ;; TODO: Once we have a view for toot (responses etc.) make
-- 
cgit v1.2.3


From c19cd695b3f40a9de508e066989cb23438c9c7f7 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 11:46:20 +0100
Subject: make mastodon-notifications-get a global function

so we can view notifs without first openin other masto buffers

- move it to mastodon.el
- autoload cookie
- rename all instances
- pray the keymap works
---
 README.org                           |  5 ++++-
 lisp/mastodon-discover.el            |  2 +-
 lisp/mastodon-notifications.el       | 34 ++++++++--------------------------
 lisp/mastodon-tl.el                  |  4 ++--
 lisp/mastodon.el                     | 26 ++++++++++++++++++++++++--
 test/mastodon-notifications-tests.el |  2 +-
 6 files changed, 40 insertions(+), 33 deletions(-)

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

diff --git a/README.org b/README.org
index 97e2f4f..8eb9242 100644
--- a/README.org
+++ b/README.org
@@ -222,7 +222,10 @@ You can download and use your instance's custom emoji
 
 *** Other commands and account settings:
 
-- =mastodon-url-lookup=: Attempt to load URL in =mastodon.el=. URL may be the one at point or provided in the minibuffer. Should also work if =mastodon.el= is not yet loaded.
+In addition to =mastodon=, the following functions are autoloaded and should work without first loading =mastodon.el=:
+- =mastodon-toot=: Compose new toot
+- =mastodon-notifications-get=: View all notifications
+- =mastodon-url-lookup=: Attempt to load a URL in =mastodon.el=. URL may be at point or provided in the minibuffer.
 
 
 - =mastodon-tl--view-instance-description=: View information about the instance that the author of the toot at point is on.
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 5d1a86e..dc8a924 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -76,7 +76,7 @@
                        ("F" "Federated" mastodon-tl--get-federated-timeline)
                        ("H" "Home" mastodon-tl--get-home-timeline)
                        ("L" "Local" mastodon-tl--get-local-timeline)
-                       ("N" "Notifications" mastodon-notifications--get)
+                       ("N" "Notifications" mastodon-notifications-get)
                        ("u" "Update timeline" mastodon-tl--update)
                        ("S" "Search" mastodon-search--search-query)
                        ("O" "Jump to your profile" mastodon-profile--my-profile)
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index ae82b60..a11513e 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -51,6 +51,7 @@
 (autoload 'mastodon-profile--view-follow-requests "mastodon-profile.el")
 (autoload 'mastodon-tl--reload-timeline-or-profile "mastodon-tl")
 (autoload 'mastodon-tl--update "mastodon-tl")
+(autoload 'mastodon-notifications-get "mastodon")
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--display-media-p)
 (defvar mastodon-mode-map)
@@ -83,7 +84,7 @@
     (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") #'mastodon-notifications--clear-current)
-    (define-key map (kbd "g") #'mastodon-notifications--get)
+    (define-key map (kbd "g") #'mastodon-notifications-get)
     (keymap-canonicalize map))
   "Keymap for viewing notifications.")
 
@@ -125,7 +126,7 @@ follow-requests view."
                                          (lambda ()
                                            (if f-reqs-view-p
                                                (mastodon-profile--view-follow-requests)
-                                             (mastodon-notifications--get))
+                                             (mastodon-notifications-get))
                                            (message "Follow request of %s (@%s) %s!"
                                                     name handle (if reject
                                                                     "rejected"
@@ -277,51 +278,32 @@ of the toot responded to."
     (mapc #'mastodon-notifications--by-type json)
     (goto-char (point-min))))
 
-;;;###autoload
-(defun mastodon-notifications--get (&optional type buffer-name)
-  "Display NOTIFICATIONS in buffer.
-Optionally only print notifications of type TYPE, a string.
-BUFFER-NAME is added to \"*mastodon-\" to create the buffer name."
-  (interactive)
-  (let ((buffer (or (concat "*mastodon-" buffer-name "*")
-                    "*mastodon-notifications*")))
-    (if (get-buffer buffer)
-        (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)
-      (use-local-map mastodon-notifications--map))))
-
 (defun mastodon-notifications--get-mentions ()
   "Display mention notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "mention" "mentions"))
+  (mastodon-notifications-get "mention" "mentions"))
 
 (defun mastodon-notifications--get-favourites ()
   "Display favourite notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "favourite" "favourites"))
+  (mastodon-notifications-get "favourite" "favourites"))
 
 (defun mastodon-notifications--get-boosts ()
   "Display boost notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "reblog" "boosts"))
+  (mastodon-notifications-get "reblog" "boosts"))
 
 (defun mastodon-notifications--get-polls ()
   "Display poll notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "poll" "polls"))
+  (mastodon-notifications-get "poll" "polls"))
 
 (defun mastodon-notifications--get-statuses ()
   "Display status notifications in buffer.
 Status notifications are created when you call
 `mastodon-tl--enable-notify-user-posts'."
   (interactive)
-  (mastodon-notifications--get "status" "statuses"))
+  (mastodon-notifications-get "status" "statuses"))
 
 (defun mastodon-notifications--filter-types-list (type)
   "Return a list of notification types with TYPE removed."
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 34048e7..aa58771 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -61,7 +61,7 @@
 (autoload 'mastodon-profile--lookup-account-in-status "mastodon-profile")
 (autoload 'mastodon-profile-mode "mastodon-profile")
 ;; make notifications--get available via M-x and outside our keymap:
-(autoload 'mastodon-notifications--get "mastodon-notifications"
+(autoload 'mastodon-notifications-get "mastodon-notifications"
   "Display NOTIFICATIONS in buffer." t) ; interactive
 (autoload 'mastodon-search--propertize-user "mastodon-search")
 (autoload 'mastodon-search--insert-users-propertized "mastodon-search")
@@ -2238,7 +2238,7 @@ For use after e.g. deleting a toot."
         ((equal (mastodon-tl--get-endpoint) "timelines/public?local=true")
          (mastodon-tl--get-local-timeline))
         ((equal (mastodon-tl--get-endpoint) "notifications")
-         (mastodon-notifications--get))
+         (mastodon-notifications-get))
         ((equal (mastodon-tl--buffer-name)
                 (concat "*mastodon-" (mastodon-auth--get-account-name) "-statuses*"))
          (mastodon-profile--my-profile))
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 5be168c..527de18 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -57,7 +57,6 @@
 (autoload 'mastodon-tl--thread "mastodon-tl")
 (autoload 'mastodon-tl--toggle-spoiler-text-in-toot "mastodon-tl")
 (autoload 'mastodon-tl--update "mastodon-tl")
-(autoload 'mastodon-notifications--get "mastodon-notifications")
 (autoload 'mastodon-profile--get-toot-author "mastodon-profile")
 (autoload 'mastodon-profile--make-author-buffer "mastodon-profile")
 (autoload 'mastodon-profile--show-user "mastodon-profile")
@@ -96,6 +95,10 @@
 (autoload 'mastodon-tl--view-lists "mastodon-tl")
 (autoload 'mastodon-toot--edit-toot-at-point "mastodon-toot")
 (autoload 'mastodon-toot--view-toot-history "mastodon-tl")
+(autoload 'mastodon-tl--init-sync "mastodon-tl")
+(autoload 'mastodon-notifications--timeline "mastodon-notifications")
+
+(defvar mastodon-notifications--map)
 
 (defgroup mastodon nil
   "Interface with Mastodon."
@@ -160,7 +163,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "F") #'mastodon-tl--get-federated-timeline)
     (define-key map (kbd "H") #'mastodon-tl--get-home-timeline)
     (define-key map (kbd "L") #'mastodon-tl--get-local-timeline)
-    (define-key map (kbd "N") #'mastodon-notifications--get)
+    (define-key map (kbd "N") #'mastodon-notifications-get)
     (define-key map (kbd "P") #'mastodon-profile--show-user)
     (define-key map (kbd "T") #'mastodon-tl--thread)
     ;; navigation out of mastodon
@@ -267,6 +270,25 @@ If REPLY-JSON is the json of the toot being replied to."
   (interactive)
   (mastodon-toot--compose-buffer user reply-to-id reply-json))
 
+;;;###autoload
+(defun mastodon-notifications-get (&optional type buffer-name)
+  "Display NOTIFICATIONS in buffer.
+Optionally only print notifications of type TYPE, a string.
+BUFFER-NAME is added to \"*mastodon-\" to create the buffer name."
+  (interactive)
+  (let ((buffer (or (concat "*mastodon-" buffer-name "*")
+                    "*mastodon-notifications*")))
+    (if (get-buffer buffer)
+        (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)
+      (use-local-map mastodon-notifications--map))))
+
 ;; URL lookup: should be available even if `mastodon.el' not loaded:
 
 ;;;###autoload
diff --git a/test/mastodon-notifications-tests.el b/test/mastodon-notifications-tests.el
index bc70e49..1275c72 100644
--- a/test/mastodon-notifications-tests.el
+++ b/test/mastodon-notifications-tests.el
@@ -191,7 +191,7 @@
      (mock (mastodon-profile--fetch-server-account-settings)
            => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
 
-     (mastodon-notifications--get))))
+     (mastodon-notifications-get))))
 
 (defun mastodon-notifications--test-type (fun sample)
   "Test notification draw functions.
-- 
cgit v1.2.3


From bf7cc6fd0cde8b3caba850bad7c9b217bef481a7 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 17:49:12 +0100
Subject: hack separator and propertizing for lists

properties mean that the list-at-point functions also work on
accounts/whitespace within the particular list.
---
 lisp/mastodon-tl.el | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 34048e7..b1cbce1 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1594,7 +1594,9 @@ If ID is provided, delete that list."
 \n E - edit a list\n n/p - go to next/prev item]\n\n"
              'font-lock-comment-face))
     (mapc (lambda (x)
-            (mastodon-tl--print-list-accounts x))
+            (mastodon-tl--print-list-accounts x)
+            (insert (propertize " ------------\n\n"
+                                'face 'success)))
           lists-names)
     (goto-char (point-min))))
 ;; (mastodon-tl--goto-next-item))) ; causes another request!
@@ -1609,8 +1611,17 @@ If ID is provided, delete that list."
                  'toot-id "0" ; so we nav here
                  'help-echo "RET: view list timeline, d: delete this list, \
 a: add account to this list, r: remove account from this list"
-                 'face 'link) ; '((:underline t :inherit success)))
-     "\n\n"
+                 'list t
+                 'face 'link
+                 'keymap mastodon-tl--list-name-keymap
+                 'list-name list-name
+                 'list-id id)
+     (propertize
+      "\n\n"
+      'list t
+      'keymap mastodon-tl--list-name-keymap
+      'list-name list-name
+      'list-id id)
      (propertize
       (mapconcat #'mastodon-search--propertize-user accounts
                  " ")
-- 
cgit v1.2.3


From 9b9431b130c1d8d1a03e445ae1f7803d2a511d70 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 22:01:07 +0100
Subject: params always in http.el, only ever send alists from elsewhere.

probably incomplete but mostly done.
---
 lisp/mastodon-http.el                | 85 +++++++++++++++++++++---------------
 lisp/mastodon-profile.el             | 28 ++++++------
 lisp/mastodon-search.el              |  4 +-
 lisp/mastodon-tl.el                  | 51 ++++++++--------------
 lisp/mastodon-toot.el                |  2 +-
 lisp/mastodon.el                     |  2 +-
 test/mastodon-notifications-tests.el |  8 ++--
 7 files changed, 91 insertions(+), 89 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 37770ef..259432e 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -151,27 +151,34 @@ Authorization header is included by default unless UNAUTHENTICATED-P is non-nil.
        (mastodon-http--url-retrieve-synchronously url)))
    unauthenticated-p))
 
-(defun mastodon-http--get (url &optional silent)
+(defun mastodon-http--get (url &optional params silent)
   "Make synchronous GET request to URL.
-Pass response buffer to CALLBACK function.
+PARAMS is an alist of any extra parameters to send with the request.
 SILENT means don't message."
   (mastodon-http--authorized-request
    "GET"
-   (mastodon-http--url-retrieve-synchronously url silent)))
+   ;; url-request-data doesn't seem to work with GET requests:
+   (let ((url (if params
+                  (concat url "?"
+                          (mastodon-http--build-query-string params))
+                url)))
+     (mastodon-http--url-retrieve-synchronously url silent))))
 
-(defun mastodon-http--get-response (url &optional no-headers silent vector)
+(defun mastodon-http--get-response (url &optional params no-headers silent vector)
   "Make synchronous GET request to URL. Return JSON and response headers.
+PARAMS is an alist of any extra parameters to send with the request.
 SILENT means don't message.
 NO-HEADERS means don't collect http response headers.
 VECTOR means return json arrays as vectors."
-  (with-current-buffer (mastodon-http--get url silent)
+  (with-current-buffer (mastodon-http--get url params silent)
     (mastodon-http--process-response no-headers vector)))
 
-(defun mastodon-http--get-json (url &optional silent vector)
+(defun mastodon-http--get-json (url &optional params silent vector)
   "Return only JSON data from URL request.
+PARAMS is an alist of any extra parameters to send with the request.
 SILENT means don't message.
 VECTOR means return json arrays as vectors."
-  (car (mastodon-http--get-response url :no-headers silent vector)))
+  (car (mastodon-http--get-response url params :no-headers silent vector)))
 
 (defun mastodon-http--process-json ()
   "Return only JSON data from async URL request.
@@ -214,35 +221,37 @@ Callback to `mastodon-http--get-response-async', usually
                 (cons (car list) (cadr list))))
             head-list)))
 
-(defun mastodon-http--delete (url &optional args)
-  "Make DELETE request to URL."
-  (let ((url-request-data
-         (when args
-           (mastodon-http--build-query-string args))))
+(defun mastodon-http--delete (url &optional params)
+  "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-query-string params))
+           url)))
     (mastodon-http--authorized-request
      "DELETE"
      (with-temp-buffer
        (mastodon-http--url-retrieve-synchronously url)))))
 
-(defun mastodon-http--put (url &optional args headers)
-  "Make PUT request to 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."
   (mastodon-http--authorized-request
    "PUT"
    (let ((url-request-data
-          (when args
-            (mastodon-http--build-query-string args)))
+          (when args (mastodon-http--build-query-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)))))
+     (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)))
@@ -259,24 +268,25 @@ PARAMS should be an alist as required by `url-build-query-string'."
     (kill-buffer)
     (json-read-from-string json-string)))
 
-(defun mastodon-http--get-search-json (url query &optional param silent)
+(defun mastodon-http--get-search-json (url query &optional params silent)
   "Make GET request to URL, searching for QUERY and return JSON response.
-PARAM is any extra parameters to send with the request.
+PARAMS is an alist of any extra parameters to send with the request.
 SILENT means don't message."
-  (let ((buffer (mastodon-http--get-search url query param silent)))
+  (let ((buffer (mastodon-http--get-search url query params silent)))
     (with-current-buffer buffer
       (mastodon-http--process-json-search))))
 
-(defun mastodon-http--get-search (base-url query &optional param silent)
+(defun mastodon-http--get-search (base-url query &optional params silent)
   "Make GET request to BASE-URL, searching for QUERY.
 Pass response buffer to CALLBACK function.
-PARAM is a formatted request parameter, eg 'following=true'.
+PARAMS is an alist of any extra parameters to send with the request.
 SILENT means don't message."
   (mastodon-http--authorized-request
    "GET"
-   (let ((url (if param
-                  (concat base-url "?" param "&q=" (url-hexify-string query))
-                (concat base-url "?q=" (url-hexify-string query)))))
+   (let* ((query-str (mastodon-http--build-query-string
+                      `(("q" . ,(url-hexify-string query)))))
+          (params-str (mastodon-http--build-query-string params))
+          (url (concat base-url "?" query-str params-str)))
      (mastodon-http--url-retrieve-synchronously url silent))))
 
 ;; profile update functions
@@ -299,12 +309,17 @@ Optionally specify the PARAMS to send."
 
  ;; Asynchronous functions
 
-(defun mastodon-http--get-async (url &optional callback &rest cbargs)
+(defun mastodon-http--get-async (url &optional params callback &rest cbargs)
   "Make GET request to URL.
-Pass response buffer to CALLBACK function with args CBARGS."
-  (mastodon-http--authorized-request
-   "GET"
-   (url-retrieve url callback cbargs)))
+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-query-string params))
+               url)))
+    (mastodon-http--authorized-request
+     "GET"
+     (url-retrieve url callback cbargs))))
 
 (defun mastodon-http--get-response-async (url callback &rest args)
   "Make GET request to URL. Call CALLBACK with http response and ARGS."
@@ -314,9 +329,11 @@ Pass response buffer to CALLBACK function with args CBARGS."
      (when status ;; only when we actually get sth?
        (apply callback (mastodon-http--process-response) args)))))
 
-(defun mastodon-http--get-json-async (url callback &rest args)
-  "Make GET request to URL. Call CALLBACK with json-list and ARGS."
+(defun mastodon-http--get-json-async (url &optional params callback &rest args)
+  "Make GET request to URL. Call CALLBACK with json-list and ARGS.
+PARAMS is an alist of any extra parameters to send with the request."
   (mastodon-http--get-async
+   params
    url
    (lambda (status)
      (when status ;; only when we actually get sth?
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 512aae4..975f7b7 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -36,6 +36,7 @@
 (require 'seq)
 (require 'cl-lib)
 (require 'persist)
+(require 'ts)
 
 (autoload 'mastodon-http--api "mastodon-http.el")
 (autoload 'mastodon-http--get-json "mastodon-http.el")
@@ -492,11 +493,10 @@ This endpoint only holds a few preferences. For others, see
 (defun mastodon-profile--relationships-get (id)
   "Fetch info about logged-in user's relationship to user with id ID."
   (let* ((their-id id)
-         (url (mastodon-http--api (format
-                                   "accounts/relationships?id[]=%s"
-                                   their-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))))
+    (car (mastodon-http--get-json url args))))
 
 (defun mastodon-profile--fields-get (&optional account fields)
   "Fetch the fields vector (aka profile metadata) from profile of ACCOUNT.
@@ -527,8 +527,9 @@ 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))
-         (url (mastodon-http--api (format "accounts/%s/statuses?pinned=true" id))))
-    (mastodon-http--get-json url)))
+         (args `(("pinned" . "true")))
+         (url (mastodon-http--api (format "accounts/%s/statuses" id))))
+    (mastodon-http--get-json url args)))
 
 (defun mastodon-profile--insert-statuses-pinned (pinned-statuses)
   "Insert each of the PINNED-STATUSES for a given account."
@@ -538,18 +539,17 @@ FIELDS means provide a fields vector fetched by other means."
           (mastodon-tl--toot pinned-status))
         pinned-statuses))
 
-(defun mastodon-profile--make-profile-buffer-for (account endpoint-type update-function &optional no-reblogs)
+(defun mastodon-profile--make-profile-buffer-for (account endpoint-type
+                                                          update-function
+                                                          &optional no-reblogs)
   "Display profile of ACCOUNT, using ENDPOINT-TYPE and UPDATE-FUNCTION."
   (let* ((id (mastodon-profile--account-field account 'id))
          (args (when no-reblogs '(("exclude_reblogs" . "t"))))
-         (base-url (mastodon-http--api (format "accounts/%s/%s" id endpoint-type)))
-         (url (if no-reblogs
-                  (concat base-url "?" (mastodon-http--build-query-string args))
-                base-url))
+         (url (mastodon-http--api (format "accounts/%s/%s" id endpoint-type)))
          (acct (mastodon-profile--account-field account 'acct))
          (buffer (concat "*mastodon-" acct "-" endpoint-type  "*"))
          (note (mastodon-profile--account-field account 'note))
-         (json (mastodon-http--get-json url))
+         (json (mastodon-http--get-json url args))
          (locked (mastodon-profile--account-field account 'locked))
          (followers-count (mastodon-tl--as-string
                            (mastodon-profile--account-field
@@ -751,12 +751,14 @@ If the handle does not match a search return then retun NIL."
   (let* ((handle (if (string= "@" (substring handle 0 1))
                      (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 (format "accounts/search?q=%s" handle))))))
+            (mastodon-http--api "accounts/search")
+            args))))
     (when (equal 1 (length matching-account))
       (elt matching-account 0))))
 
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 31fcae3..fee79c4 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -61,7 +61,7 @@ Returns a nested list containing user handle, display name, and URL."
   (interactive "sSearch mastodon for: ")
   (let* ((url (mastodon-http--api "accounts/search"))
          (response (if (equal mastodon-toot--completion-style-for-mentions "following")
-                       (mastodon-http--get-search-json url query "following=true")
+                       (mastodon-http--get-search-json url query '(("following" . "true")))
                      (mastodon-http--get-search-json url query))))
     (mapcar #'mastodon-search--get-user-info-@ response)))
 
@@ -72,7 +72,7 @@ Returns a nested list containing user handle, display name, and URL."
 QUERY is the string to search."
   (interactive "sSearch for hashtag: ")
   (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
-         (type-param (concat "type=hashtags"))
+         (type-param '(("type" . "hashtags")))
          (response (mastodon-http--get-search-json url query type-param))
          (tags (alist-get 'hashtags response)))
     (mapcar #'mastodon-search--get-hashtag-info tags)))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b1cbce1..fd74ed5 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -77,6 +77,7 @@
 (autoload 'mastodon-http--build-array-args-alist "mastodon-http")
 (autoload 'mastodon-http--build-query-string "mastodon-http")
 (autoload 'mastodon-notifications--filter-types-list "mastodon-notifications")
+(autoload 'mastodon-toot--get-toot-edits "mastodon-toot")
 
 (when (require 'mpv nil :no-error)
   (declare-function mpv-start "mpv"))
@@ -1305,38 +1306,23 @@ LINK-HEADER is the http Link header if present."
 
 (defun mastodon-tl--more-json (endpoint id)
   "Return JSON for timeline ENDPOINT before ID."
-  (let* ((url (mastodon-http--api (concat
-                                   endpoint
-                                   (if (string-match-p "?" endpoint)
-                                       "&"
-                                     "?")
-                                   "max_id="
-                                   (mastodon-tl--as-string id)))))
-    (mastodon-http--get-json url)))
+  (let* ((args `(("max_id" . ,(mastodon-tl--as-string id))))
+         (url (mastodon-http--api endpoint)))
+    (mastodon-http--get-json url args)))
 
 (defun mastodon-tl--more-json-async (endpoint id callback &rest cbargs)
   "Return JSON for timeline ENDPOINT before ID.
 Then run CALLBACK with arguments CBARGS."
-  (let* ((url (mastodon-http--api (concat
-                                   endpoint
-                                   (if (string-match-p "?" endpoint)
-                                       "&"
-                                     "?")
-                                   "max_id="
-                                   (mastodon-tl--as-string id)))))
-    (apply 'mastodon-http--get-json-async url callback cbargs)))
+  (let* ((args `(("max_id" . ,(mastodon-tl--as-string id))))
+         (url (mastodon-http--api endpoint)))
+    (apply 'mastodon-http--get-json-async url params callback cbargs)))
 
 ;; TODO
 ;; Look into the JSON returned here by Local
 (defun mastodon-tl--updated-json (endpoint id)
   "Return JSON for timeline ENDPOINT since ID."
-  (let ((url (mastodon-http--api (concat
-                                  endpoint
-                                  (if (string-match-p "?" endpoint)
-                                      "&"
-                                    "?")
-                                  "since_id="
-                                  (mastodon-tl--as-string id)))))
+  (let* ((args `(("since_id" . ,(mastodon-tl--as-string id))))
+         (url (mastodon-http--api endpoint)))
     (mastodon-http--get-json url)))
 
 (defun mastodon-tl--property (prop &optional backward)
@@ -1417,8 +1403,9 @@ ID is that of the toot to view."
               ;; refetch current toot in case we just faved/boosted:
               (mastodon-http--get-json
                (mastodon-http--api (concat "statuses/" id))
+               nil
                :silent))
-             (context (mastodon-http--get-json url :silent))
+             (context (mastodon-http--get-json url nil :silent))
              (marker (make-marker)))
         (if (equal (caar toot) 'error)
             (message "Error: %s" (cdar toot))
@@ -1690,13 +1677,9 @@ If ID is provided, use that list."
          (account (completing-read "Account to remove: "
                                    handles nil t))
          (account-id (alist-get account handles nil nil 'equal))
-         ;; letting --delete handle the params doesn't work
-         ;; so we do it here for now:
-         (base-url (mastodon-http--api (format "lists/%s/accounts" list-id)))
+         (url (mastodon-http--api (format "lists/%s/accounts" list-id)))
          (args (mastodon-http--build-array-args-alist "account_ids[]" `(,account-id)))
-         (query-str (mastodon-http--build-query-string args))
-         (url (concat base-url "?" query-str))
-         (response (mastodon-http--delete url)))
+         (response (mastodon-http--delete url args)))
     (mastodon-tl--list-action-triage
      response
      (message "%s removed from list %s!" account list-name))))
@@ -2535,14 +2518,14 @@ 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-args-alist
                                 "exclude_types[]" exclude-types)))
-         (query-string (when note-type
-                         (mastodon-http--build-query-string args)))
+         ;; (query-string (when note-type
+         ;; (mastodon-http--build-query-string args)))
          ;; add note-type exclusions to endpoint so it works in `mastodon-tl--buffer-spec'
          ;; that way `mastodon-tl--more' works seamlessly too:
-         (endpoint (if note-type (concat endpoint "?" query-string) endpoint))
+         ;; (endpoint (if note-type (concat endpoint "?" query-string) endpoint))
          (url (mastodon-http--api endpoint))
          (buffer (concat "*mastodon-" buffer-name "*"))
-         (json (mastodon-http--get-json url)))
+         (json (mastodon-http--get-json url args)))
     (with-output-to-temp-buffer buffer
       (switch-to-buffer buffer)
       ;; mastodon-mode wipes buffer-spec, so order must unforch be:
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 5a735dc..24c6c75 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -728,7 +728,7 @@ instance to edit a toot."
 (defun mastodon-toot--get-toot-source (id)
   "Fetch the source JSON of toot with ID."
   (let ((url (mastodon-http--api (format "/statuses/%s/source" id))))
-    (mastodon-http--get-json url :silent)))
+    (mastodon-http--get-json url nil :silent)))
 
 (defun mastodon-toot--get-toot-edits (id)
   "Return the edit history of toot with ID."
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index d8591e1..cfe6681 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -291,7 +291,7 @@ not, just browse the URL in the normal fashion."
         (browse-url query)
       (message "Performing lookup...")
       (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
-             (param (concat "resolve=t")) ; webfinger
+             (param '(("resolve" . "t"))) ; webfinger
              (response (mastodon-http--get-search-json url query param :silent)))
         (cond ((not (seq-empty-p
                      (alist-get 'statuses response)))
diff --git a/test/mastodon-notifications-tests.el b/test/mastodon-notifications-tests.el
index bc70e49..18fc757 100644
--- a/test/mastodon-notifications-tests.el
+++ b/test/mastodon-notifications-tests.el
@@ -187,11 +187,11 @@
   "Ensure get request format for notifictions is accurate."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-     (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications"))
-     (mock (mastodon-profile--fetch-server-account-settings)
-           => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" nil))
+      (mock (mastodon-profile--fetch-server-account-settings)
+            => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
 
-     (mastodon-notifications--get))))
+      (mastodon-notifications--get))))
 
 (defun mastodon-notifications--test-type (fun sample)
   "Test notification draw functions.
-- 
cgit v1.2.3


From 8b45a7a83de0747029b6cd1d1cf7628afef0ad6c Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 23:33:28 +0100
Subject: fix some tests due to params

---
 lisp/mastodon-http.el          |  2 +-
 lisp/mastodon-tl.el            |  9 ++++-----
 lisp/mastodon-toot.el          |  1 +
 test/mastodon-profile-tests.el | 11 ++++++++---
 test/mastodon-tl-tests.el      | 45 ++++++++++++++++++++++--------------------
 5 files changed, 38 insertions(+), 30 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 259432e..d56f3ad 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -333,8 +333,8 @@ PARAMS is an alist of any extra parameters to send with the request."
   "Make GET request to URL. Call CALLBACK with json-list and ARGS.
 PARAMS is an alist of any extra parameters to send with the request."
   (mastodon-http--get-async
-   params
    url
+   params
    (lambda (status)
      (when status ;; only when we actually get sth?
        (apply callback (mastodon-http--process-json) args)))))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index fd74ed5..d0c2b0b 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1315,7 +1315,7 @@ LINK-HEADER is the http Link header if present."
 Then run CALLBACK with arguments CBARGS."
   (let* ((args `(("max_id" . ,(mastodon-tl--as-string id))))
          (url (mastodon-http--api endpoint)))
-    (apply 'mastodon-http--get-json-async url params callback cbargs)))
+    (apply 'mastodon-http--get-json-async url args callback cbargs)))
 
 ;; TODO
 ;; Look into the JSON returned here by Local
@@ -1323,7 +1323,7 @@ Then run CALLBACK with arguments CBARGS."
   "Return JSON for timeline ENDPOINT since ID."
   (let* ((args `(("since_id" . ,(mastodon-tl--as-string id))))
          (url (mastodon-http--api endpoint)))
-    (mastodon-http--get-json url)))
+    (mastodon-http--get-json url args)))
 
 (defun mastodon-tl--property (prop &optional backward)
   "Get property PROP for toot at point.
@@ -1873,8 +1873,7 @@ INSTANCE is an instance domain name."
           (response (mastodon-http--get-json
                      (if user
                          (mastodon-http--api "instance")
-                       (concat instance
-                               "/api/v1/instance"))
+                       (concat instance "/api/v1/instance"))
                      nil
                      :vector)))
      (when response
@@ -2462,7 +2461,7 @@ favourites."
         (mastodon-http--get-response-async
          url 'mastodon-tl--init* buffer endpoint update-function headers)
       (mastodon-http--get-json-async
-       url 'mastodon-tl--init* buffer endpoint update-function))))
+       url nil 'mastodon-tl--init* buffer endpoint update-function))))
 
 (defun mastodon-tl--init* (response buffer endpoint update-function &optional headers)
   "Initialize BUFFER with timeline targeted by ENDPOINT.
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 24c6c75..8ac75f9 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -227,6 +227,7 @@ send.")
 NO-TOOT means we are not calling from a toot buffer."
   (mastodon-http--get-json-async
    (mastodon-http--api "instance")
+   nil
    'mastodon-toot--get-max-toot-chars-callback no-toot))
 
 (defun mastodon-toot--get-max-toot-chars-callback (json-response
diff --git a/test/mastodon-profile-tests.el b/test/mastodon-profile-tests.el
index 3e238f1..f65661e 100644
--- a/test/mastodon-profile-tests.el
+++ b/test/mastodon-profile-tests.el
@@ -172,7 +172,8 @@ The search will happen as if called without the \"@\"."
   (with-mock
 
     (mock (mastodon-http--get-json
-           "https://instance.url/api/v1/accounts/search?q=gargron"))
+           "https://instance.url/api/v1/accounts/search"
+           '(("q" . "gargron"))))
 
     (let ((mastodon-instance-url "https://instance.url"))
       ;; We don't check anything from the return value. We only care
@@ -182,7 +183,9 @@ The search will happen as if called without the \"@\"."
 (ert-deftest mastodon-profile--search-account-by-handle--filters-out-false-results ()
   "Should ignore results that don't match the searched handle."
   (with-mock
-    (mock (mastodon-http--get-json *)
+    (mock (mastodon-http--get-json
+           "https://instance.url/api/v1/accounts/search"
+           '(("q" . "Gargron")))
           =>
           (vector ccc-profile-json gargron-profile-json))
 
@@ -197,7 +200,9 @@ The search will happen as if called without the \"@\"."
 
 TODO: We need to decide if this is actually desired or not."
   (with-mock
-    (mock (mastodon-http--get-json *) => (vector gargron-profile-json))
+    (mock (mastodon-http--get-json *
+                                   '(("q" . "gargron")))
+          => (vector gargron-profile-json))
 
     (let ((mastodon-instance-url "https://instance.url"))
       (should
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 19934dd..0ac5caf 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -175,27 +175,30 @@ Strict-Transport-Security: max-age=31536000
   "Should request toots older than max_id."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
-      (mastodon-tl--more-json "timelines/foo" 12345))))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo"
+                                     '(("max_id" . "12345"))))
+      (mastodon-tl--more-json "timelines/foo" "12345"))))
 
 (ert-deftest mastodon-tl--more-json-id-string ()
   "Should request toots older than max_id.
 
-`mastodon-tl--more-json' should accept and id that is either
-a string or a numeric."
+  `mastodon-tl--more-json' should accept and id that is either
+  a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo"
+                                     '(("max_id" . "12345"))))
       (mastodon-tl--more-json "timelines/foo" "12345"))))
 
 (ert-deftest mastodon-tl--update-json-id-string ()
   "Should request toots more recent than since_id.
 
-`mastodon-tl--updated-json' should accept and id that is either
-a string or a numeric."
+  `mastodon-tl--updated-json' should accept and id that is either
+  a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo"
+                                     '(("since_id" . "12345"))))
       (mastodon-tl--updated-json "timelines/foo" "12345"))))
 
 (ert-deftest mastodon-tl--relative-time-description ()
@@ -314,7 +317,7 @@ a string or a numeric."
 			              byline)
 			             "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
-"))
+  "))
         (should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
                     'user-handle))
         (should (string= (get-text-property handle-location 'mastodon-handle byline)
@@ -337,7 +340,7 @@ a string or a numeric."
                                              'mastodon-tl--byline-boosted))
                        "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
-")))))
+  ")))))
 
 (ert-deftest mastodon-tl--byline-boosted ()
   "Should format the boosted toot correctly."
@@ -354,7 +357,7 @@ a string or a numeric."
                                              'mastodon-tl--byline-boosted))
                        "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
-")))))
+  ")))))
 
 (ert-deftest mastodon-tl--byline-favorited ()
   "Should format the favourited toot correctly."
@@ -371,7 +374,7 @@ a string or a numeric."
                                              'mastodon-tl--byline-boosted))
                        "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
-")))))
+  ")))))
 
 
 (ert-deftest mastodon-tl--byline-boosted/favorited ()
@@ -389,7 +392,7 @@ a string or a numeric."
                                              'mastodon-tl--byline-boosted))
                        "(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
-")))))
+  ")))))
 
 (ert-deftest mastodon-tl--byline-reblogged ()
   "Should format the reblogged toot correctly."
@@ -413,9 +416,9 @@ a string or a numeric."
 	        (handle2-location 65))
         (should (string= (substring-no-properties byline)
 			             "Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+  Boosted Account 43 (@acct43@example.space) original time
   ------------
-"))
+  "))
         (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
                     'user-handle))
         (should (equal (get-text-property handle1-location 'help-echo byline)
@@ -446,9 +449,9 @@ a string or a numeric."
                                              'mastodon-tl--byline-author
                                              'mastodon-tl--byline-boosted))
                        "Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+  Boosted Account 43 (@acct43@example.space) original time
   ------------
-")))))
+  ")))))
 
 (ert-deftest mastodon-tl--byline-reblogged-boosted/favorited ()
   "Should format the reblogged toot that was also boosted & favoritedcorrectly."
@@ -470,9 +473,9 @@ a string or a numeric."
                                              'mastodon-tl--byline-author
                                              'mastodon-tl--byline-boosted))
                        "(B) (F) Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+  Boosted Account 43 (@acct43@example.space) original time
   ------------
-")))))
+  ")))))
 
 (ert-deftest mastodon-tl--byline-timestamp-has-relative-display ()
   "Should display the timestamp with a relative time."
@@ -808,8 +811,8 @@ a string or a numeric."
 (defun tl-tests--property-values-at (property ranges)
   "Returns a list with property values at the given ranges.
 
-The property value for PROPERTY within a region is assumed to be
-constant."
+  The property value for PROPERTY within a region is assumed to be
+  constant."
   (let (result)
     (dolist (range ranges (nreverse result))
       (push (get-text-property (car range) property) result))))
-- 
cgit v1.2.3


From 2b07cf720d4766b39584bff0d82125335f73f824 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 10:01:26 +0100
Subject: fix --get-response-async re params

---
 lisp/mastodon-http.el | 3 ++-
 lisp/mastodon-tl.el   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index d56f3ad..d1bf573 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -321,10 +321,11 @@ PARAMS is an alist of any extra parameters to send with the request."
      "GET"
      (url-retrieve url callback cbargs))))
 
-(defun mastodon-http--get-response-async (url callback &rest args)
+(defun mastodon-http--get-response-async (url &optional params callback &rest args)
   "Make GET request to URL. Call CALLBACK with http response and ARGS."
   (mastodon-http--get-async
    url
+   params
    (lambda (status)
      (when status ;; only when we actually get sth?
        (apply callback (mastodon-http--process-response) args)))))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index d0c2b0b..8d4bba4 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2459,7 +2459,7 @@ favourites."
         (buffer (concat "*mastodon-" buffer-name "*")))
     (if headers
         (mastodon-http--get-response-async
-         url 'mastodon-tl--init* buffer endpoint update-function headers)
+         url nil 'mastodon-tl--init* buffer endpoint update-function headers)
       (mastodon-http--get-json-async
        url nil 'mastodon-tl--init* buffer endpoint update-function))))
 
-- 
cgit v1.2.3


From 4e483bd8862282991793409ca49fb6fa66bb8109 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 10:08:46 +0100
Subject: fix list-name grabbing in list add/delete/edit

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

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b1cbce1..f75398f 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1493,7 +1493,7 @@ If ID is provided, use that list."
   (interactive)
   (let* ((list-names (unless id (mastodon-tl--get-lists-names)))
          (name-old (if id
-                       (get-text-property (point) 'list-id)
+                       (get-text-property (point) 'list-name)
                      (completing-read "Edit list: "
                                       list-names)))
          (id (or id (mastodon-tl--get-list-id name-old)))
@@ -1648,7 +1648,7 @@ a: add account to this list, r: remove account from this list"
 If ID is provided, use that list."
   (interactive)
   (let* ((list-name (if id
-                        (get-text-property (point) 'list-id)
+                        (get-text-property (point) 'list-name)
                       (completing-read "Add account to list: "
                                        (mastodon-tl--get-lists-names) nil t)))
          (list-id (or id (mastodon-tl--get-list-id list-name)))
@@ -1678,7 +1678,7 @@ If ID is provided, use that list."
 If ID is provided, use that list."
   (interactive)
   (let* ((list-name (if id
-                        (get-text-property (point) 'list-id)
+                        (get-text-property (point) 'list-name)
                       (completing-read "Remove account from list: "
                                        (mastodon-tl--get-lists-names) nil t)))
          (list-id (or id (mastodon-tl--get-list-id list-name)))
-- 
cgit v1.2.3


From 348a917b8bafb2b6dafbdfa0a6945c6803b0d806 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 11:04:46 +0100
Subject: try setting mastodon-mode in view-instance buffers

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

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index f75398f..027b7e8 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1914,6 +1914,7 @@ INSTANCE is an instance domain name."
                            (assoc 'rules response)
                            (assoc 'stats response))))
              (mastodon-tl--print-json-keys response)
+             (mastodon-mode)
              (goto-char (point-min)))))))))
 
 (defun mastodon-tl--format-key (el pad)
-- 
cgit v1.2.3


From 6d11b36f890be413c0126aa09566646d6a74d571 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 12:29:29 +0100
Subject: tl fix a -get-json call that :vector arg

---
 lisp/mastodon-tl.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 8d4bba4..0de925f 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1874,7 +1874,8 @@ INSTANCE is an instance domain name."
                      (if user
                          (mastodon-http--api "instance")
                        (concat instance "/api/v1/instance"))
-                     nil
+                     nil ; params
+                     nil ; silent
                      :vector)))
      (when response
        (let ((buf (get-buffer-create "*mastodon-instance*")))
-- 
cgit v1.2.3


From 09e38ba8b61c9a50e50453535d1e1f409a61a7ab Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 11:04:46 +0100
Subject: try setting mastodon-mode in view-instance buffers

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

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 0de925f..15943ba 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1897,6 +1897,7 @@ INSTANCE is an instance domain name."
                            (assoc 'rules response)
                            (assoc 'stats response))))
              (mastodon-tl--print-json-keys response)
+             (mastodon-mode)
              (goto-char (point-min)))))))))
 
 (defun mastodon-tl--format-key (el pad)
-- 
cgit v1.2.3


From d0c7a2f330bb5ef22eb9956255e2fb4c171e7e59 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 15:36:24 +0100
Subject: rename build-query-string to -params-str, + build-array-params-alist

---
 lisp/mastodon-http.el | 28 ++++++++++++++--------------
 lisp/mastodon-tl.el   | 10 +++++-----
 lisp/mastodon-toot.el |  6 +++---
 3 files changed, 22 insertions(+), 22 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index c1ab3fb..69a571d 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -114,19 +114,19 @@ Unless UNAUTHENTICATED-P is non-nil."
                         (concat "Bearer " (mastodon-auth--access-token)))))))
      ,body))
 
-(defun mastodon-http--build-query-string (args)
-  "Build a request query string from ARGS."
+(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
   ;; own:
-  (mapconcat (lambda (arg)
-               (concat (url-hexify-string (car arg))
+  (mapconcat (lambda (p)
+               (concat (url-hexify-string (car p))
                        "="
-                       (url-hexify-string (cdr arg))))
-             args
+                       (url-hexify-string (cdr p))))
+             params
              "&"))
 
-(defun mastodon-http--build-array-args-alist (param-str array)
+(defun mastodon-http--build-array-params-alist (param-str array)
   "Return parameters alist using PARAM-STR and ARRAY param values.
 Used for API form data parameters that take an array."
   (cl-loop for x in array
@@ -140,7 +140,7 @@ Authorization header is included by default unless UNAUTHENTICATED-P is non-nil.
    "POST"
    (let ((url-request-data
           (when args
-            (mastodon-http--build-query-string args)))
+            (mastodon-http--build-params-string args)))
          (url-request-extra-headers
           (append url-request-extra-headers ; auth set in macro
                   ;; pleroma compat:
@@ -160,7 +160,7 @@ SILENT means don't message."
    ;; url-request-data doesn't seem to work with GET requests:
    (let ((url (if params
                   (concat url "?"
-                          (mastodon-http--build-query-string params))
+                          (mastodon-http--build-params-string params))
                 url)))
      (mastodon-http--url-retrieve-synchronously url silent))))
 
@@ -228,7 +228,7 @@ PARAMS is an alist of any extra parameters to send with the request."
   (let ((url
          (if params
              (concat url "?"
-                     (mastodon-http--build-query-string params))
+                     (mastodon-http--build-params-string params))
            url)))
     (mastodon-http--authorized-request
      "DELETE"
@@ -241,7 +241,7 @@ PARAMS is an alist of any extra parameters to send with the request."
   (mastodon-http--authorized-request
    "PUT"
    (let ((url-request-data
-          (when args (mastodon-http--build-query-string params)))
+          (when args (mastodon-http--build-params-string params)))
          (url-request-extra-headers
           (append url-request-extra-headers ; auth set in macro
                   ;; pleroma compat:
@@ -271,7 +271,7 @@ Optionally specify the PARAMS to send."
    "PATCH"
    (let ((url
           (concat base-url "?"
-                  (mastodon-http--build-query-string params))))
+                  (mastodon-http--build-params-string params))))
      (mastodon-http--url-retrieve-synchronously url))))
 
  ;; Asynchronous functions
@@ -282,7 +282,7 @@ 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-query-string params))
+                         (mastodon-http--build-params-string params))
                url)))
     (mastodon-http--authorized-request
      "GET"
@@ -316,7 +316,7 @@ Authorization header is included by default unless UNAUTHENTICED-P is non-nil."
    (let ((request-timeout 5)
          (url-request-data
           (when args
-            (mastodon-http--build-query-string args))))
+            (mastodon-http--build-params-string args))))
      (with-temp-buffer
        (url-retrieve url callback cbargs)))))
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 15943ba..efb6612 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -74,8 +74,8 @@
 (autoload 'mastodon-auth--get-account-id "mastodon-auth")
 (autoload 'mastodon-http--put "mastodon-http")
 (autoload 'mastodon-http--process-json "mastodon-http")
-(autoload 'mastodon-http--build-array-args-alist "mastodon-http")
-(autoload 'mastodon-http--build-query-string "mastodon-http")
+(autoload 'mastodon-http--build-array-params-alist "mastodon-http")
+(autoload 'mastodon-http--build-params-string "mastodon-http")
 (autoload 'mastodon-notifications--filter-types-list "mastodon-notifications")
 (autoload 'mastodon-toot--get-toot-edits "mastodon-toot")
 
@@ -1678,7 +1678,7 @@ If ID is provided, use that list."
                                    handles nil t))
          (account-id (alist-get account handles nil nil 'equal))
          (url (mastodon-http--api (format "lists/%s/accounts" list-id)))
-         (args (mastodon-http--build-array-args-alist "account_ids[]" `(,account-id)))
+         (args (mastodon-http--build-array-params-alist "account_ids[]" `(,account-id)))
          (response (mastodon-http--delete url args)))
     (mastodon-tl--list-action-triage
      response
@@ -2517,10 +2517,10 @@ Runs synchronously.
 Optional arg NOTE-TYPE means only get that type of note."
   (let* ((exclude-types (when note-type
                           (mastodon-notifications--filter-types-list note-type)))
-         (args (when note-type (mastodon-http--build-array-args-alist
+         (args (when note-type (mastodon-http--build-array-params-alist
                                 "exclude_types[]" exclude-types)))
          ;; (query-string (when note-type
-         ;; (mastodon-http--build-query-string args)))
+         ;; (mastodon-http--build-params-string args)))
          ;; add note-type exclusions to endpoint so it works in `mastodon-tl--buffer-spec'
          ;; that way `mastodon-tl--more' works seamlessly too:
          ;; (endpoint (if note-type (concat endpoint "?" query-string) endpoint))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 8ac75f9..c870092 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -79,7 +79,7 @@
 (autoload 'mastodon-profile--fetch-server-account-settings "mastodon-profile")
 (autoload 'mastodon-tl--render-text "mastodon-tl")
 (autoload 'mastodon-profile--fetch-server-account-settings-maybe "mastodon-profile")
-(autoload 'mastodon-http--build-array-args-alist "mastodon-http")
+(autoload 'mastodon-http--build-array-params-alist "mastodon-http")
 (autoload 'mastodon-tl--get-endpoint "mastodon-tl")
 (autoload 'mastodon-http--put "mastodon-http")
 
@@ -631,7 +631,7 @@ to `emojify-user-emojis', and the emoji data is updated."
 (defun mastodon-toot--build-poll-params ()
   "Return an alist of parameters for POSTing a poll status."
   (append
-   (mastodon-http--build-array-args-alist
+   (mastodon-http--build-array-params-alist
     "poll[options][]"
     (plist-get mastodon-toot-poll :options))
    `(("poll[expires_in]" .  ,(plist-get mastodon-toot-poll :expiry)))
@@ -664,7 +664,7 @@ instance to edit a toot."
                                             (symbol-name t)))
                           ("spoiler_text" . ,spoiler)))
          (args-media (when mastodon-toot--media-attachments
-                       (mastodon-http--build-array-args-alist
+                       (mastodon-http--build-array-params-alist
                         "media_ids[]"
                         mastodon-toot--media-attachment-ids)))
          (args-poll (when mastodon-toot-poll
-- 
cgit v1.2.3


From feaa4d34a30da292e9a7f61187449252b4932171 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 15:49:11 +0100
Subject: speculatively fix byline tests

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

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index efb6612..0abf996 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -499,7 +499,7 @@ The result is added as an attachments property to author-byline."
   (let ((reblog (alist-get 'reblog toot)))
     (when reblog
       (concat
-       "\n "
+       "\n  "
        (propertize "Boosted" 'face 'mastodon-boosted-face)
        " "
        (mastodon-tl--byline-author reblog)))))
-- 
cgit v1.2.3


From 70aaeaebed48d07b6966c3633bea955f6b047828 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 15:49:59 +0100
Subject: if not when for edited-time in byline (for tests)

---
 lisp/mastodon-tl.el | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 0abf996..35a9dfa 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -666,24 +666,25 @@ this just means displaying toot client."
                           'face 'mastodon-display-name-face
                           'follow-link t
                           'mouse-face 'highlight
-		          'mastodon-tab-stop 'shr-url
-		          'shr-url app-url
+		                  'mastodon-tab-stop 'shr-url
+		                  'shr-url app-url
                           'help-echo app-url
-		          'keymap mastodon-tl--shr-map-replacement)))))
-       (when edited-time
-         (concat
-          (if (fontp (char-displayable-p #10r128274))
-              " ✍ "
-            " [edited] ")
-          (propertize
-           (format-time-string mastodon-toot-timestamp-format
-                               edited-parsed)
-           'face 'font-lock-comment-face
-           'timestamp edited-parsed
-           'display (if mastodon-tl--enable-relative-timestamps
-                        (mastodon-tl--relative-time-description edited-parsed)
-                      edited-parsed))))
-       (propertize "\n  ------------\n" 'face 'default))
+		                  'keymap mastodon-tl--shr-map-replacement)))))
+       (if edited-time
+           (concat
+            (if (fontp (char-displayable-p #10r128274))
+                " ✍ "
+              " [edited] ")
+            (propertize
+             (format-time-string mastodon-toot-timestamp-format
+                                 edited-parsed)
+             'face 'font-lock-comment-face
+             'timestamp edited-parsed
+             'display (if mastodon-tl--enable-relative-timestamps
+                          (mastodon-tl--relative-time-description edited-parsed)
+                        edited-parsed)))
+         "")
+       (propertize "\n  ------------\n  " 'face 'default))
       'favourited-p faved
       'boosted-p    boosted
       'bookmarked-p bookmarked
-- 
cgit v1.2.3


From 54bf253a26c899a21dec819033b51831684a6eb5 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 16:12:00 +0100
Subject: add missing nil params arg to tl--more

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

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 35a9dfa..e4f2dc9 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2259,9 +2259,9 @@ For use after e.g. deleting a toot."
   (if (member (buffer-name (current-buffer)) mastodon-tl--link-header-buffers)
       ;; link-header: can't build a URL with --more-json-async, endpoint/id:
       (let* ((next (car (mastodon-tl--link-header)))
-             ;(prev (cadr (mastodon-tl--link-header)))
+             ;;(prev (cadr (mastodon-tl--link-header)))
              (url (mastodon-tl--build-link-header-url next)))
-        (mastodon-http--get-response-async url 'mastodon-tl--more* (current-buffer)
+        (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--oldest-id)
                                   'mastodon-tl--more* (current-buffer) (point))))
-- 
cgit v1.2.3


From 6aa934389c6644c84196f75ee51f294b5264ef6d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 23 Nov 2022 12:21:40 +0100
Subject: add account to list from profile buffer

---
 lisp/mastodon-tl.el | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index d8a5417..0928b1b 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1643,9 +1643,10 @@ a: add account to this list, r: remove account from this list"
   (let ((id (get-text-property (point) 'list-id)))
     (mastodon-tl--add-account-to-list id)))
 
-(defun mastodon-tl--add-account-to-list (&optional id)
+(defun mastodon-tl--add-account-to-list (&optional id account-id handle)
   "Prompt for a list and for an account, add account to list.
-If ID is provided, use that list."
+If ID is provided, use that list.
+If ACCOUNT-ID and HANDLE are provided use them rather than prompting."
   (interactive)
   (let* ((list-name (if id
                         (get-text-property (point) 'list-name)
@@ -1657,9 +1658,9 @@ If ID is provided, use that list."
                             (cons (alist-get 'acct x)
                                   (alist-get 'id x)))
                           followings))
-         (account (completing-read "Account to add: "
-                                   handles nil t))
-         (account-id (alist-get account handles nil nil 'equal))
+         (account (or handle (completing-read "Account to add: "
+                                              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)))))
@@ -1715,6 +1716,15 @@ If ID is provided, use that list."
   (let* ((url (mastodon-http--api (format "lists/%s/accounts" list-id))))
     (mastodon-http--get-json url)))
 
+(defun mastodon-tl--add-profile-account-to-list ()
+  "Add account of current profile buffer to a list."
+  (interactive)
+  (when mastodon-profile--account
+    (let* ((profile mastodon-profile--account)
+           (id (alist-get 'id profile))
+           (handle (alist-get 'acct profile)))
+      (mastodon-tl--add-account-to-list nil id handle))))
+
 ;;; FILTERS
 
 (defun mastodon-tl--create-filter ()
-- 
cgit v1.2.3


From ebefa1141e0ebd2a2d217e4b5b00720d8c60530a Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 23 Nov 2022 12:51:36 +0100
Subject: move add account to list profile to profile.el, + readme

---
 README.org               | 120 ++++++++++++++++++++++++-----------------------
 lisp/mastodon-profile.el |  11 +++++
 lisp/mastodon-tl.el      |  16 ++-----
 3 files changed, 77 insertions(+), 70 deletions(-)

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

diff --git a/README.org b/README.org
index 8eb9242..a757706 100644
--- a/README.org
+++ b/README.org
@@ -107,65 +107,69 @@ take place if your =mastodon-token-file= does not contain =:client_id= and
 
 **** Keybindings
 
-|---------------+-----------------------------------------------------------------------|
-| Key           | Action                                                                |
-|---------------+-----------------------------------------------------------------------|
-|               | *Help*                                                                  |
-| =?=             | Open context menu if =discover= is available                            |
-|---------------+-----------------------------------------------------------------------|
-|               | *Timeline actions*                                                      |
-| =n=             | Go to next item (toot, notification)                                  |
-| =p=             | Go to previous item (toot, notification)                              |
-| =M-n=/=<tab>=   | Go to the next interesting thing that has an action                   |
-| =M-p=/=<S-tab>= | Go to the previous interesting thing that has an action               |
-| =F=             | Open federated timeline                                               |
-| =H=             | Open home timeline                                                    |
-| =L=             | Open local timeline                                                   |
-| =N=             | Open notifications timeline                                           |
-| =@=             | Open mentions-only notifications timeline                             |
-| =u=             | Update current timeline                                               |
-| =T=             | Open thread for toot under =point=                                      |
-| =#=             | Prompt for tag and open its timeline                                  |
-| =A=             | Open author profile of toot under =point=                               |
-| =P=             | Open profile of user attached to toot under =point=                     |
-| =O=             | View own profile                                                      |
-| =U=             | update your profile bio note                                          |
-|---------------+-----------------------------------------------------------------------|
-|               | *Other views*                                                           |
-| =S=             | search (posts, users, tags) (NB: only posts you have interacted with) |
-| =I=, =c=, =d=       | view, create, and delete filters                                      |
-| =R=, =a=, =j=       | view/accept/reject follow requests                                    |
-| =G=             | view follow suggestions                                               |
-| =V=             | view your favourited toots                                            |
-| =K=             | view bookmarked toots                                                 |
-| =X=             | view/edit/create/delete lists                                         |
-|---------------+-----------------------------------------------------------------------|
-|               | *Toot actions*                                                          |
-| =t=             | Compose a new toot                                                    |
-| =c=             | Toggle content warning content                                        |
-| =b=             | Boost toot under =point=                                                |
-| =f=             | Favourite toot under =point=                                            |
-| =k=             | toggle bookmark of toot at point                                      |
-| =r=             | Reply to toot under =point=                                             |
-| =v=             | Vote on poll at point                                                 |
-| =C=             | copy url of toot at point                                             |
-| =C-RET=         | play video/gif at point (requires =mpv=)                                |
-| =e=             | edit your toot at point                                               |
-| =E=             | view edits of toot at point                                           |
-| =i=             | (un)pin your toot at point                                            |
-| =d=             | delete your toot at point, and reload current timeline                |
-| =D=             | delete and redraft toot at point, preserving reply/CW/visibility      |
+|----------------+-----------------------------------------------------------------------|
+| Key            | Action                                                                |
+|----------------+-----------------------------------------------------------------------|
+|                | *Help*                                                                  |
+| =?=              | Open context menu if =discover= is available                            |
+|----------------+-----------------------------------------------------------------------|
+|                | *Timeline actions*                                                      |
+| =n=              | Go to next item (toot, notification)                                  |
+| =p=              | Go to previous item (toot, notification)                              |
+| =M-n=/=<tab>=    | Go to the next interesting thing that has an action                   |
+| =M-p=/=<S-tab>=  | Go to the previous interesting thing that has an action               |
+| =F=              | Open federated timeline                                               |
+| =H=              | Open home timeline                                                    |
+| =L=              | Open local timeline                                                   |
+| =N=              | Open notifications timeline                                           |
+| =@=              | Open mentions-only notifications timeline                             |
+| =u=              | Update current timeline                                               |
+| =T=              | Open thread for toot under =point=                                      |
+| =#=              | Prompt for tag and open its timeline                                  |
+| =A=              | Open author profile of toot under =point=                               |
+| =P=              | Open profile of user attached to toot under =point=                     |
+| =O=              | View own profile                                                      |
+| =U=              | update your profile bio note                                          |
+|----------------+-----------------------------------------------------------------------|
+|                | *Other views*                                                           |
+| =S=              | search (posts, users, tags) (NB: only posts you have interacted with) |
+| =I=, =c=, =d=        | view, create, and delete filters                                      |
+| =R=, =a=, =j=        | view/accept/reject follow requests                                    |
+| =G=              | view follow suggestions                                               |
+| =V=              | view your favourited toots                                            |
+| =K=              | view bookmarked toots                                                 |
+| =X=              | view/edit/create/delete lists                                         |
+|----------------+-----------------------------------------------------------------------|
+|                | *Toot actions*                                                          |
+| =t=              | Compose a new toot                                                    |
+| =c=              | Toggle content warning content                                        |
+| =b=              | Boost toot under =point=                                                |
+| =f=              | Favourite toot under =point=                                            |
+| =k=              | toggle bookmark of toot at point                                      |
+| =r=              | Reply to toot under =point=                                             |
+| =v=              | Vote on poll at point                                                 |
+| =C=              | copy url of toot at point                                             |
+| =C-RET=          | play video/gif at point (requires =mpv=)                                |
+| =e=              | edit your toot at point                                               |
+| =E=              | view edits of toot at point                                           |
+| =i=              | (un)pin your toot at point                                            |
+| =d=              | delete your toot at point, and reload current timeline                |
+| =D=              | delete and redraft toot at point, preserving reply/CW/visibility      |
 | (=S-C-=) =W=, =M=, =B= | (un)follow, (un)mute, (un)block author of toot at point               |
-|---------------+-----------------------------------------------------------------------|
-|               | Notifications view                                                    |
-| =a=, =j=          | accept/reject follow request                                          |
-| =c=             | clear notification at point                                           |
-|               | see =mastodon-notifications--get-*= functions for filtered views        |
-|---------------+-----------------------------------------------------------------------|
-|               | *Quitting*                                                              |
-| =q=             | Quit mastodon buffer, leave window open                               |
-| =Q=             | Quit mastodon buffer and kill window                                  |
-|---------------+-----------------------------------------------------------------------|
+|----------------+-----------------------------------------------------------------------|
+|                | *Profile view*                                                          |
+| =C-c C-c=        | cycle between statuses, followers, following, and statuses without boosts |
+|                | =mastodon-profile--account-account-to-list= (see lists view)               |
+|----------------+-----------------------------------------------------------------------|
+|                | *Notifications view*                                                    |
+| =a=, =j=           | accept/reject follow request                                          |
+| =c=              | clear notification at point                                           |
+|                | see =mastodon-notifications--get-*= functions for filtered views        |
+|----------------+-----------------------------------------------------------------------|
+|                | *Quitting*                                                              |
+| =q=              | Quit mastodon buffer, leave window open                               |
+| =Q=              | Quit mastodon buffer and kill window                                  |
+|----------------+-----------------------------------------------------------------------|
 
 **** Toot byline legend
 
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 3a869ed..c604bcd 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -69,6 +69,8 @@
 (autoload 'mastodon-search--insert-users-propertized "mastodon-search")
 (autoload 'mastodon-tl--get-endpoint "mastodon-tl.el")
 (autoload 'mastodon-toot--get-max-toot-chars "mastodon-toot")
+(autoload 'mastodon-tl--add-account-to-list "mastodon-tl")
+
 (defvar mastodon-instance-url)
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--update-point)
@@ -243,6 +245,15 @@ JSON is the data returned by the server."
     (mastodon-search--insert-users-propertized json :note)))
 ;; (mastodon-profile--add-author-bylines json)))
 
+(defun mastodon-profile--add-account-to-list ()
+  "Add account of current profile buffer to a list."
+  (interactive)
+  (when mastodon-profile--account
+    (let* ((profile mastodon-profile--account)
+           (id (alist-get 'id profile))
+           (handle (alist-get 'acct profile)))
+      (mastodon-tl--add-account-to-list nil id handle))))
+
 ;;; ACCOUNT PREFERENCES
 
 (defun mastodon-profile--get-json-value (val)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 0928b1b..e3a2665 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -77,6 +77,7 @@
 (autoload 'mastodon-http--build-array-args-alist "mastodon-http")
 (autoload 'mastodon-http--build-query-string "mastodon-http")
 (autoload 'mastodon-notifications--filter-types-list "mastodon-notifications")
+(autoload 'mastodon-toot--get-toot-edits "mastodon-toot")
 
 (when (require 'mpv nil :no-error)
   (declare-function mpv-start "mpv"))
@@ -665,10 +666,10 @@ this just means displaying toot client."
                           'face 'mastodon-display-name-face
                           'follow-link t
                           'mouse-face 'highlight
-		          'mastodon-tab-stop 'shr-url
-		          'shr-url app-url
+		                  'mastodon-tab-stop 'shr-url
+		                  'shr-url app-url
                           'help-echo app-url
-		          'keymap mastodon-tl--shr-map-replacement)))))
+		                  'keymap mastodon-tl--shr-map-replacement)))))
        (when edited-time
          (concat
           (if (fontp (char-displayable-p #10r128274))
@@ -1716,15 +1717,6 @@ If ID is provided, use that list."
   (let* ((url (mastodon-http--api (format "lists/%s/accounts" list-id))))
     (mastodon-http--get-json url)))
 
-(defun mastodon-tl--add-profile-account-to-list ()
-  "Add account of current profile buffer to a list."
-  (interactive)
-  (when mastodon-profile--account
-    (let* ((profile mastodon-profile--account)
-           (id (alist-get 'id profile))
-           (handle (alist-get 'acct profile)))
-      (mastodon-tl--add-account-to-list nil id handle))))
-
 ;;; FILTERS
 
 (defun mastodon-tl--create-filter ()
-- 
cgit v1.2.3


From 81ecff802190fc1040e331630f6648765ea7320a Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 23 Nov 2022 15:27:23 +0100
Subject: use unicode star if poss for faves. --return-fave-char

---
 lisp/mastodon-tl.el   | 13 ++++++++++++-
 lisp/mastodon-toot.el |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index e3a2665..d829015 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -619,7 +619,8 @@ this just means displaying toot client."
      (concat (when boosted
                (mastodon-tl--format-faved-or-boosted-byline "B"))
              (when faved
-               (mastodon-tl--format-faved-or-boosted-byline "F"))
+               (mastodon-tl--format-faved-or-boosted-byline
+                (mastodon-tl--return-fave-char)))
              (when bookmarked
                (mastodon-tl--format-faved-or-boosted-byline bookmark-str)))
      ;; we remove avatars from the byline also, so that they also do not mess
@@ -692,6 +693,16 @@ this just means displaying toot client."
                       (mastodon-toot--get-toot-edits (alist-get 'id toot)))
       'byline       t))))
 
+(defun mastodon-tl--return-fave-char ()
+  ""
+  (cond
+   ((fontp (char-displayable-p #10r11088))
+    "⭐")
+   ((fontp (char-displayable-p #10r9733))
+    "★")
+   (t
+    "F")))
+
 (defun mastodon-tl--format-edit-timestamp (timestamp)
   "Convert edit TIMESTAMP into a descriptive string."
   (let ((parsed (ts-human-duration
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 6162f52..36d08fd 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -332,7 +332,9 @@ TYPE is a symbol, either 'favourite or 'boost."
                                         (list 'boosted-p (not boosted))
                                       (list 'favourited-p (not faved))))
                (mastodon-toot--action-success
-                (if boost-p "B" "F")
+                (if boost-p
+                    "B"
+                  (mastodon-tl--return-fave-char))
                 byline-region remove))
              (message (format "%s #%s" (if boost-p msg action) id))))))
       (message (format "Nothing to %s here?!?" action-string)))))
-- 
cgit v1.2.3


From b2b8fe39b6863a1398bf7d50e9ee9bc3143d2fe2 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 24 Nov 2022 15:03:20 +0100
Subject: display icon for boosts

will later follow rougier's lead on this, but just wanted to see how it looked
---
 lisp/mastodon-tl.el   | 29 +++++++++++++++++++++--------
 lisp/mastodon-toot.el |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 46ec8fe..e65d3a5 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -600,9 +600,6 @@ this just means displaying toot client."
          (faved (equal 't (mastodon-tl--field 'favourited toot)))
          (boosted (equal 't (mastodon-tl--field 'reblogged toot)))
          (bookmarked (equal 't (mastodon-tl--field 'bookmarked toot)))
-         (bookmark-str (if (fontp (char-displayable-p #10r128278))
-                           "🔖"
-                         "K"))
          (visibility (mastodon-tl--field 'visibility toot))
          (account (alist-get 'account toot))
          (avatar-url (alist-get 'avatar account))
@@ -617,12 +614,14 @@ this just means displaying toot client."
      ;; displayed for an already boosted/favourited toot or as the result of
      ;; the toot having just been favourited/boosted.
      (concat (when boosted
-               (mastodon-tl--format-faved-or-boosted-byline "B"))
+               (mastodon-tl--format-faved-or-boosted-byline
+                (mastodon-tl--return-boost-char)))
              (when faved
                (mastodon-tl--format-faved-or-boosted-byline
                 (mastodon-tl--return-fave-char)))
              (when bookmarked
-               (mastodon-tl--format-faved-or-boosted-byline bookmark-str)))
+               (mastodon-tl--format-faved-or-boosted-byline
+                (mastodon-tl--return-bookmark-char))))
      ;; we remove avatars from the byline also, so that they also do not mess
      ;; with `mastodon-tl--goto-next-toot':
      (when (and mastodon-tl--show-avatars
@@ -667,10 +666,10 @@ this just means displaying toot client."
                           'face 'mastodon-display-name-face
                           'follow-link t
                           'mouse-face 'highlight
-		                  'mastodon-tab-stop 'shr-url
-		                  'shr-url app-url
+		          'mastodon-tab-stop 'shr-url
+		          'shr-url app-url
                           'help-echo app-url
-		                  'keymap mastodon-tl--shr-map-replacement)))))
+		          'keymap mastodon-tl--shr-map-replacement)))))
        (if edited-time
            (concat
             (if (fontp (char-displayable-p #10r128274))
@@ -694,6 +693,14 @@ this just means displaying toot client."
                       (mastodon-toot--get-toot-edits (alist-get 'id toot)))
       'byline       t))))
 
+(defun mastodon-tl--return-boost-char ()
+  ""
+  (cond
+   ((fontp (char-displayable-p #10r128257))
+    "🔁")
+   (t
+    "B")))
+
 (defun mastodon-tl--return-fave-char ()
   ""
   (cond
@@ -704,6 +711,12 @@ this just means displaying toot client."
    (t
     "F")))
 
+(defun mastodon-tl--return-bookmark-char ()
+  ""
+  (if (fontp (char-displayable-p #10r128278))
+      "🔖"
+    "K"))
+
 (defun mastodon-tl--format-edit-timestamp (timestamp)
   "Convert edit TIMESTAMP into a descriptive string."
   (let ((parsed (ts-human-duration
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 4f9fb1b..7211183 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -334,7 +334,7 @@ TYPE is a symbol, either 'favourite or 'boost."
                                       (list 'favourited-p (not faved))))
                (mastodon-toot--action-success
                 (if boost-p
-                    "B"
+                    (mastodon-tl--return-boost-char)
                   (mastodon-tl--return-fave-char))
                 byline-region remove))
              (message (format "%s #%s" (if boost-p msg action) id))))))
-- 
cgit v1.2.3


From 143232e53d05bd42560d5ee9265bcb74245a29e2 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 12:02:01 +0100
Subject: remove trailing double space from sparator

tl-tests: remove trailing double spaces from separator again
---
 lisp/mastodon-tl.el       | 2 +-
 test/mastodon-tl-tests.el | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 46ec8fe..159c2cc 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -685,7 +685,7 @@ this just means displaying toot client."
                           (mastodon-tl--relative-time-description edited-parsed)
                         edited-parsed)))
          "")
-       (propertize "\n  ------------\n  " 'face 'default))
+       (propertize "\n  ------------\n" 'face 'default))
       'favourited-p faved
       'boosted-p    boosted
       'bookmarked-p bookmarked
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index f9b315c..a80c3ee 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -317,7 +317,7 @@ Strict-Transport-Security: max-age=31536000
 			              byline)
 			             "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
-  "))
+"))
         (should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
                     'user-handle))
         (should (string= (get-text-property handle-location 'mastodon-handle byline)
@@ -418,7 +418,7 @@ Strict-Transport-Security: max-age=31536000
 			             "Account 42 (@acct42@example.space)
   Boosted Account 43 (@acct43@example.space) original time
   ------------
-  "))
+"))
         (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
                     'user-handle))
         (should (equal (get-text-property handle1-location 'help-echo byline)
-- 
cgit v1.2.3


From 383f31d06cbf8327507aabfa71d6d6fd85618873 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 13:37:33 +0100
Subject: caption + props for media urls as well as actual media

adds fun mastodon-tl--propertize-img-str-or-url, to prop both.
---
 lisp/mastodon-media.el | 35 +++++++++++------------------
 lisp/mastodon-tl.el    | 60 +++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 58 insertions(+), 37 deletions(-)

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

diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 9715a6c..c783130 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -35,6 +35,8 @@
 ;;; Code:
 (require 'url-cache)
 
+(autoload 'mastodon-tl--propertize-img-str-or-url "mastodon-tl")
+
 (defvar url-show-status)
 
 (defvar mastodon-tl--shr-image-map-replacement)
@@ -306,34 +308,23 @@ 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")
-        (help-echo (if caption
-                       (concat help-echo-base
-                               "\n\""
-                               caption "\"")
-                     help-echo-base)))
+         (help-echo (if caption
+                        (concat help-echo-base
+                                "\n\""
+                                caption "\"")
+                      help-echo-base)))
     (concat
-     (propertize "[img]"
-                 'media-url media-url
-                 'media-state 'needs-loading
-                 'media-type 'media-link
-                 'mastodon-media-type type
-                 'display (create-image mastodon-media--generic-broken-image-data nil t)
-                 'mouse-face 'highlight
-                 'mastodon-tab-stop 'image ; for do-link-action-at-point
-                 'image-url full-remote-url ; for shr-browse-image
-                 'keymap mastodon-tl--shr-image-map-replacement
-                 'help-echo (if (or (string= type "image")
-                                    (string= type nil)
-                                    (string= type "unknown")) ;handle borked images
-                                help-echo
-                              (concat help-echo "\nC-RET: play " type " with mpv")))
-                 " ")))
+     (mastodon-tl--propertize-img-str-or-url
+      "[img]" media-url full-remote-url type help-echo
+      (create-image mastodon-media--generic-broken-image-data nil t))
+     " ")))
 
 (provide 'mastodon-media)
 ;;; mastodon-media.el ends here
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 159c2cc..b74ac84 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1019,26 +1019,56 @@ message is a link which unhides/hides the main body."
 (defun mastodon-tl--media (toot)
   "Retrieve a media attachment link for TOOT if one exists."
   (let* ((media-attachements (mastodon-tl--field 'media_attachments toot))
-         (media-string (mapconcat
-                        (lambda (media-attachement)
-                          (let ((preview-url
-                                 (alist-get 'preview_url media-attachement))
-                                (remote-url
-                                 (or (alist-get 'remote_url media-attachement)
-                                     ;; fallback b/c notifications don't have remote_url
-                                     (alist-get 'url media-attachement)))
-                                (type (alist-get 'type media-attachement))
-                                (caption (alist-get 'description media-attachement)))
-                            (if mastodon-tl--display-media-p
-                                (mastodon-media--get-media-link-rendering
-                                 preview-url remote-url type caption) ; 2nd arg for shr-browse-url
-                              (concat "Media::" preview-url "\n"))))
-                        media-attachements "")))
+         (media-string
+          (mapconcat
+           (lambda (media-attachement)
+             (let ((preview-url
+                    (alist-get 'preview_url media-attachement))
+                   (remote-url
+                    (or (alist-get 'remote_url media-attachement)
+                        ;; fallback b/c notifications don't have remote_url
+                        (alist-get 'url media-attachement)))
+                   (type (alist-get 'type media-attachement))
+                   (caption (alist-get 'description media-attachement)))
+               (if mastodon-tl--display-media-p
+                   (mastodon-media--get-media-link-rendering
+                    preview-url remote-url type caption) ; 2nd arg for shr-browse-url
+                 (concat
+                  (mastodon-tl--propertize-img-str-or-url
+                   (concat "Media:: " preview-url)
+                   preview-url remote-url type caption nil 'shr-link)
+                  "\n"))))
+           media-attachements "")))
     (if (not (and mastodon-tl--display-media-p
                   (string-empty-p media-string)))
         (concat "\n" media-string)
       "")))
 
+(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
+server, TYPE is the media type.
+HELP-ECHO, DISPLAY, and FACE are the text properties to add."
+  (propertize str
+              'media-url media-url
+              'media-state (when (string= str "[img]") 'needs-loading)
+              'media-type 'media-link
+              'mastodon-media-type type
+              'display display
+              'face face
+              'mouse-face 'highlight
+              'mastodon-tab-stop 'image ; for do-link-action-at-point
+              'image-url full-remote-url ; for shr-browse-image
+              'keymap mastodon-tl--shr-image-map-replacement
+              'help-echo (if (or (string= type "image")
+                                 (string= type nil)
+                                 (string= type "unknown")) ;handle borked images
+                             help-echo
+                           (concat help-echo "\nC-RET: play " type " with mpv"))))
+
 (defun mastodon-tl--content (toot)
   "Retrieve text content from TOOT.
 Runs `mastodon-tl--render-text' and fetches poll or media."
-- 
cgit v1.2.3


From 021ae971f25a96428927cf5b3d82980b5464d820 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 13:50:51 +0100
Subject: set 'display to the image caption if we have one

---
 lisp/mastodon-tl.el | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b74ac84..aac5761 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1022,21 +1022,29 @@ message is a link which unhides/hides the main body."
          (media-string
           (mapconcat
            (lambda (media-attachement)
-             (let ((preview-url
-                    (alist-get 'preview_url media-attachement))
-                   (remote-url
-                    (or (alist-get 'remote_url media-attachement)
-                        ;; fallback b/c notifications don't have remote_url
-                        (alist-get 'url media-attachement)))
-                   (type (alist-get 'type media-attachement))
-                   (caption (alist-get 'description media-attachement)))
+             (let* ((preview-url
+                     (alist-get 'preview_url media-attachement))
+                    (remote-url
+                     (or (alist-get 'remote_url media-attachement)
+                         ;; fallback b/c notifications don't have remote_url
+                         (alist-get 'url media-attachement)))
+                    (type (alist-get 'type media-attachement))
+                    (caption (alist-get 'description media-attachement))
+                    (display-str (if caption
+                                     (concat "Media:: " caption)
+                                   (concat "Media:: " preview-url))))
                (if mastodon-tl--display-media-p
                    (mastodon-media--get-media-link-rendering
                     preview-url remote-url type caption) ; 2nd arg for shr-browse-url
                  (concat
                   (mastodon-tl--propertize-img-str-or-url
-                   (concat "Media:: " preview-url)
-                   preview-url remote-url type caption nil 'shr-link)
+                   (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"))))
            media-attachements "")))
     (if (not (and mastodon-tl--display-media-p
-- 
cgit v1.2.3


From 3717b6cb86c8d0037ca49d4f500a44560c9ac5ae Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 16:19:19 +0100
Subject: refactor tl--media-attachment + customize to display caption not URL

---
 lisp/mastodon-tl.el | 70 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 29 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index aac5761..d907915 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -107,6 +107,13 @@ By default fixed width fonts are used."
   :type '(boolean :tag "Enable using proportional rather than fixed \
 width fonts when rendering HTML text"))
 
+(defcustom mastodon-tl--display-caption-not-url-when-no-media t
+  "Display an image's caption rather than URL.
+Only has an effect when `mastodon-tl--display-media-p' is set to
+nil."
+  :group 'mastodon-tl
+  :type 'boolean)
+
 (defvar-local mastodon-tl--buffer-spec nil
   "A unique identifier and functions for each Mastodon buffer.")
 
@@ -1018,40 +1025,45 @@ message is a link which unhides/hides the main body."
 
 (defun mastodon-tl--media (toot)
   "Retrieve a media attachment link for TOOT if one exists."
-  (let* ((media-attachements (mastodon-tl--field 'media_attachments toot))
-         (media-string
-          (mapconcat
-           (lambda (media-attachement)
-             (let* ((preview-url
-                     (alist-get 'preview_url media-attachement))
-                    (remote-url
-                     (or (alist-get 'remote_url media-attachement)
-                         ;; fallback b/c notifications don't have remote_url
-                         (alist-get 'url media-attachement)))
-                    (type (alist-get 'type media-attachement))
-                    (caption (alist-get 'description media-attachement))
-                    (display-str (if caption
-                                     (concat "Media:: " caption)
-                                   (concat "Media:: " preview-url))))
-               (if mastodon-tl--display-media-p
-                   (mastodon-media--get-media-link-rendering
-                    preview-url remote-url type caption) ; 2nd arg for shr-browse-url
-                 (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"))))
-           media-attachements "")))
+  (let* ((media-attachments (mastodon-tl--field 'media_attachments toot))
+         (media-string (mapconcat #'mastodon-tl--media-attachment
+                                  media-attachments "")))
     (if (not (and mastodon-tl--display-media-p
                   (string-empty-p media-string)))
         (concat "\n" media-string)
       "")))
 
+(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)
   "Propertize an media placeholder string \"[img]\" or media URL.
-- 
cgit v1.2.3


From e3e3dc0227f8fd83c53a611bfb63c37595cd35cf Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 19:53:37 +0100
Subject: filter user posts by language. NB: we flip mastodon-iso-639-1!

---
 lisp/mastodon-iso.el  | 370 +++++++++++++++++++++++++-------------------------
 lisp/mastodon-tl.el   |  89 ++++++++----
 lisp/mastodon-toot.el |  11 +-
 3 files changed, 251 insertions(+), 219 deletions(-)

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

diff --git a/lisp/mastodon-iso.el b/lisp/mastodon-iso.el
index 8baff3c..341593c 100644
--- a/lisp/mastodon-iso.el
+++ b/lisp/mastodon-iso.el
@@ -33,191 +33,191 @@
 ;; https://github.com/Shinmera/language-codes/blob/master/data/iso-639-3.lisp
 
 (defvar mastodon-iso-639-1
-  '(("ab" "Abkhazian")
-    ("aa" "Afar")
-    ("af" "Afrikaans")
-    ("ak" "Akan")
-    ("sq" "Albanian")
-    ("am" "Amharic")
-    ("ar" "Arabic")
-    ("an" "Aragonese")
-    ("hy" "Armenian")
-    ("as" "Assamese")
-    ("av" "Avaric")
-    ("ae" "Avestan")
-    ("ay" "Aymara")
-    ("az" "Azerbaijani")
-    ("bm" "Bambara")
-    ("ba" "Bashkir")
-    ("eu" "Basque")
-    ("be" "Belarusian")
-    ("bn" "Bengali")
-    ("bh" "Bihari languages")
-    ("bi" "Bislama")
-    ("bs" "Bosnian")
-    ("br" "Breton")
-    ("bg" "Bulgarian")
-    ("my" "Burmese")
-    ("km" "Central Khmer")
-    ("ch" "Chamorro")
-    ("ce" "Chechen")
-    ("zh" "Chinese")
-    ("cv" "Chuvash")
-    ("kw" "Cornish")
-    ("co" "Corsican")
-    ("cr" "Cree")
-    ("hr" "Croatian")
-    ("cs" "Czech")
-    ("da" "Danish")
-    ("dz" "Dzongkha")
-    ("en" "English")
-    ("eo" "Esperanto")
-    ("et" "Estonian")
-    ("ee" "Ewe")
-    ("fo" "Faroese")
-    ("fj" "Fijian")
-    ("fi" "Finnish")
-    ("nl" "Dutch" "Flemish")
-    ("fr" "French")
-    ("ff" "Fulah")
-    ("gl" "Galician")
-    ("lg" "Ganda")
-    ("ka" "Georgian")
-    ("de" "German")
-    ("el" "Greek")
-    ("gn" "Guarani")
-    ("gu" "Gujarati")
-    ("ht" "Haitian" "Haitian Creole")
-    ("ha" "Hausa")
-    ("he" "Hebrew")
-    ("hz" "Herero")
-    ("hi" "Hindi")
-    ("ho" "Hiri Motu")
-    ("hu" "Hungarian")
-    ("is" "Icelandic")
-    ("io" "Ido")
-    ("ig" "Igbo")
-    ("id" "Indonesian")
-    ("ia" "Interlingua" "Interlingua (International Auxiliary Language Association)")
-    ("iu" "Inuktitut")
-    ("ik" "Inupiaq")
-    ("ga" "Irish")
-    ("it" "Italian")
-    ("ja" "Japanese")
-    ("jp" "Japanese")
-    ("jv" "Javanese")
-    ("kl" "Kalaallisut" "Greenlandic")
-    ("kn" "Kannada")
-    ("kr" "Kanuri")
-    ("ks" "Kashmiri")
-    ("kk" "Kazakh")
-    ("ki" "Kikuyu" "Gikuyu")
-    ("rw" "Kinyarwanda")
-    ("kv" "Komi")
-    ("kg" "Kongo")
-    ("ko" "Korean")
-    ("ku" "Kurdish")
-    ("kj" "Kuanyama" "Kwanyama")
-    ("ky" "Kirghiz" "Kyrgyz")
-    ("lo" "Lao")
-    ("la" "Latin")
-    ("lv" "Latvian")
-    ("li" "Limburgan" "Limburger" "Limburgish")
-    ("ln" "Lingala")
-    ("lt" "Lithuanian")
-    ("lu" "Luba-Katanga")
-    ("lb" "Luxembourgish" "Letzeburgesch")
-    ("mk" "Macedonian")
-    ("mg" "Malagasy")
-    ("ms" "Malay")
-    ("ml" "Malayalam")
-    ("dv" "Divehi" "Dhivehi" "Maldivian")
-    ("mt" "Maltese")
-    ("gv" "Manx")
-    ("mi" "Maori")
-    ("mr" "Marathi")
-    ("mh" "Marshallese")
-    ("mn" "Mongolian")
-    ("na" "Nauru")
-    ("nv" "Navajo" "Navaho")
-    ("ng" "Ndonga")
-    ("ne" "Nepali")
-    ("nd" "Ndebele, North" "North Ndebele")
-    ("se" "Northern Sami")
-    ("no" "Norwegian")
-    ("nb" "Bokmål, Norwegian" "Norwegian Bokmål")
-    ("ny" "Chichewa" "Chewa" "Nyanja")
-    ("nn" "Norwegian Nynorsk" "Nynorsk, Norwegian")
-    ("ie" "Interlingue" "Occidental")
-    ("oc" "Occitan")
-    ("oj" "Ojibwa")
-    ("cu" "Church Slavic" "Old Slavonic" "Church Slavonic" "Old Bulgarian" "Old Church Slavonic")
-    ("or" "Oriya")
-    ("om" "Oromo")
-    ("os" "Ossetian" "Ossetic")
-    ("pi" "Pali")
-    ("fa" "Persian")
-    ("pl" "Polish")
-    ("pt" "Portuguese")
-    ("pa" "Panjabi" "Punjabi")
-    ("ps" "Pushto" "Pashto")
-    ("qu" "Quechua")
-    ("ro" "Romanian" "Moldavian" "Moldovan")
-    ("rm" "Romansh")
-    ("rn" "Rundi")
-    ("ru" "Russian")
-    ("sm" "Samoan")
-    ("sg" "Sango")
-    ("sa" "Sanskrit")
-    ("sc" "Sardinian")
-    ("gd" "Gaelic" "Scottish Gaelic")
-    ("sr" "Serbian")
-    ("sn" "Shona")
-    ("ii" "Sichuan Yi" "Nuosu")
-    ("sd" "Sindhi")
-    ("si" "Sinhala" "Sinhalese")
-    ("sk" "Slovak")
-    ("sl" "Slovenian")
-    ("so" "Somali")
-    ("st" "Sotho, Southern")
-    ("nr" "Ndebele, South" "South Ndebele")
-    ("es" "Spanish" "Castilian")
-    ("su" "Sundanese")
-    ("sw" "Swahili")
-    ("ss" "Swati")
-    ("sv" "Swedish")
-    ("tl" "Tagalog")
-    ("ty" "Tahitian")
-    ("tg" "Tajik")
-    ("ta" "Tamil")
-    ("tt" "Tatar")
-    ("te" "Telugu")
-    ("th" "Thai")
-    ("bo" "Tibetan")
-    ("ti" "Tigrinya")
-    ("to" "Tonga (Tonga Islands)")
-    ("ts" "Tsonga")
-    ("tn" "Tswana")
-    ("tr" "Turkish")
-    ("tk" "Turkmen")
-    ("tw" "Twi")
-    ("uk" "Ukrainian")
-    ("ur" "Urdu")
-    ("ug" "Uighur" "Uyghur")
-    ("uz" "Uzbek")
-    ("ca" "Catalan" "Valencian")
-    ("ve" "Venda")
-    ("vi" "Vietnamese")
-    ("vo" "Volapük")
-    ("wa" "Walloon")
-    ("cy" "Welsh")
-    ("fy" "Western Frisian")
-    ("wo" "Wolof")
-    ("xh" "Xhosa")
-    ("yi" "Yiddish")
-    ("yo" "Yoruba")
-    ("za" "Zhuang" "Chuang")
-    ("zu" "Zulu")))
+  '(("Abkhazian" . "ab")
+    ("Afar" . "aa")
+    ("Afrikaans" . "af")
+    ("Akan" . "ak")
+    ("Albanian" . "sq")
+    ("Amharic" . "am")
+    ("Arabic" . "ar")
+    ("Aragonese" . "an")
+    ("Armenian" . "hy")
+    ("Assamese" . "as")
+    ("Avaric" . "av")
+    ("Avestan" . "ae")
+    ("Aymara" . "ay")
+    ("Azerbaijani" . "az")
+    ("Bambara" . "bm")
+    ("Bashkir" . "ba")
+    ("Basque" . "eu")
+    ("Belarusian" . "be")
+    ("Bengali" . "bn")
+    ("Bihari languages" . "bh")
+    ("Bislama" . "bi")
+    ("Bosnian" . "bs")
+    ("Breton" . "br")
+    ("Bulgarian" . "bg")
+    ("Burmese" . "my")
+    ("Central Khmer" . "km")
+    ("Chamorro" . "ch")
+    ("Chechen" . "ce")
+    ("Chinese" . "zh")
+    ("Chuvash" . "cv")
+    ("Cornish" . "kw")
+    ("Corsican" . "co")
+    ("Cree" . "cr")
+    ("Croatian" . "hr")
+    ("Czech" . "cs")
+    ("Danish" . "da")
+    ("Dzongkha" . "dz")
+    ("English" . "en")
+    ("Esperanto" . "eo")
+    ("Estonian" . "et")
+    ("Ewe" . "ee")
+    ("Faroese" . "fo")
+    ("Fijian" . "fj")
+    ("Finnish" . "fi")
+    ("Dutch" . "nl")
+    ("French" . "fr")
+    ("Fulah" . "ff")
+    ("Galician" . "gl")
+    ("Ganda" . "lg")
+    ("Georgian" . "ka")
+    ("German" . "de")
+    ("Greek" . "el")
+    ("Guarani" . "gn")
+    ("Gujarati" . "gu")
+    ("Haitian" . "ht")
+    ("Hausa" . "ha")
+    ("Hebrew" . "he")
+    ("Herero" . "hz")
+    ("Hindi" . "hi")
+    ("Hiri Motu" . "ho")
+    ("Hungarian" . "hu")
+    ("Icelandic" . "is")
+    ("Ido" . "io")
+    ("Igbo" . "ig")
+    ("Indonesian" . "id")
+    ("Interlingua" . "ia")
+    ("Inuktitut" . "iu")
+    ("Inupiaq" . "ik")
+    ("Irish" . "ga")
+    ("Italian" . "it")
+    ("Japanese" . "ja")
+    ("Japanese" . "jp")
+    ("Javanese" . "jv")
+    ("Kalaallisut" . "kl")
+    ("Kannada" . "kn")
+    ("Kanuri" . "kr")
+    ("Kashmiri" . "ks")
+    ("Kazakh" . "kk")
+    ("Kikuyu" . "ki")
+    ("Kinyarwanda" . "rw")
+    ("Komi" . "kv")
+    ("Kongo" . "kg")
+    ("Korean" . "ko")
+    ("Kurdish" . "ku")
+    ("Kuanyama" . "kj")
+    ("Kirghiz" . "ky")
+    ("Lao" . "lo")
+    ("Latin" . "la")
+    ("Latvian" . "lv")
+    ("Limburgan" . "li")
+    ("Lingala" . "ln")
+    ("Lithuanian" . "lt")
+    ("Luba-Katanga" . "lu")
+    ("Luxembourgish" . "lb")
+    ("Macedonian" . "mk")
+    ("Malagasy" . "mg")
+    ("Malay" . "ms")
+    ("Malayalam" . "ml")
+    ("Divehi" . "dv")
+    ("Maltese" . "mt")
+    ("Manx" . "gv")
+    ("Maori" . "mi")
+    ("Marathi" . "mr")
+    ("Marshallese" . "mh")
+    ("Mongolian" . "mn")
+    ("Nauru" . "na")
+    ("Navajo" . "nv")
+    ("Ndonga" . "ng")
+    ("Nepali" . "ne")
+    ("Ndebele, North" . "nd")
+    ("Northern Sami" . "se")
+    ("Norwegian" . "no")
+    ("Bokmål, Norwegian" . "nb")
+    ("Chichewa" . "ny")
+    ("Norwegian Nynorsk" . "nn")
+    ("Interlingue" . "ie")
+    ("Occitan" . "oc")
+    ("Ojibwa" . "oj")
+    ("Church Slavic" . "cu")
+    ("Oriya" . "or")
+    ("Oromo" . "om")
+    ("Ossetian" . "os")
+    ("Pali" . "pi")
+    ("Persian" . "fa")
+    ("Polish" . "pl")
+    ("Portuguese" . "pt")
+    ("Panjabi" . "pa")
+    ("Pushto" . "ps")
+    ("Quechua" . "qu")
+    ("Romanian" . "ro")
+    ("Romansh" . "rm")
+    ("Rundi" . "rn")
+    ("Russian" . "ru")
+    ("Samoan" . "sm")
+    ("Sango" . "sg")
+    ("Sanskrit" . "sa")
+    ("Sardinian" . "sc")
+    ("Gaelic" . "gd")
+    ("Serbian" . "sr")
+    ("Shona" . "sn")
+    ("Sichuan Yi" . "ii")
+    ("Sindhi" . "sd")
+    ("Sinhala" . "si")
+    ("Slovak" . "sk")
+    ("Slovenian" . "sl")
+    ("Somali" . "so")
+    ("Sotho, Southern" . "st")
+    ("Ndebele, South" . "nr")
+    ("Spanish" . "es")
+    ("Sundanese" . "su")
+    ("Swahili" . "sw")
+    ("Swati" . "ss")
+    ("Swedish" . "sv")
+    ("Tagalog" . "tl")
+    ("Tahitian" . "ty")
+    ("Tajik" . "tg")
+    ("Tamil" . "ta")
+    ("Tatar" . "tt")
+    ("Telugu" . "te")
+    ("Thai" . "th")
+    ("Tibetan" . "bo")
+    ("Tigrinya" . "ti")
+    ("Tonga (Tonga Islands)" . "to")
+    ("Tsonga" . "ts")
+    ("Tswana" . "tn")
+    ("Turkish" . "tr")
+    ("Turkmen" . "tk")
+    ("Twi" . "tw")
+    ("Ukrainian" . "uk")
+    ("Urdu" . "ur")
+    ("Uighur" . "ug")
+    ("Uzbek" . "uz")
+    ("Catalan" . "ca")
+    ("Venda" . "ve")
+    ("Vietnamese" . "vi")
+    ("Volapük" . "vo")
+    ("Walloon" . "wa")
+    ("Welsh" . "cy")
+    ("Western Frisian" . "fy")
+    ("Wolof" . "wo")
+    ("Xhosa" . "xh")
+    ("Yiddish" . "yi")
+    ("Yoruba" . "yo")
+    ("Zhuang" . "za")
+    ("Zulu" . "zu")))
 
 ;; web UI doesn't respect these for now
 (defvar mastodon-iso-639-regional
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 1a726c4..dd3ce1b 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -36,6 +36,7 @@
 (require 'thingatpt) ; for word-at-point
 (require 'time-date)
 (require 'cl-lib)
+(require 'mastodon-iso)
 
 (require 'mpv nil :no-error)
 
@@ -2079,16 +2080,18 @@ IND is the optional indentation level to print at."
 
 ;;; FOLLOW/BLOCK/MUTE, ETC
 
-(defun mastodon-tl--follow-user (user-handle &optional notify)
+(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.
 If NOTIFY is \"false\", disable notifications when that user posts.
-Can be called to toggle NOTIFY on users already being followed."
+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")))
   (mastodon-tl--do-if-toot
-   (mastodon-tl--do-user-action-and-response user-handle "follow" nil notify)))
+   (mastodon-tl--do-user-action-and-response
+    user-handle "follow" nil notify langs)))
 
 (defun mastodon-tl--enable-notify-user-posts (user-handle)
   "Query for USER-HANDLE and enable notifications when they post."
@@ -2105,6 +2108,31 @@ Can be called to toggle NOTIFY on users already being followed."
     (mastodon-tl--interactive-user-handles-get "disable")))
   (mastodon-tl--follow-user user-handle "false"))
 
+(defun mastodon-tl--filter-user-user-posts-by-language (user-handle)
+  "Query for USER-HANDLE and enable notifications when they post."
+  (interactive
+   (list
+    (mastodon-tl--interactive-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))))
+
+(defun mastodon-tl--read-filter-langs (&optional langs)
+  "Read language choices and return an alist array parameter.
+LANGS is the accumulated array param alist if we re-run recursively."
+  (let* ((langs-alist langs)
+         (choice (completing-read "Filter user's posts by language: "
+                                  mastodon-iso-639-1)))
+    (when choice
+      (setq langs-alist
+            (push `("languages[]" . ,(alist-get choice mastodon-iso-639-1
+                                                nil nil
+                                                #'string=))
+                  langs-alist))
+      (if (y-or-n-p "Filter by another language? ")
+          (mastodon-tl--read-filter-langs langs-alist)
+        langs-alist))))
+
 (defun mastodon-tl--unfollow-user (user-handle)
   "Query for USER-HANDLE from current status and unfollow that user."
   (interactive
@@ -2197,12 +2225,13 @@ Action must be either \"unblock\" or \"unmute\"."
                        nil ; predicate
                        t))))
 
-(defun mastodon-tl--do-user-action-and-response (user-handle action &optional negp notify)
+(defun mastodon-tl--do-user-action-and-response (user-handle action &optional negp notify langs)
   "Do ACTION on user USER-HANDLE.
 NEGP is whether the action involves un-doing something.
 If NOTIFY is \"true\", enable notifications when that user posts.
 If NOTIFY is \"false\", disable notifications when that user posts.
-NOTIFY is only non-nil when called by `mastodon-tl--follow-user'."
+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
@@ -2218,35 +2247,41 @@ NOTIFY is only non-nil when called by `mastodon-tl--follow-user'."
          (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)))
-         (url (mastodon-http--api
-               (if notify
-                   (format "accounts/%s/%s?notify=%s" user-id action notify)
-                 (format "accounts/%s/%s" user-id action)))))
+         (args (cond (notify
+                      `(("notify" . ,notify)))
+                     (langs langs)
+                     (t nil)))
+         (url (mastodon-http--api (format "accounts/%s/%s" user-id action))))
     (if account
         (if (equal action "follow") ; y-or-n for all but follow
-            (mastodon-tl--do-user-action-function url name user-handle action notify)
+            (mastodon-tl--do-user-action-function url name user-handle action notify args)
           (when (y-or-n-p (format "%s user %s? " action name))
-            (mastodon-tl--do-user-action-function url name user-handle action)))
+            (mastodon-tl--do-user-action-function url name user-handle action args)))
       (message "Cannot find a user with handle %S" user-handle))))
 
-(defun mastodon-tl--do-user-action-function (url name user-handle action &optional notify)
+(defun mastodon-tl--do-user-action-function (url name user-handle action &optional notify args)
   "Post ACTION on user NAME/USER-HANDLE to URL.
 NOTIFY is either \"true\" or \"false\", and used when we have been called
-by `mastodon-tl--follow-user' to enable or disable notifications."
-  (let ((response (mastodon-http--post url)))
-    (mastodon-http--triage response
-                           (lambda ()
-                             (cond ((string-equal notify "true")
-                                    (message "Receiving notifications for user %s (@%s)!"
-                                             name user-handle))
-                                   ((string-equal notify "false")
-                                    (message "Not receiving notifications for user %s (@%s)!"
-                                             name user-handle))
-                                   ((or (string-equal action "mute")
-                                        (string-equal action "unmute"))
-                                    (message "User %s (@%s) %sd!" name user-handle action))
-                                   ((eq notify nil)
-                                    (message "User %s (@%s) %sed!" name user-handle action)))))))
+by `mastodon-tl--follow-user' to enable or disable notifications.
+ARGS is an alist of any parameters to send with the request."
+  (let ((response (mastodon-http--post url args)))
+    (mastodon-http--triage
+     response
+     (lambda ()
+       (cond ((string-equal notify "true")
+              (message "Receiving notifications for user %s (@%s)!"
+                       name user-handle))
+             ((string-equal notify "false")
+              (message "Not receiving notifications for user %s (@%s)!"
+                       name user-handle))
+             ((or (string-equal action "mute")
+                  (string-equal action "unmute"))
+              (message "User %s (@%s) %sd!" name user-handle action))
+             ((assoc "languages[]" args #'equal)
+              (message "User %s filtered by language(s): %s" name
+                       (mapconcat #'cdr args " ")))
+             ((eq notify nil)
+              (message "User %s (@%s) %sed!" name user-handle action)))))))
 
 ;; FOLLOW TAGS
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 59a3813..21bfe96 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1117,14 +1117,11 @@ LENGTH is the maximum character length allowed for a poll option."
 (defun mastodon-toot--set-toot-lang ()
   "Prompt for a language and return its two letter ISO 639 1 code."
   (interactive)
-  (let* ((langs (mapcar (lambda (x)
-                          (cons (cadr x)
-                                (car x)))
-                        mastodon-iso-639-1))
-         (choice (completing-read "Language for this toot: "
-                                  langs)))
+  (let* ((choice (completing-read "Language for this toot: "
+                                  mastodon-iso-639-1)))
     (setq mastodon-toot--language
-          (alist-get choice langs nil nil 'equal))))
+          (alist-get choice mastodon-iso-639-1 nil nil 'equal))
+    (message "Language set to %s" choice)))
 
 ;; we'll need to revisit this if the binds get
 ;; more diverse than two-chord bindings
-- 
cgit v1.2.3


From 0c889fd275b8338aed5f173f0a7df78e23801b92 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 09:34:20 +0100
Subject: paginate profile view followers/following with link header

---
 lisp/mastodon-profile.el | 36 ++++++++++++++++++++++++++----------
 lisp/mastodon-tl.el      | 23 +++++++++++++++--------
 2 files changed, 41 insertions(+), 18 deletions(-)

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

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 3ba00b9..658b1d4 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -71,6 +71,9 @@
 (autoload 'mastodon-tl--get-endpoint "mastodon-tl.el")
 (autoload 'mastodon-toot--get-max-toot-chars "mastodon-toot")
 (autoload 'mastodon-tl--add-account-to-list "mastodon-tl")
+(autoload 'mastodon-http--get-response "mastodon-http")
+(autoload 'mastodon-tl--get-link-header-from-response "mastodon-tl")
+(autoload 'mastodon-tl--set-buffer-spec "mastodon-tl")
 
 (defvar mastodon-instance-url)
 (defvar mastodon-tl--buffer-spec)
@@ -186,7 +189,9 @@ 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--add-author-bylines
+       nil
+       :headers)
     (error "Not in a mastodon profile")))
 
 (defun mastodon-profile--open-followers ()
@@ -196,7 +201,9 @@ 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--add-author-bylines
+       nil
+       :headers)
     (error "Not in a mastodon profile")))
 
 (defun mastodon-profile--view-favourites ()
@@ -552,16 +559,25 @@ FIELDS means provide a fields vector fetched by other means."
 
 (defun mastodon-profile--make-profile-buffer-for (account endpoint-type
                                                           update-function
-                                                          &optional no-reblogs)
+                                                          &optional no-reblogs headers)
   "Display profile of ACCOUNT, using ENDPOINT-TYPE and UPDATE-FUNCTION.
-NO-REBLOGS means do not display boosts in statuses."
+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 (when no-reblogs '(("exclude_reblogs" . "t"))))
          (url (mastodon-http--api (format "accounts/%s/%s" id endpoint-type)))
          (acct (mastodon-profile--account-field account 'acct))
          (buffer (concat "*mastodon-" acct "-" endpoint-type  "*"))
+         (response (if headers
+                       (mastodon-http--get-response url args)
+                     (mastodon-http--get-json url args)))
+         (json (if headers (car response) response))
+         (endpoint (format "accounts/%s/%s" id endpoint-type))
+         (link-header (when headers
+                        (mastodon-tl--get-link-header-from-response
+                         (cdr response))))
+
          (note (mastodon-profile--account-field account 'note))
-         (json (mastodon-http--get-json url args))
          (locked (mastodon-profile--account-field account 'locked))
          (followers-count (mastodon-tl--as-string
                            (mastodon-profile--account-field
@@ -585,11 +601,11 @@ NO-REBLOGS means do not display boosts in statuses."
       (switch-to-buffer buffer)
       (mastodon-mode)
       (mastodon-profile-mode)
-      (setq mastodon-profile--account account
-            mastodon-tl--buffer-spec
-            `(buffer-name ,buffer
-                          endpoint ,(format "accounts/%s/%s" id endpoint-type)
-                          update-function ,update-function))
+      (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"))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 1a726c4..a87cd73 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -136,10 +136,6 @@ If nil `(point-min)' is used instead.")
 (defvar-local mastodon-tl--timestamp-update-timer nil
   "The timer that, when set will scan the buffer to update the timestamps.")
 
-(defvar mastodon-tl--link-header-buffers
-  '("*mastodon-favourites*" "*mastodon-bookmarks*")
-  "A list of buffers that use link headers for pagination.")
-
 ;; KEYMAPS
 
 (defvar mastodon-tl--link-keymap
@@ -2327,11 +2323,22 @@ For use after e.g. deleting a toot."
          (param (cadr split)))
     (concat url-base "&" param)))
 
+(defun mastodon-tl--use-link-header-p ()
+  "Return t if we are in a view that uses Link header pagination.
+Currently this includes favourites, bookmarks, and profile pages
+when showing followers or accounts followed."
+  (let ((buf (buffer-name (current-buffer)))
+        (endpoint (mastodon-tl--get-endpoint)))
+    (or (member buf '("*mastodon-favourites*" "*mastodon-bookmarks*"))
+        (and (string-prefix-p "accounts" endpoint)
+             (or (string-suffix-p "followers" endpoint)
+                 (string-suffix-p "following" endpoint))))))
+
 (defun mastodon-tl--more ()
   "Append older toots to timeline, asynchronously."
   (interactive)
   (message "Loading older toots...")
-  (if (member (buffer-name (current-buffer)) mastodon-tl--link-header-buffers)
+  (if (mastodon-tl--use-link-header-p)
       ;; link-header: can't build a URL with --more-json-async, endpoint/id:
       (let* ((next (car (mastodon-tl--link-header)))
              ;;(prev (cadr (mastodon-tl--link-header)))
@@ -2532,7 +2539,7 @@ from the start if it is nil."
   "Initialize BUFFER-NAME with timeline targeted by ENDPOINT asynchronously.
 UPDATE-FUNCTION is used to recieve more toots.
 HEADERS means to also collect the response headers. Used for paginating
-favourites."
+favourites and bookmarks."
   (let ((url (mastodon-http--api endpoint))
         (buffer (concat "*mastodon-" buffer-name "*")))
     (if headers
@@ -2545,8 +2552,8 @@ favourites."
   "Initialize BUFFER with timeline targeted by ENDPOINT.
 UPDATE-FUNCTION is used to recieve more toots.
 RESPONSE is the data returned from the server by
-`mastodon-http--process-json', a cons cell of JSON and http
-headers."
+`mastodon-http--process-json', with arg HEADERS a cons cell of
+JSON and http headers, without it just the JSON."
   (let* ((json (if headers (car response) response))
          (headers (if headers (cdr response) nil))
          (link-header (mastodon-tl--get-link-header-from-response headers)))
-- 
cgit v1.2.3


From 14b7547c385648565eba8a4bac3dc8afa5ebf978 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 10:44:45 +0100
Subject: use homegrown icons in tl--symbols list

---
 lisp/mastodon-tl.el | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 1a26a54..7477b25 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -106,30 +106,22 @@ width fonts when rendering HTML text"))
   :group 'mastodon-tl
   :type '(boolean :tag "Whether to display user avatars in timelines"))
 
-;; Various symbols using throughout timeline
-;; Default comes from nerd-font (www.nerdfonts.com)
-(defcustom mastodon-tl-symbols
-  '(;; See https://icon-sets.iconify.design/octicon/comment-24/
-    (reply     . ("" . "R"))
-    ;; See https://icon-sets.iconify.design/octicon/reply-24/
-    (boost     . ("" . "B"))
-    ;; See https://icon-sets.iconify.design/octicon/star-fill-24/
-    (favourite . ("" . "F"))
-    ;; See https://icon-sets.iconify.design/octicon/bookmark-24/
-    (bookmark  . ("" . "K"))
-    ;; See https://icon-sets.iconify.design/octicon/file-media-24/
-    (media     . ("" . "M"))
-    ;; See https://icon-sets.iconify.design/octicon/verified-24/
-    (verified  . ("" . "V"))
-    ;; See https://icon-sets.iconify.design/octicon/person-fill-24/
-    (private   . ("" . "P"))
-    ;; See https://icon-sets.iconify.design/octicon/location-24/
-    (direct    . ("" . "D")))
-  "Set of symbols (or strings) to be used in timeline. If a symbol does not look right (tofu), it means your font settings do not support it."
+(defcustom mastodon-tl--symbols
+  '((reply     . ("💬" . "R"))
+    (boost     . ("🔁" . "B"))
+    (favourite . ("⭐" . "F"))
+    (bookmark  . ("🔖" . "K"))
+    (media     . ("" . "M"))
+    (verified  . ("" . "V"))
+    (private   . ("🔒" . "P"))
+    (direct    . ("✉" . "D"))
+    (edited    . ("✍" . "E")))
+  "A set of symbols (and fallback strings) to be used in timeline.
+If a symbol does not look right (tofu), it means your
+font settings do not support it."
   :type '(alist :key-type symbol :value-type string)
   :group 'mastodon-tl)
 
-
 (defvar-local mastodon-tl--update-point nil
   "When updating a mastodon buffer this is where new toots will be inserted.
 
@@ -226,14 +218,12 @@ It is active where point is placed by `mastodon-tl--goto-next-toot.'")
 
 (defun mastodon-tl--symbol (name)
   "Return the unicode symbol (as a string) corresponding to NAME.
-
 If symbol is not displayable, an ASCII equivalent is returned. If
 NAME is not part of the symbol table, '?' is returned."
-
-  (if-let* ((symbol (alist-get name mastodon-tl-symbols)))
-    (if (char-displayable-p (string-to-char (car symbol)))
-        (car symbol)
-      (cdr symbol))
+  (if-let* ((symbol (alist-get name mastodon-tl--symbols)))
+      (if (char-displayable-p (string-to-char (car symbol)))
+          (car symbol)
+        (cdr symbol))
     "?"))
 
 
-- 
cgit v1.2.3


From 8448f28c129662625e5c4beb98592fb9ef06032a Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 10:58:14 +0100
Subject: cleanup --symbols, autoload

---
 lisp/mastodon-profile.el |  5 ++---
 lisp/mastodon-tl.el      | 38 +++++++-------------------------------
 2 files changed, 9 insertions(+), 34 deletions(-)

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

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 658b1d4..c275e5c 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -74,6 +74,7 @@
 (autoload 'mastodon-http--get-response "mastodon-http")
 (autoload 'mastodon-tl--get-link-header-from-response "mastodon-tl")
 (autoload 'mastodon-tl--set-buffer-spec "mastodon-tl")
+(autoload 'mastodon-tl--symbol "mastodon-tl")
 
 (defvar mastodon-instance-url)
 (defvar mastodon-tl--buffer-spec)
@@ -628,9 +629,7 @@ HEADERS means also fetch link headers for pagination."
            (propertize (concat "@" acct)
                        'face 'default)
            (if (equal locked t)
-               (if (fontp (char-displayable-p #10r9993))
-                   " 🔒"
-                 " [locked]")
+               (mastodon-tl--symbol 'locked)
              "")
            "\n ------------\n"
            ;; profile note:
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 1a5fc33..8c9e00a 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -129,9 +129,10 @@ nil."
     (bookmark  . ("🔖" . "K"))
     (media     . ("" . "M"))
     (verified  . ("" . "V"))
-    (private   . ("🔒" . "P"))
-    (direct    . ("✉" . "D"))
-    (edited    . ("✍" . "E")))
+    (locked    . ("🔒" . "[locked]"))
+    (private   . ("🔒" . "[followers]"))
+    (direct    . ("✉" . "[direct]"))
+    (edited    . ("✍" . "[edited]")))
   "A set of symbols (and fallback strings) to be used in timeline.
 If a symbol does not look right (tofu), it means your
 font settings do not support it."
@@ -629,7 +630,6 @@ this just means displaying toot client."
          (faved (equal 't (mastodon-tl--field 'favourited toot)))
          (boosted (equal 't (mastodon-tl--field 'reblogged toot)))
          (bookmarked (equal 't (mastodon-tl--field 'bookmarked toot)))
-         (bookmark-str (mastodon-tl--symbol 'bookmark))
          (visibility (mastodon-tl--field 'visibility toot))
          (account (alist-get 'account toot))
          (avatar-url (alist-get 'avatar account))
@@ -645,13 +645,13 @@ this just means displaying toot client."
      ;; the toot having just been favourited/boosted.
      (concat (when boosted
                (mastodon-tl--format-faved-or-boosted-byline
-                (mastodon-tl--return-boost-char)))
+                (mastodon-tl--symbol 'boost)))
              (when faved
                (mastodon-tl--format-faved-or-boosted-byline
-                (mastodon-tl--return-fave-char)))
+                (mastodon-tl--symbol 'favourite)))
              (when bookmarked
                (mastodon-tl--format-faved-or-boosted-byline
-                (mastodon-tl--return-bookmark-char))))
+                (mastodon-tl--symbol 'bookmark))))
      ;; we remove avatars from the byline also, so that they also do not mess
      ;; with `mastodon-tl--goto-next-toot':
      (when (and mastodon-tl--show-avatars
@@ -718,30 +718,6 @@ this just means displaying toot client."
                       (mastodon-toot--get-toot-edits (alist-get 'id toot)))
       'byline       t))))
 
-(defun mastodon-tl--return-boost-char ()
-  ""
-  (cond
-   ((fontp (char-displayable-p #10r128257))
-    "🔁")
-   (t
-    "B")))
-
-(defun mastodon-tl--return-fave-char ()
-  ""
-  (cond
-   ((fontp (char-displayable-p #10r11088))
-    "⭐")
-   ((fontp (char-displayable-p #10r9733))
-    "★")
-   (t
-    "F")))
-
-(defun mastodon-tl--return-bookmark-char ()
-  ""
-  (if (fontp (char-displayable-p #10r128278))
-      "🔖"
-    "K"))
-
 (defun mastodon-tl--format-edit-timestamp (timestamp)
   "Convert edit TIMESTAMP into a descriptive string."
   (let ((parsed (ts-human-duration
-- 
cgit v1.2.3


From 217af69c12d4472d308e2aec6cdd78045d70d97b Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 11:22:10 +0100
Subject: symbols: preceding space for locked accounts, private/direct toots

---
 lisp/mastodon-profile.el | 2 +-
 lisp/mastodon-tl.el      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index c275e5c..54f0e84 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -629,7 +629,7 @@ HEADERS means also fetch link headers for pagination."
            (propertize (concat "@" acct)
                        'face 'default)
            (if (equal locked t)
-               (mastodon-tl--symbol 'locked)
+               (concat " " (mastodon-tl--symbol 'locked))
              "")
            "\n ------------\n"
            ;; profile note:
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 8c9e00a..aa34c2e 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -667,9 +667,9 @@ this just means displaying toot client."
        (funcall author-byline toot)
        ;; visibility:
        (cond ((equal visibility "direct")
-              (mastodon-tl--symbol 'direct))
+              (concat " " (mastodon-tl--symbol 'direct)))
              ((equal visibility "private")
-              (mastodon-tl--symbol 'private)))
+              (concat " " (mastodon-tl--symbol 'private))))
        (funcall action-byline toot)
        " "
        ;; TODO: Once we have a view for toot (responses etc.) make
-- 
cgit v1.2.3


From 0bee7050dd608c33b599434e17ce9229ce8ea3a0 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 11:31:20 +0100
Subject: always use mastodon-tl--symbol

---
 lisp/mastodon-tl.el   |  6 +++---
 lisp/mastodon-toot.el | 38 ++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index aa34c2e..fc3dc2e 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -697,9 +697,9 @@ this just means displaying toot client."
 		          'keymap mastodon-tl--shr-map-replacement)))))
        (if edited-time
            (concat
-            (if (fontp (char-displayable-p #10r128274))
-                " ✍ "
-              " [edited] ")
+            " "
+            (mastodon-tl--symbol 'edited)
+            " "
             (propertize
              (format-time-string mastodon-toot-timestamp-format
                                  edited-parsed)
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 27e7ce5..c99f088 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -78,7 +78,7 @@
 (autoload 'mastodon-http--build-array-params-alist "mastodon-http")
 (autoload 'mastodon-tl--get-endpoint "mastodon-tl")
 (autoload 'mastodon-http--put "mastodon-http")
-(autoload 'mastodon-tl--return-fave-char "mastodon-tl")
+(autoload 'mastodon-tl--symbol "mastodon-tl")
 
 ;; for mastodon-toot--translate-toot-text
 (autoload 'mastodon-tl--content "mastodon-tl")
@@ -345,8 +345,8 @@ TYPE is a symbol, either 'favourite or 'boost."
                                       (list 'favourited-p (not faved))))
                (mastodon-toot--action-success
                 (if boost-p
-                    (mastodon-tl--return-boost-char)
-                  (mastodon-tl--return-fave-char))
+                    (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)))))
@@ -366,23 +366,21 @@ TYPE is a symbol, either 'favourite or 'boost."
   "Bookmark or unbookmark toot at point."
   (interactive)
   (let* ( ;(toot (mastodon-tl--property 'toot-json))
-          (id (mastodon-tl--property 'base-toot-id))
-          ;; (mastodon-tl--as-string (mastodon-tl--toot-id toot)))
-          (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))))
-          (action (if bookmarked-p "unbookmark" "bookmark"))
-          (bookmark-str (if (fontp (char-displayable-p #10r128278))
-                            "🔖"
-                          "K"))
-          (message (if bookmarked-p
-                       "Bookmark removed!"
-                     "Toot bookmarked!"))
-          (remove (when bookmarked-p t)))
+         (id (mastodon-tl--property 'base-toot-id))
+         ;; (mastodon-tl--as-string (mastodon-tl--toot-id toot)))
+         (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))))
+         (action (if bookmarked-p "unbookmark" "bookmark"))
+         (bookmark-str (mastodon-tl--symbol 'bookmark))
+         (message (if bookmarked-p
+                      "Bookmark removed!"
+                    "Toot bookmarked!"))
+         (remove (when bookmarked-p t)))
     (if byline-region
         (when (y-or-n-p prompt)
           (mastodon-toot--action
-- 
cgit v1.2.3


From 8ee5b29c10a128b8268ddac82c96154d9b0208c1 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 11:52:25 +0100
Subject: tl--symbol -- add media icon

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

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index fc3dc2e..ce2062d 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -127,7 +127,7 @@ nil."
     (boost     . ("🔁" . "B"))
     (favourite . ("⭐" . "F"))
     (bookmark  . ("🔖" . "K"))
-    (media     . ("" . "M"))
+    (media     . ("📹" . "[media]"))
     (verified  . ("" . "V"))
     (locked    . ("🔒" . "[locked]"))
     (private   . ("🔒" . "[followers]"))
-- 
cgit v1.2.3


From c6281d6579cdcae5d2e1200a35b4f09a4406496e Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 15:08:32 +0100
Subject: remove --view-author-profile, replace with --get-toot-author

---
 lisp/mastodon-profile.el | 8 --------
 lisp/mastodon-tl.el      | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

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

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 54f0e84..91103f1 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -737,14 +737,6 @@ 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--view-author-profile ()
-  "View the profile of author of present toot."
-  (interactive)
-  (let* ((toot-json (mastodon-tl--property 'toot-json))
-         (acct (alist-get 'account toot-json))
-         (handle (alist-get 'acct acct)))
-    (mastodon-profile--show-user handle)))
-
 (defun mastodon-profile--account-field (account field)
   "Return FIELD from the ACCOUNT.
 FIELD is used to identify regions under 'account"
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index ce2062d..dccf36a 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -254,7 +254,7 @@ types of mastodon links and not just shr.el-generated ones.")
   (when (require 'mpv nil :no-error)
     (let ((map (make-sparse-keymap)))
       (define-key map (kbd "<C-return>") 'mastodon-tl--mpv-play-video-from-byline)
-      (define-key map (kbd "<return>") 'mastodon-profile--view-author-profile)
+      (define-key map (kbd "<return>") 'mastodon-profile--get-toot-author)
       (keymap-canonicalize map)))
   "The keymap to be set for the author byline.
 It is active where point is placed by `mastodon-tl--goto-next-toot.'")
-- 
cgit v1.2.3


From 8c3f5435b977c04edbe86015ecdf7f9ba181e80e Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 15:20:02 +0100
Subject:  --set-buffer-spec everywhere(?) and include handle/instance url

set buffer spec in view instances description
---
 lisp/mastodon-profile.el |  9 ++++++++-
 lisp/mastodon-tl.el      | 13 +++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

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

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 91103f1..6dbe572 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -287,7 +287,8 @@ JSON is the data returned by the server."
 (defun mastodon-profile--update-user-profile-note ()
   "Fetch user's profile note and display for editing."
   (interactive)
-  (let* ((url (mastodon-http--api "accounts/verify_credentials"))
+  (let* ((endpoint "accounts/verify_credentials")
+         (url (mastodon-http--api endpoint))
          (json (mastodon-http--get-json url))
          (source (alist-get 'source json))
          (note (alist-get 'note source))
@@ -295,6 +296,9 @@ JSON is the data returned by the server."
          (inhibit-read-only t))
     (switch-to-buffer-other-window buffer)
     (text-mode)
+    (mastodon-tl--set-buffer-spec (buffer-name buffer)
+                                  endpoint
+                                  nil)
     (setq-local header-line-format
                 (propertize
                  "Edit your profile note. C-c C-c to send, C-c C-k to cancel."
@@ -497,6 +501,9 @@ This endpoint only holds a few preferences. For others, see
       (switch-to-buffer-other-window buf)
       (erase-buffer)
       (special-mode)
+      (mastodon-tl--set-buffer-spec (buffer-name buf)
+                                    "preferences"
+                                    nil)
       (let ((inhibit-read-only t))
         (while response
           (let ((el (pop response)))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index dccf36a..b019272 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1368,10 +1368,12 @@ BUFFER is buffer name, ENDPOINT is buffer's enpoint,
 UPDATE-FUNCTION is its update function.
 LINK-HEADER is the http Link header if present."
   (setq mastodon-tl--buffer-spec
-        `(buffer-name ,buffer
-                      endpoint ,endpoint
-                      update-function ,update-function
-                      link-header ,link-header)))
+        `(account ,(cons mastodon-active-user
+                         mastodon-instance-url)
+                  buffer-name ,buffer
+                  endpoint ,endpoint
+                  update-function ,update-function
+                  link-header ,link-header)))
 
 (defun mastodon-tl--more-json (endpoint id)
   "Return JSON for timeline ENDPOINT before ID."
@@ -1951,6 +1953,9 @@ INSTANCE is an instance domain name."
        (let ((buf (get-buffer-create "*mastodon-instance*")))
          (with-current-buffer buf
            (switch-to-buffer-other-window buf)
+           (mastodon-tl--set-buffer-spec (buffer-name buf)
+                                         "instance"
+                                         nil)
            (let ((inhibit-read-only t))
              (erase-buffer)
              (special-mode)
-- 
cgit v1.2.3


From 75896755e97a75523eb9e4a8aef3d30350c30299 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 15:31:38 +0100
Subject: no lambdas allowed in buffer-spec update-function!

---
 lisp/mastodon-profile.el | 1 -
 lisp/mastodon-tl.el      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 6dbe572..1200972 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -584,7 +584,6 @@ HEADERS means also fetch link headers for pagination."
          (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
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b019272..f02593c 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1453,7 +1453,7 @@ ID is that of the toot to view."
         (mastodon-mode)
         (mastodon-tl--set-buffer-spec buffer
                                       (format "statuses/%s" id)
-                                      (lambda (_toot) (message "END of thread.")))
+                                      nil)
         (let ((inhibit-read-only t))
           (mastodon-tl--toot toot :detailed-p))))))
 
@@ -1493,7 +1493,7 @@ ID is that of the toot to view."
                   (mastodon-tl--set-buffer-spec
                    buffer
                    (format "statuses/%s/context" id)
-                   (lambda (_toot) (message "END of thread.")))
+                   'mastodon-tl--thread)
                   (let ((inhibit-read-only t))
                     (mastodon-tl--timeline (alist-get 'ancestors context))
                     (goto-char (point-max))
-- 
cgit v1.2.3


From fc003dced37165fdf36223461216304ae4d0b420 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 26 Nov 2022 16:18:48 +0100
Subject: docstring

---
 lisp/mastodon-tl.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index dd3ce1b..3b9a8c6 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2109,7 +2109,9 @@ LANGS is an array parameters alist of languages to filer user's posts by."
   (mastodon-tl--follow-user user-handle "false"))
 
 (defun mastodon-tl--filter-user-user-posts-by-language (user-handle)
-  "Query for USER-HANDLE and enable notifications when they post."
+  "Query for USER-HANDLE and enable notifications when they post.
+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")))
-- 
cgit v1.2.3