From 370f0a8367e381345950e145554481d988a1709c Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 14 Nov 2022 19:09:27 +0100
Subject: make a start on lists

---
 lisp/mastodon-http.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 66707b7..e69a5c9 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -203,12 +203,15 @@ Callback to `mastodon-http--get-response-async', usually
                 (cons (car list) (cadr list))))
             head-list)))
 
-(defun mastodon-http--delete (url)
+(defun mastodon-http--delete (url &optional args)
   "Make DELETE request to URL."
-  (mastodon-http--authorized-request
-   "DELETE"
-   (with-temp-buffer
-     (mastodon-http--url-retrieve-synchronously url))))
+  (let ((url-request-data
+         (when args
+           (mastodon-http--build-query-string args))))
+    (mastodon-http--authorized-request
+     "DELETE"
+     (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.
-- 
cgit v1.2.3


From 2197fa013ec02cd82750a319c1c314fdb4a7c2a4 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 15 Nov 2022 11:27:48 +0100
Subject: http--triage: add 404, don't process json in that case

---
 lisp/mastodon-http.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index e69a5c9..106c76b 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -89,8 +89,11 @@ Message status and JSON error from RESPONSE if unsuccessful."
     (if (string-prefix-p "2" status)
         (funcall success)
       (switch-to-buffer response)
-      (let ((json-response (mastodon-http--process-json)))
-        (message "Error %s: %s" status (alist-get 'error json-response))))))
+      ;; 404 returns http response not JSON:
+      (if (string-prefix-p "404" status)
+          (message "Error %s: page not found" status)
+        (let ((json-response (mastodon-http--process-json)))
+          (message "Error %s: %s" status (alist-get 'error json-response)))))))
 
 (defun mastodon-http--read-file-as-string (filename)
   "Read a file FILENAME as a string. Used to generate image preview."
-- 
cgit v1.2.3


From c3e1c3403f8a308894f5c335b4a060def85b4d4d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 15 Nov 2022 11:28:30 +0100
Subject: add delete and edit lists

---
 lisp/mastodon-http.el | 16 ++++++++++++++++
 lisp/mastodon-tl.el   | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 106c76b..843afc1 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -216,6 +216,22 @@ Callback to `mastodon-http--get-response-async', usually
      (with-temp-buffer
        (mastodon-http--url-retrieve-synchronously url)))))
 
