From 91d488571bf796b61d275def376603975f127fde Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Wed, 10 May 2017 21:26:43 +0100
Subject: Add tests for mastodon-media.el
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This also includes tweaks to make Travis happy — tests previously did pass on my laptop but Travis's environment is different.
---
 test/mastodon-media-tests.el | 179 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 test/mastodon-media-tests.el

(limited to 'test/mastodon-media-tests.el')

diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
new file mode 100644
index 0000000..9cd06b7
--- /dev/null
+++ b/test/mastodon-media-tests.el
@@ -0,0 +1,179 @@
+(require 'el-mock)
+
+(ert-deftest mastodon-media:get-avatar-rendering ()
+  "Should return text with all expected properties."
+  (with-mock
+    (mock (image-type-available-p 'imagemagick) => t)
+    (mock (create-image * 'imagemagick t :height 123) => :mock-image)
+
+    (let* ((mastodon-avatar-height 123)
+           (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
+           (result-no-properties (substring-no-properties result))
+           (properties (text-properties-at 0 result)))
+      (should (string= "  " result-no-properties))
+      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+      (should (eq 'needs-loading (plist-get properties 'media-state)))
+      (should (eq 'avatar (plist-get properties 'media-type)))
+      (should (eq :mock-image (plist-get properties 'display))))))
+
+(ert-deftest mastodon-media:get-media-link-rendering ()
+  "Should return text with all expected properties."
+  (with-mock
+    (mock (create-image * nil t) => :mock-image)
+
+    (let* ((mastodon-preview-max-height 123)
+           (result (mastodon-media--get-media-link-rendering "http://example.org/img.png"))
+           (result-no-properties (substring-no-properties result))
+           (properties (text-properties-at 0 result)))
+      (should (string= "[img] " result-no-properties))
+      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+      (should (eq 'needs-loading (plist-get properties 'media-state)))
+      (should (eq 'media-link (plist-get properties 'media-type)))
+      (should (eq :mock-image (plist-get properties 'display))))))
+
+(ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
+  "Should make the right call to url-retrieve."
+  (let ((url "http://example.org/image.png")
+        (mastodon-avatar-height 123))
+    (with-mock
+      (mock (image-type-available-p 'imagemagick) => t)
+      (mock (create-image * 'imagemagick t :height 123) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             url
+             #'mastodon-media--process-image-response
+             '(:my-marker (:height 123) 1 "http://example.org/image.png"))
+            => :called-as-expected)
+
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                        ":rest"))
+
+        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+
+(ert-deftest mastodon-media:load-image-from-url:avatar-without-imagemagic ()
+  "Should make the right call to url-retrieve."
+  (let ((url "http://example.org/image.png"))
+    (with-mock
+      (mock (image-type-available-p 'imagemagick) => nil)
+      (mock (create-image * nil t) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             url
+             #'mastodon-media--process-image-response
+             '(:my-marker () 1 "http://example.org/image.png"))
+            => :called-as-expected)
+
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                        ":rest"))
+
+        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+
+(ert-deftest mastodon-media:load-image-from-url:media-link-with-imagemagic ()
+  "Should make the right call to url-retrieve."
+  (let ((url "http://example.org/image.png"))
+    (with-mock
+      (mock (image-type-available-p 'imagemagick) => t)
+      (mock (create-image * nil t) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             "http://example.org/image.png"
+             #'mastodon-media--process-image-response
+             '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
+            => :called-as-expected)
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-media-link-rendering url)
+                        ":rest"))
+        (let ((mastodon-preview-max-height 321))
+          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+
+(ert-deftest mastodon-media:load-image-from-url:media-link-without-imagemagic ()
+  "Should make the right call to url-retrieve."
+  (let ((url "http://example.org/image.png"))
+    (with-mock
+      (mock (image-type-available-p 'imagemagick) => nil)
+      (mock (create-image * nil t) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             "http://example.org/image.png"
+             #'mastodon-media--process-image-response
+             '(:my-marker () 5 "http://example.org/image.png"))
+            => :called-as-expected)
+
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-avatar-rendering url)
+                        ":rest"))
+        (let ((mastodon-preview-max-height 321))
+          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+
+(ert-deftest mastodon-media:process-image-response ()
+  "Should process the HTTP response and adjust the source buffer."
+  (with-temp-buffer
+    (with-mock
+      (let ((source-buffer (current-buffer))
+           used-marker
+           saved-marker)
+       (insert "start:")
+       (setq used-marker (copy-marker (point))
+             saved-marker (copy-marker (point)))
+       ;; Mock needed for the preliminary image created in mastodon-media--get-avatar-rendering
+       (stub create-image => :fake-image)
+       (insert (mastodon-media--get-avatar-rendering "http://example.org/image.png")
+               ":end")
+       (with-temp-buffer
+         (insert "some irrelevant\n"
+                 "http headers\n"
+                 "which will be ignored\n\n"
+                 "fake\nimage\ndata")
+         (goto-char (point-min))
+
+         (mock (create-image "fake\nimage\ndata" 'imagemagick t ':image :option) => :fake-image)
+
+         (mastodon-media--process-image-response () used-marker '(:image :option) 1 "the-url")
+
+         ;; the used marker has been unset:
+         (should (null (marker-position used-marker)))
+         ;; the media-state has been set to loaded and the image is being displayed
+         (should (eq 'loaded (get-text-property saved-marker 'media-state source-buffer)))
+         (should (eq ':fake-image (get-text-property saved-marker 'display source-buffer))))))))
+
+(ert-deftest mastodon-media:inline-images ()
+  "Should process all media in buffer."
+  (with-mock
+    ;; Stub needed for the test setup:
+    (stub create-image => '(image ignored))
+
+    (let (marker-media-link marker-media-link-bad-url marker-false-media marker-avatar)
+      (with-temp-buffer
+        (insert "Some text before\n")
+        (setq marker-media-link (copy-marker (point)))
+        (insert (mastodon-media--get-media-link-rendering "http://example.org/i.jpg")
+                " some more text ")
+        (setq marker-media-link-bad-url (copy-marker (point)))
+        (insert (mastodon-media--get-media-link-rendering "/files/small/missing.png")
+                " some more text ")
+        (setq marker-false-media (copy-marker (point)))
+        (insert
+         ;; text that looks almost like an avatar but lacks the media-url property
+         (propertize "this won't be processed"
+                     'media-state 'needs-loading
+                     'media-type 'avatar)
+         "even more text ")
+        (setq marker-avatar (copy-marker (point)))
+        (insert (mastodon-media--get-avatar-rendering "http://example.org/avatar.png")
+                " end of text")
+        (goto-char (point-min))
+
+        ;; stub for the actual test:
+        (stub mastodon-media--load-image-from-url)
+        (mastodon-media--inline-images)
+
+        (should (eq 'loading (get-text-property marker-media-link 'media-state)))
+        (should (eq 'invalid-url (get-text-property marker-media-link-bad-url 'media-state)))
+        (should (eq 'loading (get-text-property marker-avatar 'media-state)))
+        (should (eq 'needs-loading (get-text-property marker-false-media 'media-state)))))))
-- 
cgit v1.2.3


From fe8e4386eacb358df0e16dc5bd37dde4f4d6d57c Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Tue, 16 May 2017 21:09:58 +0100
Subject: Remove most byte-compile warnings.

We do this by
- moving vars into the files where they are (mostly) used
- "declaring" vars used elsewhere with the (defvar <var-name>) pattern,
- declaring functions defined in others functions rather than loading the file via require.
---
 lisp/mastodon-auth.el         |  5 ++++-
 lisp/mastodon-client.el       | 30 +++++++++++++++--------------
 lisp/mastodon-http.el         | 11 ++++++-----
 lisp/mastodon-inspect.el      |  8 ++++++--
 lisp/mastodon-media.el        | 25 +++++++++++++-----------
 lisp/mastodon-tl.el           | 45 ++++++++++++++++++++++++++++---------------
 lisp/mastodon-toot.el         | 32 +++++++++++++++---------------
 lisp/mastodon.el              | 38 ++++++++++++++----------------------
 test/mastodon-client-tests.el | 10 +++++-----
 test/mastodon-media-tests.el  | 20 +++++++++----------
 test/mastodon-tl-tests.el     | 16 +++++++--------
 11 files changed, 130 insertions(+), 110 deletions(-)

(limited to 'test/mastodon-media-tests.el')

diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 013487c..68c4d21 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -30,7 +30,10 @@
 ;;; Code:
 
 (require 'plstore)
-(require 'mastodon-client nil t)
+
+(declare-function mastodon-client "mastodon-client")
+(declare-function mastodon-http--post "mastodon-http")
+(defvar mastodon-instance-url)
 
 (defgroup mastodon-auth nil
   "Authenticate with Mastodon."
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index f8e8a5c..3a9a606 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -30,14 +30,16 @@
 ;;; Code:
 
 (require 'plstore)
-(require 'mastodon-http nil t)
+(declare-function mastodon-http--api "mastodon-http")
+(declare-function mastodon-http--post "mastodon-http")
 
-(defgroup mastodon-client nil
-  "Register your client with Mastodon."
-  :prefix "mastodon-client-"
-  :group 'mastodon)
 
-(defvar mastodon-client nil
+(defcustom mastodon-client--token-file (concat user-emacs-directory "mastodon.plstore")
+  "File path where Mastodon access tokens are stored."
+  :group 'mastodon
+  :type 'file)
+
+(defvar mastodon-client--client-details nil
   "Client id and secret.")
 
 (defun mastodon-client--register ()
@@ -62,11 +64,11 @@
       (json-read-from-string json-string))))
 
 (defun mastodon-client--token-file ()
-  "Return `mastodon-token-file'."
-  mastodon-token-file)
+  "Return `mastodon-client--token-file'."
+  mastodon-client--token-file)
 
 (defun mastodon-client--store ()
-  "Store client_id and client_secret in `mastodon-token-file'.
+  "Store client_id and client_secret in `mastodon-client--token-file'.
 
 Make `mastodon-client--fetch' call to determine client values."
   (let ((plstore (plstore-open (mastodon-client--token-file)))
@@ -77,19 +79,19 @@ Make `mastodon-client--fetch' call to determine client values."
     client))
 
 (defun mastodon-client--read ()
-  "Retrieve client_id and client_secret from `mastodon-token-file'."
+  "Retrieve client_id and client_secret from `mastodon-client--token-file'."
   (let* ((plstore (plstore-open (mastodon-client--token-file)))
          (mastodon (plstore-get plstore "mastodon")))
     (when mastodon
       (delete "mastodon" mastodon))))
 
 (defun mastodon-client ()
-  "Return variable `mastodon-client' plist.
+  "Return variable `mastodon-client--client-details' plist.
 
-Read plist from `mastodon-token-file' if variable is nil.
+Read plist from `mastodon-client--token-file' if variable is nil.
 Fetch and store plist if `mastodon-client--read' returns nil."
-  (or mastodon-client
-      (setq mastodon-client
+  (or mastodon-client--client-details
+      (setq mastodon-client--client-details
             (or (mastodon-client--read)
                 (mastodon-client--store)))))
 
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index dbbad4f..9f178c4 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -30,15 +30,16 @@
 ;;; Code:
 
 (require 'json)
+(defvar mastodon-instance-url)
+(defvar mastodon-auth--token)
+(declare-function mastodon-auth--access-token "mastodon-auth")
 
-(defgroup mastodon-http nil
-  "HTTP requests and responses for Mastodon."
-  :prefix "mastodon-http-"
-  :group 'mastodon)
+(defvar mastodon-http--api-version "v1")
 
 (defun mastodon-http--api (endpoint)
   "Return Mastondon API URL for ENDPOINT."
-  (concat mastodon-instance-url "/api/" mastodon--api-version "/" endpoint))
+  (concat mastodon-instance-url "/api/"
+          mastodon-http--api-version "/" endpoint))
 
 (defun mastodon-http--response ()
   "Capture response buffer content as string."
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index c12273e..f5fcd81 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -28,8 +28,12 @@
 ;; Some tools to help inspect / debug mastodon.el
 
 ;;; Code:
-
-(require 'mastodon-tl nil t)
+(declare-function mastodon-http--api "mastodon-http")
+(declare-function mastodon-http--get-json "mastodon-http")
+(declare-function mastodon-media--inline-images "mastodon-media")
+(declare-function mastodon-mode "mastodon")
+(declare-function mastodon-tl--property "mastodon-tl")
+(declare-function mastodon-tl--toot "mastodon-tl")
 
 (defgroup mastodon-inspect nil
   "Tools to help inspect toots."
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index b3565d0..671f159 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -32,16 +32,20 @@
 ;; required by the server and client.
 
 ;;; Code:
-(require 'mastodon-http  nil t)
-
 (defgroup mastodon-media nil
   "Inline Mastadon media."
   :prefix "mastodon-media-"
   :group 'mastodon)
 
-(defvar mastodon-media-show-avatars-p
-  (image-type-available-p 'imagemagick)
-  "A boolean value stating whether to show avatars in timelines.")
+(defcustom mastodon-media--avatar-height 30
+  "Height of the user avatar images (if shown)."
+  :group 'mastodon-media
+  :type 'integer)
+
+(defcustom mastodon-media--preview-max-height 250
+  "Max height of any media attachment preview to be shown."
+  :group 'mastodon-media
+  :type 'integer)
 
 (defvar mastodon-media--generic-avatar-data
   (base64-decode-string
@@ -121,14 +125,13 @@ BAIQCEAgAIEABAIsJVH58WqHw8FIgjUIQCAACAQgEIBAAAIBCAQgEIBAAAIBCAQgEAAEAhAIQCBA
 fKRJkmVZjAQwh78A6vCRWJE8K+8AAAAASUVORK5CYII=")
   "The PNG data for a generic 200x200 'broken image' view")
 
-(defun mastodon-media--process-image-response (status-plist marker image-options region-length image-url)
+(defun mastodon-media--process-image-response (status-plist marker image-options region-length)
   "Callback function processing the url retrieve response for URL.
 
 STATUS-PLIST is the usual plist of status events as per `url-retrieve'.
 IMAGE-OPTIONS are the precomputed options to apply to the image.
 MARKER is the marker to where the response should be visible.
 REGION-LENGTH is the length of the region that should be replaced with the image.
-IMAGE-URL is the URL that was retrieved.
 "
   (let ((url-buffer (current-buffer))
         (is-error-response-p (eq :error (car status-plist))))
@@ -164,12 +167,12 @@ MEDIA-TYPE is a symbol and either 'avatar or 'media-link."
   (let ((image-options (when (image-type-available-p 'imagemagick)
                          (cond
                           ((eq media-type 'avatar)
-                           `(:height ,mastodon-avatar-height))
+                           `(:height ,mastodon-media--avatar-height))
                           ((eq media-type 'media-link)
-                           `(:max-height ,mastodon-preview-max-height))))))
+                           `(:max-height ,mastodon-media--preview-max-height))))))
     (url-retrieve url
                   #'mastodon-media--process-image-response
-                  (list (copy-marker start) image-options region-length url))))
+                  (list (copy-marker start) image-options region-length))))
 
 (defun mastodon-media--select-next-media-line ()
   "Find coordinates of the next media to load.
@@ -225,7 +228,7 @@ not been returned."
   ;; This is what a user will see on a non-graphical display
   ;; where not showing an avatar at all is preferable.
   (let ((image-options (when (image-type-available-p 'imagemagick)
-                         `(:height ,mastodon-avatar-height))))
+                         `(:height ,mastodon-media--avatar-height))))
     (concat
      (propertize " "
                  'media-url avatar-url
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 5b06119..edefae9 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -29,16 +29,31 @@
 
 ;;; Code:
 
-(require 'mastodon-http)
-(require 'mastodon-toot)
-(require 'mastodon-media)
+(require 'shr)
+(require 'thingatpt) ;; for word-at-point
 (require 'time-date)
 
+(declare-function mastodon-http--api "mastodon-http")
+(declare-function mastodon-http--get-json "mastodon-http")
+(declare-function mastodon-media--get-avatar-rendering "mastodon-media")
+(declare-function mastodon-media--get-media-link-rendering "mastodon-media")
+(declare-function mastodon-media--inline-images "mastodon-media")
+(declare-function mastodon-mode "mastodon")
+(defvar mastodon-toot-timestamp-format)
+
 (defgroup mastodon-tl nil
   "Timelines in Mastodon."
   :prefix "mastodon-tl-"
   :group 'mastodon)
 
+(defvar mastodon-tl--buffer-spec nil
+  "A unique identifier and functions for each Mastodon buffer.")
+
+(defvar mastodon-tl--show-avatars-p
+  (image-type-available-p 'imagemagick)
+  "A boolean value stating whether to show avatars in timelines.")
+
+
 (defun mastodon-tl--get-federated-timeline ()
   "Opens federated timeline."
   (interactive)
@@ -106,7 +121,7 @@ Optionally start from POS."
          (name (cdr (assoc 'display_name account)))
          (avatar-url (cdr (assoc 'avatar account))))
     (concat
-     (when mastodon-media-show-avatars-p
+     (when mastodon-tl--show-avatars-p
        (mastodon-media--get-avatar-rendering avatar-url))
      (propertize name 'face 'mastodon-display-name-face)
      (propertize (concat " (@"
@@ -218,28 +233,28 @@ also render the html"
 
 (defun mastodon-tl--timeline (toots)
   "Display each toot in TOOTS."
-  (mapcar 'mastodon-tl--toot toots)
+  (mapc 'mastodon-tl--toot toots)
   (replace-regexp "\n\n\n | " "\n | " nil (point-min) (point-max))
   (mastodon-media--inline-images))
 
 (defun mastodon-tl--get-update-function (&optional buffer)
-  "Get the UPDATE-FUNCTION stored in `mastodon-buffer-spec'"
+  "Get the UPDATE-FUNCTION stored in `mastodon-tl--buffer-spec'"
   (mastodon-tl--get-buffer-property 'update-function buffer))
 
 (defun mastodon-tl--get-endpoint (&optional buffer)
-  "Get the ENDPOINT stored in `mastodon-buffer-spec'"
+  "Get the ENDPOINT stored in `mastodon-tl--buffer-spec'"
   (mastodon-tl--get-buffer-property 'endpoint buffer))
 
 (defun mastodon-tl--buffer-name (&optional buffer)
-  "Get the BUFFER-NAME stored in `mastodon-buffer-spec'"
+  "Get the BUFFER-NAME stored in `mastodon-tl--buffer-spec'"
   (mastodon-tl--get-buffer-property 'buffer-name buffer ))
 
 (defun mastodon-tl--get-buffer-property (property &optional buffer)
-  "Get `MASTODON-BUFFER-SPEC' in BUFFER or `CURRENT-BUFFER'"
+  "Get `MASTODON-TL--BUFFER-SPEC' in BUFFER or `CURRENT-BUFFER'"
   (with-current-buffer  (or buffer (current-buffer))
-    (if (plist-get mastodon-buffer-spec property)
-        (plist-get mastodon-buffer-spec property)
-      (error "mastodon-buffer-spec is not defined for buffer %s"
+    (if (plist-get mastodon-tl--buffer-spec property)
+        (plist-get mastodon-tl--buffer-spec property)
+      (error "mastodon-tl--buffer-spec is not defined for buffer %s"
              (or buffer (current-buffer))))))
 
 (defun mastodon-tl--more-json (endpoint id)
@@ -303,7 +318,7 @@ Move forward (down) the timeline unless BACKWARD is non-nil."
                               (cdr (assoc 'descendants context)))))
     (mastodon-mode)))
 
-(defun mastodon-tl--more (&optional buffer)
+(defun mastodon-tl--more ()
   "Append older toots to timeline."
   (interactive)
   (let* ((point-before (point))
@@ -342,8 +357,8 @@ UPDATE-FUNCTION is used to recieve more toots."
       (funcall update-function json))
     (mastodon-mode)
     (with-current-buffer buffer
-      (make-local-variable 'mastodon-buffer-spec)
-      (setq mastodon-buffer-spec
+      (make-local-variable 'mastodon-tl--buffer-spec)
+      (setq mastodon-tl--buffer-spec
             `(buffer-name ,buffer-name
                           endpoint ,endpoint update-function
                           ,update-function)))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index fc31a5b..ffe6454 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -29,16 +29,26 @@
 
 ;;; Code:
 
-(require 'mastodon-auth nil t)
-
-(defgroup mastodon-toot nil
-  "Capture Mastodon toots."
-  :prefix "mastodon-toot-"
-  :group 'mastodon)
-
 (defvar mastodon-toot--reply-to-id nil)
 (defvar mastodon-toot--content-warning nil)
 
+(declare-function mastodon-http--api "mastodon-http")
+(declare-function mastodon-http--post "mastodon-http")
+(declare-function mastodon-http--triage "mastodon-http")
+(declare-function mastodon-tl--field "mastodon-tl")
+(declare-function mastodon-tl--goto-next-toot "mastodon-tl")
+(declare-function mastodon-tl--property "mastodon-tl")
+(declare-function mastodon-toot "mastodon")
+
+(defvar mastodon-toot-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "C-c C-c") #'mastodon-toot--send)
+    (define-key map (kbd "C-c C-k") #'mastodon-toot--cancel)
+    (define-key map (kbd "C-c C-w") #'mastodon-toot--toggle-warning)
+      map)
+  "Keymap for `mastodon-toot'.")
+
+
 (defun mastodon-toot--action-success (marker &optional rm)
   "Insert MARKER with 'success face in byline.
 
@@ -211,14 +221,6 @@ If REPLY-TO-ID is provided, set the MASTODON-TOOT--REPLY-TO-ID var."
       (mastodon-toot--setup-as-reply reply-to-user reply-to-id))
     (mastodon-toot-mode t)))
 
-(defvar mastodon-toot-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-c") #'mastodon-toot--send)
-    (define-key map (kbd "C-c C-k") #'mastodon-toot--cancel)
-    (define-key map (kbd "C-c C-w") #'mastodon-toot--toggle-warning)
-      map)
-  "Keymap for `mastodon-toot'.")
-
 (define-minor-mode mastodon-toot-mode
   "Minor mode to capture Mastodon toots."
   :group 'mastodon-toot
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index a0dd732..9f7257e 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -30,8 +30,20 @@
 ;; it is a labor of love.
 
 ;;; Code:
-
-(require 'mastodon-auth nil t)
+(declare-function discover-add-context-menu "discover")
+(declare-function emojify-mode "emojify")
+(declare-function mastodon-tl--get-federated-timeline "mastodon-tl")
+(declare-function mastodon-tl--get-home-timeline "mastodon-tl")
+(declare-function mastodon-tl--get-local-timeline "mastodon-tl")
+(declare-function mastodon-tl--get-tag-timeline "mastodon-tl")
+(declare-function mastodon-tl--goto-next-toot "mastodon-tl")
+(declare-function mastodon-tl--goto-prev-toot "mastodon-tl")
+(declare-function mastodon-tl--thread "mastodon-tl")
+(declare-function mastodon-tl--update "mastodon-tl")
+(declare-function mastodon-toot--compose-buffer "mastodon-toot")
+(declare-function mastodon-toot--reply "mastodon-toot")
+(declare-function mastodon-toot--toggle-boost "mastodon-toot")
+(declare-function mastodon-toot--toggle-favourite "mastodon-toot")
 
 (defgroup mastodon nil
   "Interface with Mastodon."
@@ -43,11 +55,6 @@
   :group 'mastodon
   :type 'string)
 
-(defcustom mastodon-token-file (concat user-emacs-directory "mastodon.plstore")
-  "File path where Mastodon access tokens are stored."
-  :group 'mastodon
-  :type 'file)
-
 (defcustom mastodon-toot-timestamp-format "%F %T"
   "Format to use for timestamps.
 
@@ -57,25 +64,10 @@ Use. e.g. \"%c\" for your locale's date and time format."
   :group 'mastodon
   :type 'string)
 
-(defcustom mastodon-avatar-height 30
-  "Height of the user avatar images (if shown)."
-  :group 'mastodon
-  :type 'integer)
-
-(defcustom mastodon-preview-max-height 250
-  "Max height of any media attachment preview to be shown."
-  :group 'mastodon
-  :type 'integer)
-
 (defvar mastodon-mode-map
   (make-sparse-keymap)
   "Keymap for `mastodon-mode'.")
 
-(defvar mastodon--api-version "v1")
-
-(defvar mastodon-buffer-spec nil
-  "A unique identifier and functions for each Mastodon buffer.")
-
 (defcustom mastodon-mode-hook nil
   "Hook run when entering Mastodon mode."
   :type 'hook
@@ -106,7 +98,6 @@ Use. e.g. \"%c\" for your locale's date and time format."
 (defun mastodon ()
   "Connect Mastodon client to `mastodon-instance-url' instance."
   (interactive)
-  (require 'mastodon-tl nil t)
   (mastodon-tl--get-home-timeline))
 
 ;;;###autoload
@@ -116,7 +107,6 @@ Use. e.g. \"%c\" for your locale's date and time format."
 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."
   (interactive)
-  (require 'mastodon-toot nil t)
   (mastodon-toot--compose-buffer user reply-to-id))
 
 ;;;###autoload
diff --git a/test/mastodon-client-tests.el b/test/mastodon-client-tests.el
index e1f92f8..c339efa 100644
--- a/test/mastodon-client-tests.el
+++ b/test/mastodon-client-tests.el
@@ -54,22 +54,22 @@
 
 (ert-deftest client-1 ()
   "Should return `mastondon-client' if non-nil."
-  (let ((mastodon-client t))
+  (let ((mastodon-client--client-details t))
     (should (eq (mastodon-client) t))))
 
 (ert-deftest client-2 ()
   "Should read from `mastodon-token-file' if available."
-  (let ((mastodon-client nil))
+  (let ((mastodon-client--client-details nil))
     (with-mock
       (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
       (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
-      (should (equal mastodon-client '(:client_id "foo" :client_secret "bar"))))))
+      (should (equal mastodon-client--client-details '(:client_id "foo" :client_secret "bar"))))))
 
 (ert-deftest client-3 ()
   "Should store client data in plstore if it can't be read."
-  (let ((mastodon-client nil))
+  (let ((mastodon-client--client-details nil))
     (with-mock
       (mock (mastodon-client--read))
       (mock (mastodon-client--store) => '(:client_id "foo" :client_secret "baz"))
       (should (equal (mastodon-client) '(:client_id "foo" :client_secret "baz")))
-      (should (equal mastodon-client '(:client_id "foo" :client_secret "baz"))))))
+      (should (equal mastodon-client--client-details '(:client_id "foo" :client_secret "baz"))))))
diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index 9cd06b7..4bb89c7 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -6,7 +6,7 @@
     (mock (image-type-available-p 'imagemagick) => t)
     (mock (create-image * 'imagemagick t :height 123) => :mock-image)
 
-    (let* ((mastodon-avatar-height 123)
+    (let* ((mastodon-media--avatar-height 123)
            (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
            (result-no-properties (substring-no-properties result))
            (properties (text-properties-at 0 result)))
@@ -21,7 +21,7 @@
   (with-mock
     (mock (create-image * nil t) => :mock-image)
 
-    (let* ((mastodon-preview-max-height 123)
+    (let* ((mastodon-media--preview-max-height 123)
            (result (mastodon-media--get-media-link-rendering "http://example.org/img.png"))
            (result-no-properties (substring-no-properties result))
            (properties (text-properties-at 0 result)))
@@ -34,7 +34,7 @@
 (ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png")
-        (mastodon-avatar-height 123))
+        (mastodon-media--avatar-height 123))
     (with-mock
       (mock (image-type-available-p 'imagemagick) => t)
       (mock (create-image * 'imagemagick t :height 123) => '(image foo))
@@ -42,7 +42,7 @@
       (mock (url-retrieve
              url
              #'mastodon-media--process-image-response
-             '(:my-marker (:height 123) 1 "http://example.org/image.png"))
+             '(:my-marker (:height 123) 1))
             => :called-as-expected)
 
       (with-temp-buffer
@@ -62,7 +62,7 @@
       (mock (url-retrieve
              url
              #'mastodon-media--process-image-response
-             '(:my-marker () 1 "http://example.org/image.png"))
+             '(:my-marker () 1))
             => :called-as-expected)
 
       (with-temp-buffer
@@ -82,13 +82,13 @@
       (mock (url-retrieve
              "http://example.org/image.png"
              #'mastodon-media--process-image-response
-             '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
+             '(:my-marker (:max-height 321) 5))
             => :called-as-expected)
       (with-temp-buffer
         (insert (concat "Start:"
                         (mastodon-media--get-media-link-rendering url)
                         ":rest"))
-        (let ((mastodon-preview-max-height 321))
+        (let ((mastodon-media--preview-max-height 321))
           (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:load-image-from-url:media-link-without-imagemagic ()
@@ -101,14 +101,14 @@
       (mock (url-retrieve
              "http://example.org/image.png"
              #'mastodon-media--process-image-response
-             '(:my-marker () 5 "http://example.org/image.png"))
+             '(:my-marker () 5))
             => :called-as-expected)
 
       (with-temp-buffer
         (insert (concat "Start:"
                         (mastodon-media--get-avatar-rendering url)
                         ":rest"))
-        (let ((mastodon-preview-max-height 321))
+        (let ((mastodon-media--preview-max-height 321))
           (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:process-image-response ()
@@ -134,7 +134,7 @@
 
          (mock (create-image "fake\nimage\ndata" 'imagemagick t ':image :option) => :fake-image)
 
-         (mastodon-media--process-image-response () used-marker '(:image :option) 1 "the-url")
+         (mastodon-media--process-image-response () used-marker '(:image :option) 1)
 
          ;; the used marker has been unset:
          (should (null (marker-position used-marker)))
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index caea476..8c706f5 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -105,7 +105,7 @@
 
 (ert-deftest mastodon-tl--byline-regular ()
   "Should format the regular toot correctly."
-  (let ((mastodon-media-show-avatars-p nil)
+  (let ((mastodon-tl--show-avatars-p nil)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
       (mock (date-to-time timestamp) => '(22782 21551))
@@ -119,7 +119,7 @@
 
 (ert-deftest mastodon-tl--byline-regular-with-avatar ()
   "Should format the regular toot correctly."
-  (let ((mastodon-media-show-avatars-p t)
+  (let ((mastodon-tl--show-avatars-p t)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
       (stub create-image => '(image "fake data"))
@@ -134,7 +134,7 @@
 
 (ert-deftest mastodon-tl--byline-boosted ()
   "Should format the boosted toot correctly."
-  (let* ((mastodon-media-show-avatars-p nil)
+  (let* ((mastodon-tl--show-avatars-p nil)
          (toot (cons '(reblogged . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
@@ -148,7 +148,7 @@
 
 (ert-deftest mastodon-tl--byline-favorited ()
   "Should format the favourited toot correctly."
-  (let* ((mastodon-media-show-avatars-p nil)
+  (let* ((mastodon-tl--show-avatars-p nil)
          (toot (cons '(favourited . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
@@ -163,7 +163,7 @@
 
 (ert-deftest mastodon-tl--byline-boosted/favorited ()
   "Should format the boosted & favourited toot correctly."
-  (let* ((mastodon-media-show-avatars-p nil)
+  (let* ((mastodon-tl--show-avatars-p nil)
          (toot `((favourited . t) (reblogged . t) ,@mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
@@ -177,7 +177,7 @@
 
 (ert-deftest mastodon-tl--byline-reblogged ()
   "Should format the reblogged toot correctly."
-  (let* ((mastodon-media-show-avatars-p nil)
+  (let* ((mastodon-tl--show-avatars-p nil)
          (toot mastodon-tl-test-base-boosted-toot)
          (original-toot (cdr (assoc 'reblog mastodon-tl-test-base-boosted-toot)))
          (timestamp (cdr (assoc 'created_at toot)))
@@ -197,7 +197,7 @@
 
 (ert-deftest mastodon-tl--byline-reblogged-with-avatars ()
   "Should format the reblogged toot correctly."
-  (let* ((mastodon-media-show-avatars-p t)
+  (let* ((mastodon-tl--show-avatars-p t)
          (toot mastodon-tl-test-base-boosted-toot)
          (original-toot (cdr (assoc 'reblog mastodon-tl-test-base-boosted-toot)))
          (timestamp (cdr (assoc 'created_at toot)))
@@ -218,7 +218,7 @@
 
 (ert-deftest mastodon-tl--byline-reblogged-boosted/favorited ()
   "Should format the reblogged toot that was also boosted & favoritedcorrectly."
-  (let* ((mastodon-media-show-avatars-p nil)
+  (let* ((mastodon-tl--show-avatars-p nil)
          (toot `((favourited . t) (reblogged . t) ,@mastodon-tl-test-base-boosted-toot))
          (original-toot (cdr (assoc 'reblog mastodon-tl-test-base-boosted-toot)))
          (timestamp (cdr (assoc 'created_at toot)))
-- 
cgit v1.2.3