diff options
| author | Alexander Griffith <griffitaj@gmail.com> | 2017-05-12 23:03:45 -0400 |
|---|---|---|
| committer | Alexander Griffith <griffitaj@gmail.com> | 2017-05-12 23:03:45 -0400 |
| commit | ab7b7724b9c466726d24aa8c7b68a939b0271238 (patch) | |
| tree | 0239e51406c912631b4763c7c94b80750bcbb619 /lisp/mastodon-tl.el | |
| parent | 92a40a6bd6b524ee29385dc8a27c4b05b89b2cea (diff) | |
| parent | 8cd83d70daa94c5387764c059419c518623099d8 (diff) | |
adjusted for async image loading
Diffstat (limited to 'lisp/mastodon-tl.el')
| -rw-r--r-- | lisp/mastodon-tl.el | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 12b739b..a354278 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -104,8 +104,11 @@ Optionally start from POS." "Propertize author of TOOT." (let* ((account (cdr (assoc 'account toot))) (handle (cdr (assoc 'acct account))) - (name (cdr (assoc 'display_name account)))) + (name (cdr (assoc 'display_name account))) + (avatar-url (cdr (assoc 'avatar account)))) (concat + (when mastodon-media-show-avatars-p + (mastodon-media--get-avatar-rendering avatar-url)) (propertize name 'face 'warning) " (@" handle @@ -177,17 +180,18 @@ also render the html" (defun mastodon-tl--media (toot) "Retrieve a media attachment link for TOOT if one exists." - (let* ((media (mastodon-tl--field 'media_attachments toot)) + (let* ((media-attachements (mastodon-tl--field 'media_attachments toot)) (media-string (mapconcat - (lambda (media-preview) - (concat "Media_Link:: " - (mastodon-tl--set-face - (cdr (assoc 'preview_url media-preview)) - 'mouse-face nil))) - media "\n"))) + (lambda (media-attachement) + (let ((preview-url + (cdr (assoc 'preview_url media-attachement)))) + (mastodon-media--get-media-link-rendering + preview-url))) + media-attachements ""))) (if (not (equal media-string "")) (concat "\n" media-string ) ""))) + (defun mastodon-tl--content (toot) "Retrieve text content from TOOT." (let ((content (mastodon-tl--field 'content toot)) @@ -203,7 +207,7 @@ also render the html" (insert (concat (mastodon-tl--spoiler toot) - (replace-regexp-in-string "\n*$" "" (mastodon-tl--content toot)) + (replace-regexp-in-string "\n*$" "" (mastodon-tl--content toot)) (mastodon-tl--media toot) "\n\n" (mastodon-tl--byline toot) |