+(defun mastodon-http--put (url &optional args headers)
+  "Make PUT request to URL."
+  (mastodon-http--authorized-request
+   "PUT"
+   (let ((url-request-data
+          (when args
+            (mastodon-http--build-query-string args)))
+         (url-request-extra-headers
+          (append url-request-extra-headers ; auth set in macro
+                  ;; pleroma compat:
+                  (unless (assoc "Content-Type" headers)
+                    '(("Content-Type" . "application/x-www-form-urlencoded")))
+                  headers)))
+     (with-temp-buffer
+       (mastodon-http--url-retrieve-synchronously url)))))
+
 (defun mastodon-http--append-query-string (url params)
   "Append PARAMS to URL as query strings and return it.
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index e28da63..f1941a5 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -71,6 +71,8 @@
 (autoload 'mastodon-http--get-response-async "mastodon-http")
 (autoload 'mastodon-url-lookup "mastodon")
 (autoload 'mastodon-auth--get-account-id "mastodon-auth")
+(autoload 'mastodon-http--put "mastodon-http")
+(autoload 'mastodon-http--process-json "mastodon-http")
 (when (require 'mpv nil :no-error)
   (declare-function mpv-start "mpv"))
 (defvar mastodon-instance-url)
@@ -1380,6 +1382,28 @@ ID is that of the toot to view."
          (response (mastodon-http--get-json url)))
     (alist-get 'title response)))
 
+(defun mastodon-tl--edit-list ()
+  "Prompt for a list and edit the name and replies policy."
+  (interactive)
+  (let* ((list-names (mastodon-tl--get-lists-names))
+         (name-old (completing-read "Edit list: "
+                                    list-names))
+         (id (mastodon-tl--get-list-id name-old))
+         (name-choice (read-string "List name: " name-old))
+         (replies-policy (completing-read "Replies policy: " ; give this a proper name
+                                          '("followed" "list" "none")
+                                          nil t nil nil "list"))
+         (url (mastodon-http--api (format "lists/%s" id)))
+         (response (mastodon-http--put url
+                                       `(("title" . ,name-choice)
+                                         ("replies_policy" . ,replies-policy)))))
+    (mastodon-http--triage response
+                           (lambda ()
+                             (with-current-buffer response
+                               (let* ((json (mastodon-http--process-json))
+                                      (name-new (alist-get 'title json)))
+                                 (message "list %s edited to %s!" name-old name-new)))))))
+
 (defun mastodon-tl--view-list-timeline ()
   "Prompt for a list and view its timeline."
   (interactive)
@@ -1408,6 +1432,19 @@ Prompt for name and replies policy."
                            (lambda ()
                              (message "list %s created!" title)))))
 
+(defun mastodon-tl--delete-list ()
+  "Prompt for a list and delete it."
+  (interactive)
+  (let* ((list-names (mastodon-tl--get-lists-names))
+         (name (completing-read "Delete list: "
+                                list-names))
+         (id (mastodon-tl--get-list-id name))
+         (url (mastodon-http--api (format "lists/%s" id)))
+         (response (mastodon-http--delete url)))
+    (mastodon-http--triage response
+                           (lambda ()
+                             (message "list %s deleted!" name)))))
+
 (defun mastodon-tl--get-users-followings ()
   "Return the list of followers of the logged in account."
   (let* ((id (mastodon-auth--get-account-id))
-- 
cgit v1.2.3


From 0996c7eabfd89e6bb5fa3c9f2558c9d6ac23a44b Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 17 Nov 2022 11:49:49 +0100
Subject: refactor array params into -http--build-array-args-alist

---
 lisp/mastodon-http.el |  5 +++++
 lisp/mastodon-tl.el   |  8 ++++----
 lisp/mastodon-toot.el | 16 ++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 66707b7..a127427 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -121,6 +121,11 @@ Unless UNAUTHENTICATED-P is non-nil."
              args
              "&"))
 
+(defun mastodon-http--build-array-args-alist (param-str array)
+  "Return parameters alist using PARAM-STR and ARRAY param values."
+  (cl-loop for x in array
+           collect (cons param-str x)))
+
 (defun mastodon-http--post (url args headers &optional unauthenticated-p)
   "POST synchronously to URL with ARGS and HEADERS.
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 8c02adf..0db517c 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -70,6 +70,8 @@
 (autoload 'mastodon-profile--get-preferences-pref "mastodon-profile")
 (autoload 'mastodon-http--get-response-async "mastodon-http")
 (autoload 'mastodon-url-lookup "mastodon")
+(autoload 'mastodon-http--build-array-args-alist "mastodon-http")
+
 (when (require 'mpv nil :no-error)
   (declare-function mpv-start "mpv"))
 (defvar mastodon-instance-url)
@@ -2110,10 +2112,8 @@ UPDATE-FUNCTION is used to receive more toots.
 Runs synchronously."
   (let* ((exclude-types (when note-type
                           (mastodon-notifications--filter-types-list note-type)))
-         (args (when note-type
-                 (mapcar (lambda (x)
-                           `("exclude_types[]" . ,x))
-                         exclude-types)))
+         (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)))
          ;; add note-type exclusions to endpoint so it works in `mastodon-tl--buffer-spec'
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 438e887..17a3938 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -79,6 +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")
 
 ;; for mastodon-toot--translate-toot-text
 (autoload 'mastodon-tl--content "mastodon-tl")
@@ -615,7 +616,8 @@ 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-toot--make-poll-options-params
+   (mastodon-http--build-array-args-alist
+    "poll[options][]"
     (plist-get mastodon-toot-poll :options))
    `(("poll[expires_in]" .  ,(plist-get mastodon-toot-poll :expiry)))
    `(("poll[multiple]" . ,(symbol-name (plist-get mastodon-toot-poll :multi))))
@@ -638,9 +640,9 @@ If media items have been attached and uploaded with
                                             (symbol-name t)))
                           ("spoiler_text" . ,spoiler)))
          (args-media (when mastodon-toot--media-attachments
-                       (mapcar (lambda (id)
-                                 (cons "media_ids[]" id))
-                               mastodon-toot--media-attachment-ids)))
+                       (mastodon-http--build-array-args-alist
+                        "media_ids[]"
+                        mastodon-toot--media-attachment-ids)))
          (args-poll (when mastodon-toot-poll
                       (mastodon-toot--build-poll-params)))
          ;; media || polls:
@@ -960,12 +962,6 @@ which is used to attach it to a toot when posting."
                 mastodon-toot--media-attachments))
       (list "None")))
 
-(defun mastodon-toot--make-poll-options-params (options)
-  "Return an parameter query alist from poll OPTIONS."
-  (let ((key "poll[options][]"))
-    (cl-loop for o in options
-             collect `(,key . ,o))))
-
 (defun mastodon-toot--fetch-max-poll-options ()
   "Return the maximum number of poll options."
   (mastodon-toot--fetch-poll-field 'max_options))
-- 
cgit v1.2.3


From fbf796a7bdf98babfdbfc879c49db3defdc2577d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 19 Nov 2022 11:27:34 +0100
Subject: http build array args docstring

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

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index d9e1d80..e67cf2d 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -125,7 +125,8 @@ Unless UNAUTHENTICATED-P is non-nil."
              "&"))
 
 (defun mastodon-http--build-array-args-alist (param-str array)
-  "Return parameters alist using PARAM-STR and ARRAY param values."
+  "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
            collect (cons param-str x)))
 
-- 
cgit v1.2.3


From 25f7e47beddb8fcf789a7e06a03fce5339f8500d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 19 Nov 2022 17:58:01 +0100
Subject: http--post - make args + headers optional args

also update all calls to it, no need for nil nil everywhere.
---
 lisp/mastodon-http.el          |  4 +-
 lisp/mastodon-notifications.el |  9 ++---
 lisp/mastodon-tl.el            | 14 +++----
 lisp/mastodon-toot.el          |  4 +-
 test/mastodon-tl-tests.el      | 90 +++++++++++++++++++++---------------------
 test/mastodon-toot-tests.el    | 16 ++++----
 6 files changed, 66 insertions(+), 71 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index e67cf2d..6e7bfb3 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -130,8 +130,8 @@ Used for API form data parameters that take an array."
   (cl-loop for x in array
            collect (cons param-str x)))
 
-(defun mastodon-http--post (url args headers &optional unauthenticated-p)
-  "POST synchronously to URL with ARGS and HEADERS.
+(defun mastodon-http--post (url &optional args headers unauthenticated-p)
+  "POST synchronously to URL, optionally with ARGS and HEADERS.
 
 Authorization header is included by default unless UNAUTHENTICATED-P is non-nil."
   (mastodon-http--authorized-request
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index b23e3c5..127a9e2 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -117,8 +117,7 @@ follow-requests view."
                          (mastodon-http--api "follow_requests")
                          (format "/%s/%s" id (if reject
                                                  "reject"
-                                               "authorize")))
-                        nil nil)))
+                                               "authorize"))))))
                   (mastodon-http--triage response
                                          (lambda ()
                                            (if f-reqs-view-p
@@ -326,8 +325,7 @@ Status notifications are created when you call
   (interactive)
   (when (y-or-n-p "Clear all notifications?")
     (let ((response
-           (mastodon-http--post (mastodon-http--api "notifications/clear")
-                                nil nil)))
+           (mastodon-http--post (mastodon-http--api "notifications/clear"))))
       (mastodon-http--triage
        response (lambda ()
                   (when mastodon-tl--buffer-spec
@@ -342,8 +340,7 @@ Status notifications are created when you call
                                      (mastodon-tl--property 'toot-json))))
          (response
           (mastodon-http--post (mastodon-http--api
-                                (format "notifications/%s/dismiss" id))
-                               nil nil)))
+                                (format "notifications/%s/dismiss" id)))))
     (mastodon-http--triage
      response (lambda ()
                 (when mastodon-tl--buffer-spec
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b8486cc..6618c48 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1145,7 +1145,7 @@ this just means displaying toot client."
            ;; need to zero-index our option:
            (option-as-arg (number-to-string (1- (string-to-number (car option)))))
            (arg `(("choices[]" . ,option-as-arg)))
-           (response (mastodon-http--post url arg nil)))
+           (response (mastodon-http--post url arg)))
       (mastodon-http--triage response
                              (lambda ()
                                (message "You voted for option %s: %s!"
@@ -1604,8 +1604,7 @@ If ID is provided, use that list."
          (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))
-                                        nil)))
+                                        `(("account_ids[]" . ,account-id)))))
     (mastodon-tl--list-action-triage
      response
      (message "%s added to list %s!" account list-name))))
@@ -1685,8 +1684,7 @@ Prompt for a context, must be a list containting at least one of \"home\",
                     contexts)))
          (response (mastodon-http--post url (push
                                              `("phrase" . ,word)
-                                             contexts-processed)
-                                        nil)))
+                                             contexts-processed))))
     (mastodon-http--triage response
                            (lambda ()
                              (message "Filter created for %s!" word)
@@ -2117,7 +2115,7 @@ NOTIFY is only non-nil when called by `mastodon-tl--follow-user'."
   "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 nil nil)))
+  (let ((response (mastodon-http--post url)))
     (mastodon-http--triage response
                            (lambda ()
                              (cond ((string-equal notify "true")
@@ -2145,7 +2143,7 @@ If TAG provided, follow it."
   (interactive)
   (let* ((tag (or tag (read-string "Tag to follow: ")))
          (url (mastodon-http--api (format "tags/%s/follow" tag)))
-         (response (mastodon-http--post url nil nil)))
+         (response (mastodon-http--post url)))
     (mastodon-http--triage response
                            (lambda ()
                              (message "tag #%s followed!" tag)))))
@@ -2166,7 +2164,7 @@ If TAG if provided, unfollow it."
          (tag (or tag (completing-read "Unfollow tag: "
                                        tags)))
          (url (mastodon-http--api (format "tags/%s/unfollow" tag)))
-         (response (mastodon-http--post url nil nil)))
+         (response (mastodon-http--post url)))
     (mastodon-http--triage response
                            (lambda ()
                              (message "tag #%s unfollowed!" tag)))))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 53e60bd..d0eb143 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -268,7 +268,7 @@ boosting, or bookmarking toots."
                                           (mastodon-tl--as-string id)
                                           "/"
                                           action))))
