diff options
| author | Alexander Griffith <griffitaj@gmail.com> | 2017-05-12 22:56:05 -0400 |
|---|---|---|
| committer | Alexander Griffith <griffitaj@gmail.com> | 2017-05-12 22:56:05 -0400 |
| commit | 92a40a6bd6b524ee29385dc8a27c4b05b89b2cea (patch) | |
| tree | 60e0601efe00b5b51f5a4c4c2aedd6fbfaf67bbd /lisp/mastodon-tl.el | |
| parent | b0ead06b42ed06218e87a0bb75dae41570592423 (diff) | |
Revert "Adjusted for async image changes"
This reverts commit b0ead06b42ed06218e87a0bb75dae41570592423.
Diffstat (limited to 'lisp/mastodon-tl.el')
| -rw-r--r-- | lisp/mastodon-tl.el | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 7efaf11..12b739b 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -104,11 +104,8 @@ 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))) - (avatar-url (cdr (assoc 'avatar account)))) + (name (cdr (assoc 'display_name account)))) (concat - (when mastodon-media-show-avatars-p - (mastodon-media--get-avatar-rendering avatar-url)) (propertize name 'face 'warning) " (@" handle @@ -180,14 +177,14 @@ also render the html" (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 - (cdr (assoc 'preview_url media-attachement)))) - (mastodon-media--get-media-link-rendering preview-url))) - media-attachements ""))) + (let* ((media (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"))) (if (not (equal media-string "")) (concat "\n" media-string ) ""))) @@ -206,7 +203,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) |