From 199b3935a6364e76258974545108feb77e47f571 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 16 Nov 2022 11:24:22 +0100
Subject: docstrings and comments

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

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

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index d161544..6422716 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -162,7 +162,7 @@ QUERY is the string to search."
 
 (defun mastodon-search--insert-users-propertized (json &optional note)
   "Insert users list into the buffer.
-JSON is the data from the server.. If NOTE is non-nil, include
+JSON is the data from the server. If NOTE is non-nil, include
 user's profile note. This is also called by
 `mastodon-tl--get-follow-suggestions' and
 `mastodon-profile--insert-follow-requests'."
-- 
cgit v1.2.3


From 6575858c101a7536a265c89534137692e5488265 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 19 Nov 2022 15:53:29 +0100
Subject: refactor search--propertize-user

---
 lisp/mastodon-search.el | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

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

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 6422716..31fcae3 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -167,29 +167,33 @@ user's profile note. This is also called by
 `mastodon-tl--get-follow-suggestions' and
 `mastodon-profile--insert-follow-requests'."
   (mapc (lambda (acct)
-          (let ((user (mastodon-search--get-user-info acct)))
-            (insert
-             (propertize
-              (concat (propertize (car user)
-                                  'face 'mastodon-display-name-face
-                                  'byline t
-                                  'toot-id "0")
-                      " : \n : "
-                      (propertize (concat "@" (cadr user))
-                                  'face 'mastodon-handle-face
-                                  'mouse-face 'highlight
-		                          'mastodon-tab-stop 'user-handle
-		                          'keymap mastodon-tl--link-keymap
-                                  'mastodon-handle (concat "@" (cadr user))
-		                          'help-echo (concat "Browse user profile of @" (cadr user)))
-                      " : \n"
-                      (if note
-                          (mastodon-tl--render-text (cadddr user) nil)
-                        "")
-                      "\n")
-              'toot-json acct)))) ; so named for compat w other processing functions
+          (insert (mastodon-search--propertize-user acct note)))
         json))
 
+(defun mastodon-search--propertize-user (acct &optional note)
+  "Propertize display string for ACCT, optionally including profile
+NOTE."
+  (let ((user (mastodon-search--get-user-info acct)))
+    (propertize
+     (concat (propertize (car user)
+                         'face 'mastodon-display-name-face
+                         'byline t
+                         'toot-id "0")
+             " : \n : "
+             (propertize (concat "@" (cadr user))
+                         'face 'mastodon-handle-face
+                         'mouse-face 'highlight
+		         'mastodon-tab-stop 'user-handle
+		         'keymap mastodon-tl--link-keymap
+                         'mastodon-handle (concat "@" (cadr user))
+		         'help-echo (concat "Browse user profile of @" (cadr user)))
+             " : \n"
+             (if note
+                 (mastodon-tl--render-text (cadddr user) nil)
+               "")
+             "\n")
+     'toot-json acct))) ; so named for compat w other processing functions
+
 (defun mastodon-search--print-tags-list (tags)
   "Insert a propertized list of TAGS."
   (mapc (lambda (el)
-- 
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-search.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 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-search.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 04221419595887ad2ac84e4531310235986075e3 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 20:48:21 +0100
Subject: a first go at capf completion backends for mentions and tags

the regex searches still fail sometimes, and completions don't show urls or
usernames like the old company backends.
---
 lisp/mastodon-search.el | 12 +++++--
 lisp/mastodon-toot.el   | 87 +++++++++++++++++++++++++++++++++++++------------
 2 files changed, 77 insertions(+), 22 deletions(-)

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

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 31fcae3..fc7bd8e 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -49,13 +49,19 @@
 
 ;; functions for company completion of mentions in mastodon-toot
 
+(defun mastodon-search--get-user-info-@-capf (account)
+  "Get user handle, display name and account URL from ACCOUNT."
+  (list (concat "@" (cdr (assoc 'acct account)))
+        (cdr (assoc 'url account))
+        (cdr (assoc 'display_name account))))
+
 (defun mastodon-search--get-user-info-@ (account)
   "Get user handle, display name and account URL from ACCOUNT."
   (list (cdr (assoc 'display_name account))
         (concat "@" (cdr (assoc 'acct account)))
         (cdr (assoc 'url account))))
 
-(defun mastodon-search--search-accounts-query (query)
+(defun mastodon-search--search-accounts-query (query &optional capf)
   "Prompt for a search QUERY and return accounts synchronously.
 Returns a nested list containing user handle, display name, and URL."
   (interactive "sSearch mastodon for: ")
@@ -63,7 +69,9 @@ Returns a nested list containing user handle, display name, and URL."
          (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))))
-    (mapcar #'mastodon-search--get-user-info-@ response)))
+    (if capf
+        (mapcar #'mastodon-search--get-user-info-@-capf response)
+      (mapcar #'mastodon-search--get-user-info-@ response))))
 
 ;; functions for tags completion:
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index f195a87..6ba3a75 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -108,13 +108,14 @@
 (defcustom mastodon-toot--enable-completion
   (if (require 'company nil :noerror) t nil)
   "Whether to enable completion of mentions and hashtags.
-
 Used for completion in toot compose buffer.
-
 This is only used if company mode is installed."
   :group 'mastodon-toot
   :type 'boolean)
 
+(defcustom mastodon-toot--use-company-for-completion t
+  "Whether to use company for completion.")
+
 (defcustom mastodon-toot--completion-style-for-mentions
   (if (require 'company nil :noerror) "following" "off")
   "The company completion style to use for mentions."
@@ -913,6 +914,56 @@ meta fields respectively."
       (annotation (funcall annot-fun arg))
       (meta (funcall meta-fun arg)))))
 
+(defun mastodon-toot-mentions-capf ()
+  "Build a mentions completion backend for `completion-at-point-functions'."
+  (let* ((handle-bounds
+          ;; hack for @handles@with.domains, as "@" is not inc in any thing at pt!
+          (save-match-data
+            (save-excursion
+              ;; match full handle inc. domain (see the regex for subexp 2)
+              (when (re-search-backward mastodon-toot-handle-regex nil :no-error)
+                ;; (when (match-string-no-properties 2)
+                (cons (match-beginning 2)
+                      (match-end 2))))))
+         (start (car handle-bounds))
+         (end (cdr handle-bounds)))
+    (when handle-bounds
+      (list start
+            end
+            ;; only search when necessary:
+            (completion-table-dynamic
+             (lambda (_)
+               (mastodon-search--search-accounts-query
+                (buffer-substring-no-properties start end)
+                :capf)))
+            :exclusive 'no))))
+
+(defun mastodon-toot-tags-capf ()
+  "Build a tags completion backend for `completion-at-point-functions'."
+  (let* ((tag-bounds
+          (save-match-data
+            (save-excursion
+              ;; match full tag with # (see regex for subexp)
+              (re-search-backward mastodon-toot-tag-regex nil :no-error)
+              (when (match-string-no-properties 2)
+                (cons (match-beginning 2)
+                      (match-end 2))))))
+         (start (car tag-bounds))
+         (end (cdr tag-bounds)))
+    (when tag-bounds
+      (list start
+            end
+            ;; only search when necessary:
+            (completion-table-dynamic
+             (lambda (_)
+               (let ((tags (mastodon-search--search-tags-query
+                            (buffer-substring-no-properties start end))))
+                 (mapcar (lambda (x)
+                           (list (concat "#" (car x))
+                                 (cdr x)))
+                         tags))))
+            :exclusive 'no))))
+
 (defun mastodon-toot-mentions (command &optional arg &rest ignored)
   "A company completion backend for toot mentions.
 COMMAND is either prefix, to fetch a prefix query, candidates, to
@@ -1475,24 +1526,20 @@ a draft into the buffer."
       ;; no need to fetch from `mastodon-profile-account-settings' as
       ;; `mastodon-toot--max-toot-chars' is set when we set it
       (mastodon-toot--get-max-toot-chars))
-    ;; set up completion backends:
-    (when (require 'company nil :noerror)
-      (when mastodon-toot--enable-completion
-        ;; convert our company backends into capfs for use with corfu:
-        ;; FIXME replace this with a customize
-        (if (and (require 'cape nil :noerror)
-                 (bound-and-true-p corfu-mode))
-            (dolist (company-backend (list #'mastodon-toot-tags #'mastodon-toot-mentions))
-              (add-hook 'completion-at-point-functions
-                        (cape-company-to-capf company-backend)
-                        nil
-                        'local))
-          ;; else stick with company:
-          (set (make-local-variable 'company-backends)
-               (add-to-list 'company-backends 'mastodon-toot-mentions))
-          (add-to-list 'company-backends 'mastodon-toot-tags))
-        (unless (bound-and-true-p corfu-mode) ; don't clash w corfu mode
-          (company-mode-on))))
+    ;; set up completion:
+    (when mastodon-toot--enable-completion
+      ;; (setq-local
+      (set
+       (make-local-variable 'completion-at-point-functions)
+       (add-to-list
+        'completion-at-point-functions
+        #'mastodon-toot-mentions-capf))
+      (add-to-list
+       'completion-at-point-functions
+       #'mastodon-toot-tags-capf)
+      (when mastodon-toot--use-company-for-completion
+        (company-mode-on)))
+    ;; after-change:
     (make-local-variable 'after-change-functions)
     (push #'mastodon-toot--update-status-fields after-change-functions)
     (mastodon-toot--refresh-attachments-display)
-- 
cgit v1.2.3


From 468add918b8e1e790294cdc7ff5e34cf1bf862f6 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 21:44:43 +0100
Subject: silence the tags/handles searche queries

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

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

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index fc7bd8e..8530b5c 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -67,8 +67,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-search-json url query "following=true" :silent)
+                     (mastodon-http--get-search-json url query nil :silent))))
     (if capf
         (mapcar #'mastodon-search--get-user-info-@-capf response)
       (mapcar #'mastodon-search--get-user-info-@ response))))
@@ -81,7 +81,7 @@ 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"))
-         (response (mastodon-http--get-search-json url query type-param))
+         (response (mastodon-http--get-search-json url query type-param :silent))
          (tags (alist-get 'hashtags response)))
     (mapcar #'mastodon-search--get-hashtag-info tags)))
 
-- 
cgit v1.2.3


From e311d491977fb9012d30ed146231f95ea52008af 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:52 +0100
Subject: docstrings and autoloads

---
 lisp/mastodon-profile.el | 8 +++++---
 lisp/mastodon-search.el  | 3 +--
 lisp/mastodon-toot.el    | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 69cd65d..d5ef7a8 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -154,7 +154,8 @@ contains")
   (mastodon-tl--property 'toot-json))
 
 (defun mastodon-profile--make-author-buffer (account &optional no-reblogs)
-  "Take an ACCOUNT json and insert a user account into a new buffer."
+  "Take an ACCOUNT json and insert a user account into a new buffer.
+NO-REBLOGS means do not display boosts in statuses."
   (mastodon-profile--make-profile-buffer-for
    account "statuses" #'mastodon-tl--timeline no-reblogs))
 
@@ -553,7 +554,8 @@ 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)
-  "Display profile of ACCOUNT, using ENDPOINT-TYPE and UPDATE-FUNCTION."
+  "Display profile of ACCOUNT, using ENDPOINT-TYPE and UPDATE-FUNCTION.
+NO-REBLOGS means do not display boosts in statuses."
   (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)))
@@ -664,7 +666,7 @@ FIELDS means provide a fields vector fetched by other means."
     (goto-char (point-min))))
 
 (defun mastodon-profile--format-joined-date-string (joined)
-  "Format a Joined timestamp."
+  "Format a human-readable Joined string from timestamp JOINED."
   (let ((joined-ts (ts-parse joined)))
     (format "Joined %s" (concat (ts-month-name joined-ts)
                                 " "
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index f83cccb..b037faa 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -173,8 +173,7 @@ user's profile note. This is also called by
         json))
 
 (defun mastodon-search--propertize-user (acct &optional note)
-  "Propertize display string for ACCT, optionally including profile
-NOTE."
+  "Propertize display string for ACCT, optionally including profile NOTE."
   (let ((user (mastodon-search--get-user-info acct)))
     (propertize
      (concat (propertize (car user)
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 4f9fb1b..0e21b0e 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -84,6 +84,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")
 
 ;; for mastodon-toot--translate-toot-text
 (autoload 'mastodon-tl--content "mastodon-tl")
-- 
cgit v1.2.3


From eca8401b6ed04ed0f787efcd8517b022c55f9ed7 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 17:25:03 +0100
Subject: comment remove company mention

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

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

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 9d8ee65..65c5aba 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -47,7 +47,7 @@
 (defvar mastodon-toot--enable-completion-for-mentions)
 (defvar mastodon-tl--buffer-spec)
 
-;; functions for company completion of mentions in mastodon-toot
+;; functions for completion of mentions in mastodon-toot
 
 (defun mastodon-search--get-user-info-@-capf (account)
   "Get user handle, display name and account URL from ACCOUNT."
-- 
cgit v1.2.3