-    (let ((response (mastodon-http--post url nil nil)))
+    (let ((response (mastodon-http--post url)))
       (mastodon-http--triage response callback))))
 
 (defun mastodon-toot--toggle-boost-or-favourite (type)
@@ -666,7 +666,7 @@ If media items have been attached and uploaded with
           ((mastodon-toot--empty-p)
            (message "Empty toot. Cowardly refusing to post this."))
           (t
-           (let ((response (mastodon-http--post endpoint args nil)))
+           (let ((response (mastodon-http--post endpoint args)))
              (mastodon-http--triage response
                                     (lambda ()
                                       (mastodon-toot--kill)
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index bb5d00f..19934dd 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -1047,53 +1047,53 @@ correct value for following, as well as notifications enabled or disabled."
       (let ((response-buffer-true (current-buffer)))
         (insert mastodon-tl--follow-notify-true-response)
         (with-mock
-          (mock (mastodon-http--post url-follow-only nil nil)
-                => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-follow-only
-                                                  user-name
-                                                  user-handle
-                                                  "follow")
-            "User some-user (@some-user@instance.url) followed!"))
-          (mock (mastodon-http--post url-mute nil nil)
-                => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-mute
-                                                  user-name
-                                                  user-handle
-                                                  "mute")
-            "User some-user (@some-user@instance.url) muted!"))
-          (mock (mastodon-http--post url-block nil nil)
-                => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-block
-                                                  user-name
-                                                  user-handle
-                                                  "block")
-            "User some-user (@some-user@instance.url) blocked!")))
+         (mock (mastodon-http--post url-follow-only)
+               => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-follow-only
+                                                 user-name
+                                                 user-handle
+                                                 "follow")
+           "User some-user (@some-user@instance.url) followed!"))
+         (mock (mastodon-http--post url-mute)
+               => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-mute
+                                                 user-name
+                                                 user-handle
+                                                 "mute")
+           "User some-user (@some-user@instance.url) muted!"))
+         (mock (mastodon-http--post url-block)
+               => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-block
+                                                 user-name
+                                                 user-handle
+                                                 "block")
+           "User some-user (@some-user@instance.url) blocked!")))
         (with-mock
-          (mock (mastodon-http--post url-true nil nil) => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-true
-                                                  user-name
-                                                  user-handle
-                                                  "follow"
-                                                  "true")
-            "Receiving notifications for user some-user (@some-user@instance.url)!")))))
+         (mock (mastodon-http--post url-true) => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-true
+                                                 user-name
+                                                 user-handle
+                                                 "follow"
+                                                 "true")
+           "Receiving notifications for user some-user (@some-user@instance.url)!")))))
     (with-temp-buffer
       (let ((response-buffer-false (current-buffer)))
         (insert mastodon-tl--follow-notify-false-response)
         (with-mock
-          (mock (mastodon-http--post url-false nil nil) => response-buffer-false)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-false
-                                                  user-name
-                                                  user-handle
-                                                  "follow"
-                                                  "false")
-            "Not receiving notifications for user some-user (@some-user@instance.url)!")))))))
+         (mock (mastodon-http--post url-false) => response-buffer-false)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-false
+                                                 user-name
+                                                 user-handle
+                                                 "follow"
+                                                 "false")
+           "Not receiving notifications for user some-user (@some-user@instance.url)!")))))))
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index 39e0984..9741964 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -152,14 +152,14 @@ mention string."
           (toot mastodon-toot-test-base-toot)
           (id 61208))
       (with-mock
-        (mock (mastodon-tl--property 'base-toot-id) => id)
-        (mock (mastodon-http--api "statuses/61208/pin")
-        => "https://example.space/statuses/61208/pin")
-        (mock (mastodon-http--post "https://example.space/statuses/61208/pin" nil nil)
-              => pin-response)
-        (should (equal (mastodon-toot--action "pin" (lambda ()
-                                                      (message "Toot pinned!")))
-                       "Toot pinned!"))))))
+       (mock (mastodon-tl--property 'base-toot-id) => id)
+       (mock (mastodon-http--api "statuses/61208/pin")
+             => "https://example.space/statuses/61208/pin")
+       (mock (mastodon-http--post "https://example.space/statuses/61208/pin")
+             => pin-response)
+       (should (equal (mastodon-toot--action "pin" (lambda ()
+                                                     (message "Toot pinned!")))
+                      "Toot pinned!"))))))
 
 (ert-deftest mastodon-toot--pin-toot-fail ()
   (with-temp-buffer
-- 
cgit v1.2.3


From 62e18cd138f322b0e1b8ce1139b4d129f6929b9a Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 18:25:35 +0100
Subject: no switch to response buffer on non-200 http response

---
 lisp/mastodon-http.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 6e7bfb3..37770ef 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -88,11 +88,13 @@ Message status and JSON error from RESPONSE if unsuccessful."
                   (mastodon-http--status))))
     (if (string-prefix-p "2" status)
         (funcall success)
-      (switch-to-buffer response)
-      ;; 404 returns http response not JSON:
+      ;; don't switch to buffer, just with-current-buffer the response:
+      ;; (switch-to-buffer response)
+      ;; 404 sometimes returns http response so --process-json fails:
       (if (string-prefix-p "404" status)
           (message "Error %s: page not found" status)
-        (let ((json-response (mastodon-http--process-json)))
+        (let ((json-response (with-current-buffer response
+                               (mastodon-http--process-json))))
           (message "Error %s: %s" status (alist-get 'error json-response)))))))
 
 (defun mastodon-http--read-file-as-string (filename)
-- 
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-http.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-http.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-http.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 ee65d8afcbd113c7a1104cf84b214fb87722b474 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 15:06:13 +0100
Subject: attempt to fix --get-search params

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

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index d1bf573..c94ea7a 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -286,7 +286,8 @@ SILENT means don't message."
    (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)))
+          (url (concat base-url "?" query-str (when params-str
+                                                (concat "&" params-str)))))
      (mastodon-http--url-retrieve-synchronously url silent))))
 
 ;; profile update functions
-- 
cgit v1.2.3


From 19051d7ada81e5abc56b42de838ab7b26c31bd9b Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 15:34:59 +0100
Subject: remove redundant --get-search(-json) funs, use new params --get-json

---
 lisp/mastodon-http.el   | 34 ----------------------------------
 lisp/mastodon-search.el | 12 +++++++-----
 lisp/mastodon.el        |  5 +++--
 3 files changed, 10 insertions(+), 41 deletions(-)

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index c94ea7a..c1ab3fb 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -256,40 +256,6 @@ PARAMS should be an alist as required by `url-build-query-string'."
   (let ((query-string (url-build-query-string params)))
     (concat url "?" query-string)))
 
-;; search functions:
-(defun mastodon-http--process-json-search ()
-  "Process JSON returned by a search query to the server."
-  (goto-char (point-min))
-  (re-search-forward "^$" nil 'move)
-  (let ((json-string
-         (decode-coding-string
-          (buffer-substring-no-properties (point) (point-max))
-          'utf-8)))
-    (kill-buffer)
-    (json-read-from-string json-string)))
-
-(defun mastodon-http--get-search-json (url query &optional params silent)
-  "Make GET request to URL, searching for QUERY and return JSON response.
-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 params silent)))
-    (with-current-buffer buffer
-      (mastodon-http--process-json-search))))
-
-(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.
-PARAMS is an alist of any extra parameters to send with the request.
-SILENT means don't message."
-  (mastodon-http--authorized-request
-   "GET"
-   (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 (when params-str
-                                                (concat "&" params-str)))))
-     (mastodon-http--url-retrieve-synchronously url silent))))
-
 ;; profile update functions
 
 (defun mastodon-http--patch-json (url &optional params)
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index fee79c4..f83cccb 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -61,8 +61,8 @@ 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))))
+                       (mastodon-http--get-json url `(("q" . ,query) ("following" . "true")))
+                     (mastodon-http--get-json url `(("q" . ,query))))))
     (mapcar #'mastodon-search--get-user-info-@ response)))
 
 ;; functions for tags completion:
@@ -72,8 +72,10 @@ 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 '(("type" . "hashtags")))
-         (response (mastodon-http--get-search-json url query type-param))
+         ;; (type-param '(("type" . "hashtags")))
+         (params `(("q" . ,query)
+                   ("type" . "hashtags")))
+         (response (mastodon-http--get-json url params))
          (tags (alist-get 'hashtags response)))
     (mapcar #'mastodon-search--get-hashtag-info tags)))
 
@@ -112,7 +114,7 @@ QUERY is the string to search."
   (interactive "sSearch mastodon for: ")
   (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
          (buffer (format "*mastodon-search-%s*" query))
-         (response (mastodon-http--get-search-json url query))
+         (response (mastodon-http--get-json url `(("q" . ,query))))
          (accts (alist-get 'accounts response))
          (tags (alist-get 'hashtags response))
          (statuses (alist-get 'statuses response))
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index cfe6681..4097b27 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -291,8 +291,9 @@ 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 '(("resolve" . "t"))) ; webfinger
-             (response (mastodon-http--get-search-json url query param :silent)))
+             (params `(("q" . ,query)
+                       ("resolve" . "t"))) ; webfinger
+             (response (mastodon-http--get-json url params :silent)))
         (cond ((not (seq-empty-p
                      (alist-get 'statuses response)))
                (let* ((statuses (assoc 'statuses response))
-- 
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-http.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 78f1100f5651e498468d42d9830daed924b1237b Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 24 Nov 2022 17:28:24 +0100
Subject: http: always use PARAMS or CBARGS, never ARGS anywhere

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

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

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 69a571d..d677e57 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -132,15 +132,15 @@ Used for API form data parameters that take an array."
   (cl-loop for x in array
            collect (cons param-str x)))
 
-(defun mastodon-http--post (url &optional args headers unauthenticated-p)
-  "POST synchronously to URL, optionally with ARGS and HEADERS.
+(defun mastodon-http--post (url &optional params headers unauthenticated-p)
+  "POST synchronously to URL, optionally with PARAMS and HEADERS.
 
 Authorization header is included by default unless UNAUTHENTICATED-P is non-nil."
   (mastodon-http--authorized-request
    "POST"
    (let ((url-request-data
-          (when args
-            (mastodon-http--build-params-string args)))
+          (when params
+            (mastodon-http--build-params-string params)))
          (url-request-extra-headers
           (append url-request-extra-headers ; auth set in macro
                   ;; pleroma compat:
@@ -237,11 +237,12 @@ PARAMS is an alist of any extra parameters to send with the request."
 
 (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."
+PARAMS is an alist of any extra parameters to send with the request.
+HEADERS is an alist of any extra headers to send with the request."
   (mastodon-http--authorized-request
    "PUT"
    (let ((url-request-data
-          (when args (mastodon-http--build-params-string params)))
+          (when params (mastodon-http--build-params-string params)))
          (url-request-extra-headers
           (append url-request-extra-headers ; auth set in macro
                   ;; pleroma compat:
@@ -288,35 +289,36 @@ 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 &optional params callback &rest args)
-  "Make GET request to URL. Call CALLBACK with http response and ARGS."
+(defun mastodon-http--get-response-async (url &optional params callback &rest cbargs)
+  "Make GET request to URL. Call CALLBACK with http response and CBARGS.
+PARAMS is an alist of any extra parameters to send with the request."
   (mastodon-http--get-async
    url
    params
    (lambda (status)
      (when status ;; only when we actually get sth?
-       (apply callback (mastodon-http--process-response) args)))))
+       (apply callback (mastodon-http--process-response) cbargs)))))
 
-(defun mastodon-http--get-json-async (url &optional params 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 cbargs)
+  "Make GET request to URL. Call CALLBACK with json-list and CBARGS.
 PARAMS is an alist of any extra parameters to send with the request."
   (mastodon-http--get-async
    url
    params
    (lambda (status)
      (when status ;; only when we actually get sth?
-       (apply callback (mastodon-http--process-json) args)))))
+       (apply callback (mastodon-http--process-json) cbargs)))))
 
-(defun mastodon-http--post-async (url args headers &optional callback &rest cbargs)
-  "POST asynchronously to URL with ARGS and HEADERS.
+(defun mastodon-http--post-async (url params headers &optional callback &rest cbargs)
+  "POST asynchronously to URL with PARAMS and HEADERS.
 Then run function CALLBACK with arguements CBARGS.
 Authorization header is included by default unless UNAUTHENTICED-P is non-nil."
   (mastodon-http--authorized-request
    "POST"
    (let ((request-timeout 5)
          (url-request-data
-          (when args
-            (mastodon-http--build-params-string args))))
+          (when params
+            (mastodon-http--build-params-string params))))
      (with-temp-buffer
        (url-retrieve url callback cbargs)))))
 
-- 
cgit v1.2.3