From e7436ad93df6f489eaba4d0a29685e3cf618bb59 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 2 Sep 2022 17:14:35 +0200
Subject: simple error handling in single-toot and --thread

---
 lisp/mastodon-tl.el | 66 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

(limited to 'lisp/mastodon-tl.el')

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 816829e..6a8b0ba 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1197,16 +1197,18 @@ ID is that of the toot to view."
          (buffer (format "*mastodon-toot-%s*" id))
          (toot (mastodon-http--get-json
                 (mastodon-http--api (concat "statuses/" id)))))
-    (with-output-to-temp-buffer buffer
-      (switch-to-buffer buffer)
-      (mastodon-mode)
-      (setq mastodon-tl--buffer-spec
-            `(buffer-name ,buffer
-                          endpoint ,(format "statuses/%s" id)
-                          update-function
-                          (lambda (toot) (message "END of thread."))))
-      (let ((inhibit-read-only t))
-        (mastodon-tl--toot toot :detailed-p)))))
+    (if (equal (caar toot) 'error)
+        (message "Error: %s" (cdar toot))
+      (with-output-to-temp-buffer buffer
+        (switch-to-buffer buffer)
+        (mastodon-mode)
+        (setq mastodon-tl--buffer-spec
+              `(buffer-name ,buffer
+                            endpoint ,(format "statuses/%s" id)
+                            update-function
+                            (lambda (toot) (message "END of thread."))))
+        (let ((inhibit-read-only t))
+          (mastodon-tl--toot toot :detailed-p))))))
 
 (defun mastodon-tl--thread ()
   "Open thread buffer for toot under `point'."
@@ -1226,27 +1228,29 @@ ID is that of the toot to view."
           (mastodon-http--get-json
            (mastodon-http--api (concat "statuses/" id))))
          (context (mastodon-http--get-json url)))
-    (when (member (alist-get 'type toot) '("reblog" "favourite"))
-      (setq toot (alist-get 'status toot)))
-    (if (> (+ (length (alist-get 'ancestors context))
-              (length (alist-get 'descendants context)))
-           0)
-        (progn
-          (with-output-to-temp-buffer buffer
-            (switch-to-buffer buffer)
-            (mastodon-mode)
-            (setq mastodon-tl--buffer-spec
-                  `(buffer-name ,buffer
-                                endpoint ,(format "statuses/%s/context" id)
-                                update-function
-                                (lambda (toot) (message "END of thread."))))
-            (let ((inhibit-read-only t))
-              (mastodon-tl--timeline (alist-get 'ancestors context))
-              (goto-char (point-max))
-              (mastodon-tl--toot toot :detailed-p)
-              (mastodon-tl--timeline (alist-get 'descendants context))))
-          (mastodon-tl--goto-next-toot))
-      (mastodon-tl--single-toot id))))
+    (if (equal (caar toot) 'error)
+        (message "Error: %s" (cdar toot))
+      (when (member (alist-get 'type toot) '("reblog" "favourite"))
+        (setq toot (alist-get 'status toot)))
+      (if (> (+ (length (alist-get 'ancestors context))
+                (length (alist-get 'descendants context)))
+             0)
+          (progn
+            (with-output-to-temp-buffer buffer
+              (switch-to-buffer buffer)
+              (mastodon-mode)
+              (setq mastodon-tl--buffer-spec
+                    `(buffer-name ,buffer
+                                  endpoint ,(format "statuses/%s/context" id)
+                                  update-function
+                                  (lambda (toot) (message "END of thread."))))
+              (let ((inhibit-read-only t))
+                (mastodon-tl--timeline (alist-get 'ancestors context))
+                (goto-char (point-max))
+                (mastodon-tl--toot toot :detailed-p)
+                (mastodon-tl--timeline (alist-get 'descendants context))))
+            (mastodon-tl--goto-next-toot))
+        (mastodon-tl--single-toot id)))))
 
 (defun mastodon-tl--create-filter ()
   "Create a filter for a word.
-- 
cgit v1.2.3