display edit timestamp in byline, function to view toot history

3 files changed, 74 insertions, 13 deletions

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 20ac788..b8f2238 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -593,7 +593,9 @@ this just means displaying toot client."
                          "K"))
          (visibility (mastodon-tl--field 'visibility toot))
          (account (alist-get 'account toot))
-         (avatar-url (alist-get 'avatar account)))
+         (avatar-url (alist-get 'avatar account))
+         (edited-time (alist-get 'edited_at toot))
+         (edited-parsed (when edited-time (date-to-time edited-time))))
     (concat
      ;; Boosted/favourited markers are not technically part of the byline, so
      ;; we don't propertize them with 'byline t', as per the rest. This
@@ -621,6 +623,7 @@ this just means displaying toot client."
        ;; we propertize help-echo format faves for author name
        ;; in `mastodon-tl--byline-author'
        (funcall author-byline toot)
+       ;; visibility:
        (cond ((equal visibility "direct")
               (if (fontp (char-displayable-p #10r9993))
                   " ✉"
@@ -629,6 +632,7 @@ this just means displaying toot client."
               (if (fontp (char-displayable-p #10r128274))
                   " 🔒"
                 " [followers]")))
+       ;; action:
        (funcall action-byline toot)
        " "
        ;; TODO: Once we have a view for toot (responses etc.) make
@@ -654,12 +658,44 @@ this just means displaying toot client."
 		          'shr-url app-url
                           'help-echo app-url
 		          'keymap mastodon-tl--shr-map-replacement)))))
+       (when edited-time
+         (concat
+          (if (fontp (char-displayable-p #10r128274))
+              " ✍ "
+            " [edited] ")
+          (propertize
+           (format-time-string mastodon-toot-timestamp-format
+                               edited-parsed)
+           'face 'font-lock-comment-face
+           'timestamp edited-parsed
+           'display (if mastodon-tl--enable-relative-timestamps
+                        (mastodon-tl--relative-time-description edited-parsed)
+                      edited-parsed))))
        (propertize "\n  ------------\n" 'face 'default))
       'favourited-p faved
       'boosted-p    boosted
       'bookmarked-p bookmarked
+      'edited edited-time
+      'edit-history (when edited-time
+                      (mastodon-toot--get-toot-edits (alist-get 'id toot)))
       'byline       t))))
 
+(defun mastodon-tl--format-edit-timestamp (timestamp)
+  "Convert edit TIMESTAMP into a descriptive string."
+  (let ((parsed (ts-human-duration
+                 (ts-diff (ts-now) (ts-parse timestamp)))))
+    (cond ((> (plist-get parsed :days) 0)
+           (format "%s days ago" (plist-get parsed :days) (plist-get parsed :hours)))
+          ((> (plist-get parsed :hours) 0)
+           (format "%s hours ago" (plist-get parsed :hours) (plist-get parsed :minutes)))
+          ((> (plist-get parsed :minutes) 0)
+           (format "%s minutes ago" (plist-get parsed :minutes)))
+          (t ;; we failed to guess:
+           (format "%s days, %s hours, %s minutes ago"
+                   (plist-get parsed :days)
+                   (plist-get parsed :hours)
+                   (plist-get parsed :minutes))))))
+
 (defun mastodon-tl--format-faved-or-boosted-byline (letter)
   "Format the byline marker for a boosted or favourited status.
 LETTER is a string, F for favourited, B for boosted, or K for bookmarked."
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 9714854..ffb603d 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -728,20 +728,43 @@ instance to edit a toot."
   (let ((url (mastodon-http--api (format "/statuses/%s/source" id))))
     (mastodon-http--get-json url :silent)))
 
-(defun mastodon-toot--get-toot-edits ()
-  "Return the edit history of toot at point."
-  (let* ((toot (or (mastodon-tl--property 'base-toot)
-                   (mastodon-tl--property 'toot-json)))
-         (id (mastodon-tl--field 'id toot))
-         (url (mastodon-http--api (format "statuses/%s/history" id))))
+(defun mastodon-toot--get-toot-edits (id)
+  "Return the edit history of toot with ID."
+  (let* ((url (mastodon-http--api (format "statuses/%s/history" id))))
     (mastodon-http--get-json url)))
 
-(defun mastodon-toot--edited-at ()
-  "Return edited_at timestamp of TOOT.
-Is also a predicated test for whether a toot has been edited."
-  (let* ((toot (or (mastodon-tl--property 'base-toot)
-                   (mastodon-tl--property 'toot-json))))
-    (alist-get 'edited_at toot)))
+(defun mastodon-toot--view-toot-edits ()
+  "View editing history of the toot at point in a popup buffer."
+  (interactive)
+  (let ((history (mastodon-tl--property 'edit-history)))
+    (with-current-buffer (get-buffer-create "*mastodon-toot-edits*")
+      (let ((inhibit-read-only t))
+        (special-mode)
+        (erase-buffer)
+        (let ((count 1))
+          (mapc (lambda (x)
+                  (insert (propertize (if (= count 1)
+                                          (format "%s [original]:\n" count)
+                                        (format "%s:\n" count))
+                                      'face 'font-lock-comment-face)
+                          (mastodon-toot--insert-toot-iter x)
+                          "\n")
+                  (cl-incf count))
+                history))
+        (switch-to-buffer-other-window (current-buffer))
+        (setq-local header-line-format
+                    (propertize
+                     (format "Edits to toot by %s:"
+                             (alist-get 'username
+                                        (alist-get 'account (car history))))
+                     'face font-lock-comment-face))))))
+
+(defun mastodon-toot--insert-toot-iter (it)
+  "Insert iteration IT of toot."
+  (let ((content (alist-get 'content it))
+        (account (alist-get 'account it)))
+    ;; TODO: handle polls, media
+    (mastodon-tl--render-text content)))
 
 (defun mastodon-toot--restore-previous-window-config (config)
   "Restore the window CONFIG after killing the toot compose buffer.
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 393d7b6..5be168c 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -95,6 +95,7 @@
 (autoload 'mastodon-notifications--get-mentions "mastodon-notifications")
 (autoload 'mastodon-tl--view-lists "mastodon-tl")
 (autoload 'mastodon-toot--edit-toot-at-point "mastodon-toot")
+(autoload 'mastodon-toot--view-toot-history "mastodon-tl")
 
 (defgroup mastodon nil
   "Interface with Mastodon."
@@ -199,6 +200,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "X") #'mastodon-tl--view-lists)
     (define-key map (kbd "@") #'mastodon-notifications--get-mentions)
     (define-key map (kbd "e") #'mastodon-toot--edit-toot-at-point)
+    (define-key map (kbd "E") #'mastodon-toot--view-toot-edits)
     (when (require 'lingva nil :no-error)
       (define-key map (kbd "s") #'mastodon-toot--translate-toot-text))
     map)