aboutsummaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authormousebot <mousebot@riseup.net>2022-02-18 17:15:59 +0100
committermousebot <mousebot@riseup.net>2022-02-18 17:15:59 +0100
commit4f582388e0594753d15f0d386cbb1ab2eaad5a02 (patch)
tree636d65c2b76bc6daa3e858a2f40a15df39afb4ea /lisp
parent25282eb0daa8edfeb777a2fe6c6e0538fdba08a5 (diff)
test for toot-json before following/muting/blocking etc
this is more needed now that we have some other buffers like follow suggestions and follow requests, which want to be able to use these functions. previously, if any of them were called in these buffers when not on the correct item, the buffer would reload and duplicate. ultimately this was probably due to tl--property calls failing, which causes goto-next-toot to be called, which when it also fails calls tl--more.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mastodon-tl.el70
1 files changed, 42 insertions, 28 deletions
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 7ba78e4..7a346c1 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1258,17 +1258,21 @@ RESPONSE is the JSON returned by the server."
If NOTIFY is \"true\", enable notifications when that user posts.
If NOTIFY is \"false\", disable notifications when that user posts.
Can be called to toggle NOTIFY on users already being followed."
- (interactive
- (list
- (mastodon-tl--interactive-user-handles-get "follow")))
- (mastodon-tl--do-user-action-and-response user-handle "follow" nil notify))
+ (interactive
+ (list
+ (mastodon-tl--interactive-user-handles-get "follow")))
+ (if (not (get-text-property (point) 'toot-json))
+ (message "Looks like there's no toot or user at point?")
+ (mastodon-tl--do-user-action-and-response user-handle "follow" nil notify)))
(defun mastodon-tl--enable-notify-user-posts (user-handle)
"Query for USER-HANDLE and enable notifications when they post."
(interactive
(list
(mastodon-tl--interactive-user-handles-get "enable")))
- (mastodon-tl--follow-user user-handle "true"))
+ (if (not (get-text-property (point) 'toot-json))
+ (message "Looks like there's no toot or user at point?")
+ (mastodon-tl--follow-user user-handle "true")))
(defun mastodon-tl--disable-notify-user-posts (user-handle)
"Query for USER-HANDLE and disable notifications when they post."
@@ -1282,14 +1286,18 @@ Can be called to toggle NOTIFY on users already being followed."
(interactive
(list
(mastodon-tl--interactive-user-handles-get "unfollow")))
- (mastodon-tl--do-user-action-and-response user-handle "unfollow" t))
+ (if (not (get-text-property (point) 'toot-json))
+ (message "Looks like there's no toot or user at point?")
+ (mastodon-tl--do-user-action-and-response user-handle "unfollow" t)))
(defun mastodon-tl--block-user (user-handle)
"Query for USER-HANDLE from current status and block that user."
(interactive
(list
(mastodon-tl--interactive-user-handles-get "block")))
- (mastodon-tl--do-user-action-and-response user-handle "block"))
+ (if (not (get-text-property (point) 'toot-json))
+ (message "Looks like there's no toot or user at point?")
+ (mastodon-tl--do-user-action-and-response user-handle "block")))
(defun mastodon-tl--unblock-user (user-handle)
"Query for USER-HANDLE from list of blocked users and unblock that user."
@@ -1305,7 +1313,9 @@ Can be called to toggle NOTIFY on users already being followed."
(interactive
(list
(mastodon-tl--interactive-user-handles-get "mute")))
- (mastodon-tl--do-user-action-and-response user-handle "mute"))
+ (if (not (get-text-property (point) 'toot-json))
+ (message "Looks like there's no toot or user at point?")
+ (mastodon-tl--do-user-action-and-response user-handle "mute")))
(defun mastodon-tl--unmute-user (user-handle)
"Query for USER-HANDLE from list of muted users and unmute that user."
@@ -1318,26 +1328,30 @@ Can be called to toggle NOTIFY on users already being followed."
(defun mastodon-tl--interactive-user-handles-get (action)
"Get the list of user-handles for ACTION from the current toot."
- (let ((user-handles
- (cond ((or (equal (buffer-name) "*mastodon-follow-suggestions*")
- ;; follow suggests / search / foll requests compat:
- (string-prefix-p "*mastodon-search" (buffer-name))
- (equal (buffer-name) "*mastodon-follow-requests*")
- ;; profile view follows/followers compat:
- ;; but not for profile statuses:
- (and (string-prefix-p "accounts" (mastodon-tl--get-endpoint))
- (not (string-suffix-p "statuses" (mastodon-tl--get-endpoint)))))
- (list (alist-get 'acct (mastodon-tl--property 'toot-json))))
- (t
- (mastodon-profile--extract-users-handles
- (mastodon-profile--toot-json))))))
- (completing-read (if (or (equal action "disable")
- (equal action "enable"))
- (format "%s notifications when user posts: " action)
- (format "Handle of user to %s: " action))
- user-handles
- nil ; predicate
- 'confirm)))
+ (if (not (get-text-property (point) 'toot-json))
+ (message "Looks like there's no toot or user at point?")
+ (let ((user-handles
+ (cond ((or (equal (buffer-name) "*mastodon-follow-suggestions*")
+ ;; follow suggests / search / foll requests compat:
+ (string-prefix-p "*mastodon-search" (buffer-name))
+ (equal (buffer-name) "*mastodon-follow-requests*")
+ ;; profile view follows/followers compat:
+ ;; but not for profile statuses:
+ (and (string-prefix-p "accounts" (mastodon-tl--get-endpoint))
+ (not (string-suffix-p "statuses" (mastodon-tl--get-endpoint)))))
+ ;; avoid tl--property here because it calls next-toot
+ ;; which breaks non-toot buffers like foll reqs etc.:
+ (list (alist-get 'acct (get-text-property (point) 'toot-json))))
+ (t
+ (mastodon-profile--extract-users-handles
+ (mastodon-profile--toot-json))))))
+ (completing-read (if (or (equal action "disable")
+ (equal action "enable"))
+ (format "%s notifications when user posts: " action)
+ (format "Handle of user to %s: " action))
+ user-handles
+ nil ; predicate
+ 'confirm))))
(defun mastodon-tl--interactive-blocks-or-mutes-list-get (action)
"Fetch the list of accounts for ACTION from the server.