From 499c03aa783628ff5937b77cb48d3aeaa83f0ae3 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Thu, 8 Aug 2024 14:05:10 +0200
Subject: refactor process-image-or-cached

---
 lisp/mastodon-media.el | 38 +++++++++++++++++++++-----------------
 lisp/mastodon-tl.el    | 16 ++++------------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 570be02..d386462 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -357,6 +357,20 @@ STATUS-PLIST is a plist of status events as per `url-retrieve'."
           (switch-to-buffer-other-window (current-buffer))
           (image-transform-fit-both))))))
 
+(defun mastodon-media--image-or-cached (url process-fun args)
+  "Fetch URL from cache or fro host.
+Call PROCESS-FUN on it with ARGS."
+  (if (and mastodon-media--enable-image-caching
+           (url-is-cached url)) ;; if cached, decompress and use:
+      (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))
+        (funcall process-fun url args))
+    ;; fetch as usual and process-image-response will cache it
+    (url-retrieve url process-fun (cdr args))))
+
 (defun mastodon-media--load-image-from-url (url media-type start region-length)
   "Take a URL and MEDIA-TYPE and load the image asynchronously.
 MEDIA-TYPE is a symbol and either `avatar' or `media-link'.
@@ -373,24 +387,14 @@ REGION-LENGTH is the range from start to propertize."
         (url-show-status nil)) ; stop url.el from spamming us about connecting
     (condition-case nil
         ;; catch errors in url-retrieve to not break our caller
-        (if (and mastodon-media--enable-image-caching
-                 (url-is-cached url)) ;; if cached, decompress and use:
-            (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)))
+        (mastodon-media--image-or-cached
+         url
+         #'mastodon-media--process-image-response
+         (list nil marker image-options region-length url))
       (error (with-current-buffer buffer
-               ;; TODO: Consider adding retries
-               (put-text-property marker
-                                  (+ marker region-length)
-                                  'media-state
-                                  'loading-failed)
+               ;; TODO: Add retries
+               (put-text-property marker (+ marker region-length)
+                                  'media-state 'loading-failed)
                :loading-failed)))))
 
 (defun mastodon-media--select-next-media-line (end-pos)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index be71b4d..375f7e4 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1222,18 +1222,10 @@ SENSITIVE is a flag from the item's JSON data."
     (let* ((url (mastodon-tl--property 'image-url)))
       (if (not mastodon-tl--load-full-sized-images-in-emacs)
           (shr-browse-image)
-        (if (and mastodon-media--enable-image-caching
-                 (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-full-sized-image-response nil url))
-          ;; else fetch and load:
-          (url-retrieve url #'mastodon-media--process-full-sized-image-response
-                        `(,url)))))))
+        (mastodon-media--image-or-cached
+         url
+         #'mastodon-media--process-full-sized-image-response
+         `(nil ,url))))))
 
 (defvar mastodon-media--sensitive-image-data)
 
-- 
cgit v1.2.3