diff options
| author | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2022-12-28 18:49:07 +1100 |
|---|---|---|
| committer | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2022-12-28 18:49:07 +1100 |
| commit | 76c86951411a4a09042bc4444fbbceefdf4b9b2a (patch) | |
| tree | 8cc5806ac0c6fd55b10dbf1ab4b80f5a34978d04 | |
| parent | c147e78b1aa6369eef4f3380b6d9df73055cb341 (diff) | |
Revert "adapt messaging for following of locked accounts"
This reverts commit 0eeb429d3531a3c11cc9ea3c3aef258b7c671edb.
| -rw-r--r-- | lisp/mastodon-tl.el | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 8ae0ded..ee6858f 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -2281,15 +2281,6 @@ LANGS is an array parameters alist of languages to filer user's posts by." (mastodon-tl--do-user-action-and-response user-handle "follow" nil notify langs))) -(defun mastodon-tl--account-locked-p (response) - "Return non-nil if RESPONSE states that the account acted upon is locked." - (let* ((json (with-current-buffer response (mastodon-http--process-json))) - (locked-p (alist-get 'requested json))) - ;; handle :json-false in response: - (if (eq 't locked-p) - t - nil))) - (defun mastodon-tl--enable-notify-user-posts (user-handle) "Query for USER-HANDLE and enable notifications when they post." (interactive @@ -2477,23 +2468,20 @@ ARGS is an alist of any parameters to send with the request." (mastodon-http--triage response (lambda () - (let ((locked-p (mastodon-tl--account-locked-p response))) - (cond ((string-equal notify "true") - (message "Receiving notifications for user %s (@%s)!" - name user-handle)) - ((string-equal notify "false") - (message "Not receiving notifications for user %s (@%s)!" - name user-handle)) - ((or (string-equal action "mute") - (string-equal action "unmute")) - (message "User %s (@%s) %sd!" name user-handle action)) - ((assoc "languages[]" args #'equal) - (message "User %s filtered by language(s): %s" name - (mapconcat #'cdr args " "))) - (locked-p - (message "Requested to follow user %s (@%s)" name user-handle)) - ((eq notify nil) - (message "User %s (@%s) %sed!" name user-handle action)))))))) + (cond ((string-equal notify "true") + (message "Receiving notifications for user %s (@%s)!" + name user-handle)) + ((string-equal notify "false") + (message "Not receiving notifications for user %s (@%s)!" + name user-handle)) + ((or (string-equal action "mute") + (string-equal action "unmute")) + (message "User %s (@%s) %sd!" name user-handle action)) + ((assoc "languages[]" args #'equal) + (message "User %s filtered by language(s): %s" name + (mapconcat #'cdr args " "))) + ((eq notify nil) + (message "User %s (@%s) %sed!" name user-handle action))))))) ;; FOLLOW TAGS |