refactor mastodon-notifications--insert-status

which was a copy of mastodon-tl--insert-status.

we revert to having just the latter as main function with optional argument.

mastodon-notifications--insert-status just calls it with the arg ID.

the reason we need the difference is to ensure notifications have their own
ID, and not that of the toot the notif refers to, attached as property
"toot-id". then we have all functionality working on notifications, such as
boosting mentions and so on.

2 files changed, 9 insertions, 17 deletions

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index bb05103..2de53b1 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -226,7 +226,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.
@@ -241,19 +241,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")