branch: elpa/mastodon
commit 388dcebfbc5b3b630280c9a89bae54eaf3fa95bf
Merge: 328b8a354e fe5cb8c985
Author: marty hiatt <[email protected]>
Commit: marty hiatt <[email protected]>
Merge branch 'no-insert-suspended-user-toots' into develop
---
lisp/mastodon-tl.el | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 87b6f5a5bb..a200e653b4 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1981,7 +1981,8 @@ CW-EXPANDED means treat content warnings as unfolded."
'wrap-prefix bar)
body)
;; insert quote maybe:
- (when quote
+ (when (and quote
+ (not (string= "deleted" (alist-get 'state quote))))
(concat "\n\n"
(mastodon-tl--insert-quoted quote)
))))
@@ -2073,9 +2074,16 @@ CW-EXPANDED means treat content warnings as unfolded."
(if (mastodon-tl--has-spoiler toot)
(mastodon-tl--spoiler toot)
(mastodon-tl--content toot)))))
- ;; If any filters are "hide", then we hide,
- ;; even though item may also have a "warn" filter:
- (unless (and filtered (assoc "hide" filters)) ;; no insert
+ (unless (or
+ ;; If any filters are "hide", then we hide,
+ ;; even though item may also have a "warn" filter:
+ (and filtered (assoc "hide" filters)) ;; no insert
+ ;; if account suspended, no-op:
+ ;; https://codeberg.org/martianh/mastodon.el/issues/753
+ ;; a user found post in bookmarks from a suspended user,
+ ;; breaking loading of bookmarks, even though I suspect the
+ ;; server should not even send us such data:
+ (map-nested-elt toot '(account suspended)))
(mastodon-tl--insert-status
toot (mastodon-tl--clean-tabs-and-nl spoiler-or-content)
detailed-p thread domain unfolded no-byline cw-expanded))))
