Merge branch 'develop' into imgcaching

1 files changed, 10 insertions, 15 deletions

diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 8aadf0a..a401de5 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -47,7 +47,12 @@
   :type 'integer)
 
 (defcustom mastodon-media--preview-max-height 250
-  "Max height of any media attachment preview to be shown."
+  "Max height of any media attachment preview to be shown in timelines."
+  :group 'mastodon-media
+  :type 'integer)
+
+(defcustom mastodon-media--attachment-height 80
+  "Height of the attached images preview in the toot draft buffer."
   :group 'mastodon-media
   :type 'integer)
 
@@ -130,7 +135,7 @@ 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 url)
+    (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'.
@@ -151,8 +156,6 @@ REGION-LENGTH is the length of the region that should be replaced with the image
                                      (when image-options 'imagemagick)
                                    nil) ; inbuilt scaling in 27.1
                                  t image-options))))
-            (unless (url-is-cached url) ; cache image if not already cached
-              (url-store-in-cache url-buffer))
             (with-current-buffer (marker-buffer marker)
               ;; Save narrowing in our buffer
               (let ((inhibit-read-only t))
@@ -191,17 +194,9 @@ REGION-LENGTH is the range from start to propertize."
       (condition-case nil
           ;; catch any errors in url-retrieve so as to not abort
           ;; whatever called us
-          (if (url-is-cached url)
-              ;; if image url is cached, decompress and use it
-              (with-current-buffer (url-fetch-from-cache url)
-                (set-buffer-multibyte nil)
-                (goto-char (point-min))
-                (zlib-decompress-region (goto-char (search-forward "\n\n")) (point-max))
-                (mastodon-media--process-image-response nil marker image-options region-length url))
-            ;; else fetch as usual and process-image-response will cache it
-            (url-retrieve url
-                          #'mastodon-media--process-image-response
-                          (list marker image-options region-length url)))
+          (url-retrieve url
+                        #'mastodon-media--process-image-response
+                        (list marker image-options region-length))
         (error (with-current-buffer buffer
                  ;; TODO: Consider adding retries
                  (put-text-property marker