branch: elpa/mastodon
commit 87dfd9bd20692475a9ffa783566a74ef21525835
Author: marty hiatt <[email protected]>
Commit: marty hiatt <[email protected]>
not working unfilter user langs. adds json flag arg through action funs
---
lisp/mastodon-http.el | 2 +-
lisp/mastodon-tl.el | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 7ef6f773b9..5065ee567c 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -141,7 +141,7 @@ Used for API form data parameters that take an array."
&optional params headers unauthenticated-p json)
"POST synchronously to URL, optionally with PARAMS and HEADERS.
Authorization header is included by default unless
-UNAUTHENTICATED-P is non-nil.If JSON, encode PARAMS as JSON for
+UNAUTHENTICATED-P is non-nil. If JSON, encode PARAMS as JSON for
the request data."
(mastodon-http--authorized-request "POST"
(let* ((url-request-data
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 2d811605c5..7fd7f98239 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2045,7 +2045,8 @@ ID is that of the post the context is currently displayed
for."
;;; FOLLOW/BLOCK/MUTE, ETC
-(defun mastodon-tl--follow-user (user-handle &optional notify langs reblogs)
+(defun mastodon-tl--follow-user (user-handle
+ &optional notify langs reblogs json)
"Query for USER-HANDLE from current status and follow that user.
If NOTIFY is \"true\", enable notifications when that user posts.
If NOTIFY is \"false\", disable notifications when that user posts.
@@ -2057,7 +2058,7 @@ display of the user's boosts in your timeline."
(list (mastodon-tl--user-handles-get "follow")))
(mastodon-tl--do-if-item
(mastodon-tl--do-user-action-and-response
- user-handle "follow" nil notify langs reblogs)))
+ user-handle "follow" nil notify langs reblogs json)))
;; TODO: make this action "enable/disable notifications"
(defun mastodon-tl--enable-notify-user-posts (user-handle)
@@ -2101,6 +2102,15 @@ desired language if they are not marked as such (or as
anything)."
(mastodon-tl--do-if-item
(mastodon-tl--follow-user user-handle nil langs))))
+(defun mastodon-tl--unfilter-user-languages (user-handle)
+ ""
+ (interactive
+ (list (mastodon-tl--user-handles-get "filter by language")))
+ (let ((langs "languages[]"))
+ (mastodon-tl--do-if-item
+ ;; we need ("languages[]") as a param, with no "="
+ (mastodon-tl--follow-user user-handle nil langs nil :json))))
+
(defun mastodon-tl--read-filter-langs (&optional langs)
"Read language choices and return an alist array parameter.
LANGS is the accumulated array param alist if we re-run recursively."
@@ -2215,7 +2225,7 @@ Action must be either \"unblock\" or \"unmute\"."
accts nil t)))) ; require match
(defun mastodon-tl--do-user-action-and-response
- (user-handle action &optional negp notify langs reblogs)
+ (user-handle action &optional negp notify langs reblogs json)
"Do ACTION on user USER-HANDLE.
NEGP is whether the action involves un-doing something.
If NOTIFY is \"true\", enable notifications when that user posts.
@@ -2245,18 +2255,18 @@ display of the user's boosts in your timeline."
(url (mastodon-http--api (format "accounts/%s/%s" user-id action))))
(if account
(if (equal action "follow") ; y-or-n for all but follow
- (mastodon-tl--do-user-action-function url name user-handle action
notify args reblogs)
+ (mastodon-tl--do-user-action-function url name user-handle action
notify args reblogs json)
(when (y-or-n-p (format "%s user %s? " action name))
(mastodon-tl--do-user-action-function url name user-handle action
args)))
(message "Cannot find a user with handle %S" user-handle))))
(defun mastodon-tl--do-user-action-function
- (url name user-handle action &optional notify args reblogs)
+ (url name user-handle action &optional notify args reblogs json)
"Post ACTION on user NAME/USER-HANDLE to URL.
NOTIFY is either \"true\" or \"false\", and used when we have been called
by `mastodon-tl--follow-user' to enable or disable notifications.
ARGS is an alist of any parameters to send with the request."
- (let ((response (mastodon-http--post url args)))
+ (let ((response (mastodon-http--post url args nil nil json)))
(mastodon-http--triage
response
(lambda (response)
