caption + props for media urls as well as actual media

adds fun mastodon-tl--propertize-img-str-or-url, to prop both.

2 files changed, 58 insertions, 37 deletions

diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 9715a6c..c783130 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -35,6 +35,8 @@
 ;;; Code:
 (require 'url-cache)
 
+(autoload 'mastodon-tl--propertize-img-str-or-url "mastodon-tl")
+
 (defvar url-show-status)
 
 (defvar mastodon-tl--shr-image-map-replacement)
@@ -306,34 +308,23 @@ Replace them with the referenced image."
                                  t image-options))
      " ")))
 
-(defun mastodon-media--get-media-link-rendering (media-url &optional full-remote-url type caption)
+(defun mastodon-media--get-media-link-rendering (media-url &optional full-remote-url
+                                                           type caption)
   "Return the string to be written that renders the image at MEDIA-URL.
 FULL-REMOTE-URL is used for `shr-browse-image'.
 TYPE is the attachment's type field on the server.
 CAPTION is the image caption if provided."
   (let* ((help-echo-base "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview")
-        (help-echo (if caption
-                       (concat help-echo-base
-                               "\n\""
-                               caption "\"")
-                     help-echo-base)))
+         (help-echo (if caption
+                        (concat help-echo-base
+                                "\n\""
+                                caption "\"")
+                      help-echo-base)))
     (concat
-     (propertize "[img]"
-                 'media-url media-url
-                 'media-state 'needs-loading
-                 'media-type 'media-link
-                 'mastodon-media-type type
-                 'display (create-image mastodon-media--generic-broken-image-data nil t)
-                 'mouse-face 'highlight
-                 'mastodon-tab-stop 'image ; for do-link-action-at-point
-                 'image-url full-remote-url ; for shr-browse-image
-                 'keymap mastodon-tl--shr-image-map-replacement
-                 'help-echo (if (or (string= type "image")
-                                    (string= type nil)
-                                    (string= type "unknown")) ;handle borked images
-                                help-echo
-                              (concat help-echo "\nC-RET: play " type " with mpv")))
-                 " ")))
+     (mastodon-tl--propertize-img-str-or-url
+      "[img]" media-url full-remote-url type help-echo
+      (create-image mastodon-media--generic-broken-image-data nil t))
+     " ")))
 
 (provide 'mastodon-media)
 ;;; mastodon-media.el ends here
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 159c2cc..b74ac84 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1019,26 +1019,56 @@ message is a link which unhides/hides the main body."
 (defun mastodon-tl--media (toot)
   "Retrieve a media attachment link for TOOT if one exists."
   (let* ((media-attachements (mastodon-tl--field 'media_attachments toot))
-         (media-string (mapconcat
-                        (lambda (media-attachement)
-                          (let ((preview-url
-                                 (alist-get 'preview_url media-attachement))
-                                (remote-url
-                                 (or (alist-get 'remote_url media-attachement)
-                                     ;; fallback b/c notifications don't have remote_url
-                                     (alist-get 'url media-attachement)))
-                                (type (alist-get 'type media-attachement))
-                                (caption (alist-get 'description media-attachement)))
-                            (if mastodon-tl--display-media-p
-                                (mastodon-media--get-media-link-rendering
-                                 preview-url remote-url type caption) ; 2nd arg for shr-browse-url
-                              (concat "Media::" preview-url "\n"))))
-                        media-attachements "")))
+         (media-string
+          (mapconcat
+           (lambda (media-attachement)
+             (let ((preview-url
+                    (alist-get 'preview_url media-attachement))
+                   (remote-url
+                    (or (alist-get 'remote_url media-attachement)
+                        ;; fallback b/c notifications don't have remote_url
+                        (alist-get 'url media-attachement)))
+                   (type (alist-get 'type media-attachement))
+                   (caption (alist-get 'description media-attachement)))
+               (if mastodon-tl--display-media-p
+                   (mastodon-media--get-media-link-rendering
+                    preview-url remote-url type caption) ; 2nd arg for shr-browse-url
+                 (concat
+                  (mastodon-tl--propertize-img-str-or-url
+                   (concat "Media:: " preview-url)
+                   preview-url remote-url type caption nil 'shr-link)
+                  "\n"))))
+           media-attachements "")))
     (if (not (and mastodon-tl--display-media-p
                   (string-empty-p media-string)))
         (concat "\n" media-string)
       "")))
 
+(defun mastodon-tl--propertize-img-str-or-url (str media-url full-remote-url type
+                                                   help-echo &optional display face)
+  "Propertize an media placeholder string \"[img]\" or media URL.
+
+STR is the string to propertize, MEDIA-URL is the preview link,
+FULL-REMOTE-URL is the link to the full resolution image on the
+server, TYPE is the media type.
+HELP-ECHO, DISPLAY, and FACE are the text properties to add."
+  (propertize str
+              'media-url media-url
+              'media-state (when (string= str "[img]") 'needs-loading)
+              'media-type 'media-link
+              'mastodon-media-type type
+              'display display
+              'face face
+              'mouse-face 'highlight
+              'mastodon-tab-stop 'image ; for do-link-action-at-point
+              'image-url full-remote-url ; for shr-browse-image
+              'keymap mastodon-tl--shr-image-map-replacement
+              'help-echo (if (or (string= type "image")
+                                 (string= type nil)
+                                 (string= type "unknown")) ;handle borked images
+                             help-echo
+                           (concat help-echo "\nC-RET: play " type " with mpv"))))
+
 (defun mastodon-tl--content (toot)
   "Retrieve text content from TOOT.
 Runs `mastodon-tl--render-text' and fetches poll or media."