aboutsummaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authormousebot <mousebot@riseup.net>2021-12-24 17:31:42 +0100
committermousebot <mousebot@riseup.net>2021-12-24 17:31:42 +0100
commit11352609304e1e2f328592332f31fc30cb327d8d (patch)
tree00b3434a8492b71f9420f70ea06662db9f1bc5b4 /lisp
parenta164bda8719733f4a13e22ba7257ca4bcab0fb17 (diff)
parenta56e2bfcaaa7706a2b27656413170c83bffa6ef0 (diff)
Merge branch 'insert-status-refactor' into develop
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mastodon-notifications.el16
-rw-r--r--lisp/mastodon-tl.el10
2 files changed, 9 insertions, 17 deletions
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index c8b93a2..d0d221c 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -223,7 +223,7 @@ Status notifications are given when
"Posted"))
id)))
-(defun mastodon-notifications--insert-status (toot body author-byline action-byline &optional id)
+(defun mastodon-notifications--insert-status (toot body author-byline action-byline id)
"Display the content and byline of timeline element TOOT.
BODY will form the section of the toot above the byline.
@@ -238,19 +238,7 @@ takes a single function. By default it is
`mastodon-tl--byline-boosted'.
ID is the notification's own id, which is attached as a property."
- (let ((start-pos (point)))
- (insert
- (propertize
- (concat "\n"
- body
- " \n"
- (mastodon-tl--byline toot author-byline action-byline))
- 'toot-id id
- 'base-toot-id (mastodon-tl--toot-id toot)
- 'toot-json toot)
- "\n")
- (when mastodon-tl--display-media-p
- (mastodon-media--inline-images start-pos (point)))))
+ (mastodon-tl--insert-status toot body author-byline action-byline id))
(defun mastodon-notifications--by-type (note)
"Filters NOTE for those listed in `mastodon-notifications--types-alist'."
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b2b8026..87b8dfc 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -734,7 +734,7 @@ Runs `mastodon-tl--render-text' and fetches poll or media."
(mastodon-tl--get-poll toot))
(mastodon-tl--media toot))))
-(defun mastodon-tl--insert-status (toot body author-byline action-byline)
+(defun mastodon-tl--insert-status (toot body author-byline action-byline &optional id)
"Display the content and byline of timeline element TOOT.
BODY will form the section of the toot above the byline.
@@ -744,7 +744,10 @@ portion of the byline that takes one variable. By default it is
ACTION-BYLINE is also an optional function for adding an action,
such as boosting favouriting and following to the byline. It also
takes a single function. By default it is
-`mastodon-tl--byline-boosted'"
+`mastodon-tl--byline-boosted'.
+
+ID is that of the toot, which is attached as a property if it is
+a notification."
(let ((start-pos (point)))
(insert
(propertize
@@ -752,7 +755,8 @@ takes a single function. By default it is
body
" \n"
(mastodon-tl--byline toot author-byline action-byline))
- 'toot-id (alist-get 'id toot)
+ 'toot-id (or id ; for notifications
+ (alist-get 'id toot))
'base-toot-id (mastodon-tl--toot-id toot)
'toot-json toot)
"\n")