4 files changed, 13 insertions, 6 deletions
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index ea18da8..f092a2d 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -114,7 +114,7 @@ Authorization header is included by default unless UNAUTHENTICED-P is non-nil."
         (url-retrieve-synchronously url nil nil mastodon-http--timeout)))))
 
 (defun mastodon-http--read-file-as-string (filename)
-  ""
+  "Read a file FILENAME as a string. Used to generate image preview."
   (with-temp-buffer
     (insert-file-contents filename)
     (string-to-unibyte (buffer-string))))
@@ -170,7 +170,8 @@ Pass response buffer to CALLBACK function."
     (json-read-from-string json-string)))
 
 (defun mastodon-http--get-search-json (url query &optional param)
-  "Make GET request to URL, searching for QUERY and return JSON response."
+  "Make GET request to URL, searching for QUERY and return JSON response.
+PARAM is any extra parameters to send with the request."
   (let ((buffer (mastodon-http--get-search url query param)))
     (with-current-buffer buffer
       (mastodon-http--process-json-search))))
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 40f134d..ccac5e6 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -42,6 +42,7 @@
 (defvar mastodon-instance-url)
 (defvar mastodon-tl--link-keymap)
 (defvar mastodon-http--timeout)
+(defvar mastodon-toot--enable-completion-for-mentions)
 
 ;; functions for company completion of mentions in mastodon-toot
 
@@ -55,7 +56,7 @@
 Returns a nested list containing user handle, display name, and URL."
   (interactive "sSearch mastodon for: ")
   (let* ((url (format "%s/api/v1/accounts/search" mastodon-instance-url))
-         (buffer (format "*mastodon-search-%s*" query))
+         ;; (buffer (format "*mastodon-search-%s*" query))
          (response (if (equal mastodon-toot--enable-completion-for-mentions "followers")
                        (mastodon-http--get-search-json url query "following=true")
                      (mastodon-http--get-search-json url query))))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 80c63f6..d4068ea 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -31,6 +31,7 @@
 
 (defvar mastodon-instance-url)
 (defvar mastodon-media--attachment-height)
+(defvar mastodon-toot--enable-completion-for-mentions)
 
 (when (require 'emojify nil :noerror)
   (declare-function emojify-insert-emoji "emojify"))
@@ -44,6 +45,7 @@
 (autoload 'mastodon-http--triage "mastodon-http")
 (autoload 'mastodon-http--delete "mastodon-http")
 (autoload 'mastodon-http--process-json "mastodon-http")
+(autoload 'mastodon-http--get-json "mastodon-http")
 (autoload 'mastodon-tl--as-string "mastodon-tl")
 (autoload 'mastodon-tl--clean-tabs-and-nl "mastodon-tl")
 (autoload 'mastodon-tl--field "mastodon-tl")
@@ -709,7 +711,8 @@ on the status of NSFW, content warning flags, media attachments, etc."
 
 (defun mastodon-toot--setup-as-reply (reply-to-user reply-to-id reply-json)
   "If REPLY-TO-USER is provided, inject their handle into the message.
-If REPLY-TO-ID is provided, set the MASTODON-TOOT--REPLY-TO-ID var."
+If REPLY-TO-ID is provided, set `mastodon-toot--reply-to-id'.
+REPLY-JSON is the full JSON of the toot being replied to."
   (let ((reply-visibility (cdr (assoc 'visibility reply-json)))
         (reply-cw (cdr (assoc 'spoiler_text reply-json))))
     (when reply-to-user
@@ -762,7 +765,8 @@ If REPLY-TO-ID is provided, set the MASTODON-TOOT--REPLY-TO-ID var."
 (defun mastodon-toot--compose-buffer (reply-to-user reply-to-id &optional reply-json)
   "Create a new buffer to capture text for a new toot.
 If REPLY-TO-USER is provided, inject their handle into the message.
-If REPLY-TO-ID is provided, set the MASTODON-TOOT--REPLY-TO-ID var."
+If REPLY-TO-ID is provided, set the `mastodon-toot--reply-to-id' var.
+REPLY-JSON is the full JSON of the toot being replied to."
   (let* ((buffer-exists (get-buffer "*new toot*"))
          (buffer (or buffer-exists (get-buffer-create "*new toot*")))
          (inhibit-read-only t))
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index e1bd2be..387e9eb 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -211,7 +211,8 @@ Use. e.g. \"%c\" for your locale's date and time format."
 (defun mastodon-toot (&optional user reply-to-id reply-json)
   "Update instance with new toot. Content is captured in a new buffer.
 If USER is non-nil, insert after @ symbol to begin new toot.
-If REPLY-TO-ID is non-nil, attach new toot to a conversation."
+If REPLY-TO-ID is non-nil, attach new toot to a conversation.
+If REPLY-JSON is the json of the toot being replied to."
   (interactive)
   (mastodon-toot--compose-buffer user reply-to-id reply-json))