rename build-query-string to -params-str, + build-array-params-alist

3 files changed, 22 insertions, 22 deletions

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