aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/mastodon-http.el2
-rw-r--r--lisp/mastodon-tl.el9
-rw-r--r--lisp/mastodon-toot.el1
-rw-r--r--test/mastodon-profile-tests.el11
-rw-r--r--test/mastodon-tl-tests.el45
5 files changed, 38 insertions, 30 deletions
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 259432e..d56f3ad 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -333,8 +333,8 @@ PARAMS is an alist of any extra parameters to send with the request."
"Make GET request to URL. Call CALLBACK with json-list and ARGS.
PARAMS is an alist of any extra parameters to send with the request."
(mastodon-http--get-async
- params
url
+ params
(lambda (status)
(when status ;; only when we actually get sth?
(apply callback (mastodon-http--process-json) args)))))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index fd74ed5..d0c2b0b 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1315,7 +1315,7 @@ LINK-HEADER is the http Link header if present."
Then run CALLBACK with arguments CBARGS."
(let* ((args `(("max_id" . ,(mastodon-tl--as-string id))))
(url (mastodon-http--api endpoint)))
- (apply 'mastodon-http--get-json-async url params callback cbargs)))
+ (apply 'mastodon-http--get-json-async url args callback cbargs)))
;; TODO
;; Look into the JSON returned here by Local
@@ -1323,7 +1323,7 @@ Then run CALLBACK with arguments CBARGS."
"Return JSON for timeline ENDPOINT since ID."
(let* ((args `(("since_id" . ,(mastodon-tl--as-string id))))
(url (mastodon-http--api endpoint)))
- (mastodon-http--get-json url)))
+ (mastodon-http--get-json url args)))
(defun mastodon-tl--property (prop &optional backward)
"Get property PROP for toot at point.
@@ -1873,8 +1873,7 @@ INSTANCE is an instance domain name."
(response (mastodon-http--get-json
(if user
(mastodon-http--api "instance")
- (concat instance
- "/api/v1/instance"))
+ (concat instance "/api/v1/instance"))
nil
:vector)))
(when response
@@ -2462,7 +2461,7 @@ favourites."
(mastodon-http--get-response-async
url 'mastodon-tl--init* buffer endpoint update-function headers)
(mastodon-http--get-json-async
- url 'mastodon-tl--init* buffer endpoint update-function))))
+ url nil 'mastodon-tl--init* buffer endpoint update-function))))
(defun mastodon-tl--init* (response buffer endpoint update-function &optional headers)
"Initialize BUFFER with timeline targeted by ENDPOINT.
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 24c6c75..8ac75f9 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -227,6 +227,7 @@ send.")
NO-TOOT means we are not calling from a toot buffer."
(mastodon-http--get-json-async
(mastodon-http--api "instance")
+ nil
'mastodon-toot--get-max-toot-chars-callback no-toot))
(defun mastodon-toot--get-max-toot-chars-callback (json-response
diff --git a/test/mastodon-profile-tests.el b/test/mastodon-profile-tests.el
index 3e238f1..f65661e 100644
--- a/test/mastodon-profile-tests.el
+++ b/test/mastodon-profile-tests.el
@@ -172,7 +172,8 @@ The search will happen as if called without the \"@\"."
(with-mock
(mock (mastodon-http--get-json
- "https://instance.url/api/v1/accounts/search?q=gargron"))
+ "https://instance.url/api/v1/accounts/search"
+ '(("q" . "gargron"))))
(let ((mastodon-instance-url "https://instance.url"))
;; We don't check anything from the return value. We only care
@@ -182,7 +183,9 @@ The search will happen as if called without the \"@\"."
(ert-deftest mastodon-profile--search-account-by-handle--filters-out-false-results ()
"Should ignore results that don't match the searched handle."
(with-mock
- (mock (mastodon-http--get-json *)
+ (mock (mastodon-http--get-json
+ "https://instance.url/api/v1/accounts/search"
+ '(("q" . "Gargron")))
=>
(vector ccc-profile-json gargron-profile-json))
@@ -197,7 +200,9 @@ The search will happen as if called without the \"@\"."
TODO: We need to decide if this is actually desired or not."
(with-mock
- (mock (mastodon-http--get-json *) => (vector gargron-profile-json))
+ (mock (mastodon-http--get-json *
+ '(("q" . "gargron")))
+ => (vector gargron-profile-json))
(let ((mastodon-instance-url "https://instance.url"))
(should
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 19934dd..0ac5caf 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -175,27 +175,30 @@ Strict-Transport-Security: max-age=31536000
"Should request toots older than max_id."
(let ((mastodon-instance-url "https://instance.url"))
(with-mock
- (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
- (mastodon-tl--more-json "timelines/foo" 12345))))
+ (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo"
+ '(("max_id" . "12345"))))
+ (mastodon-tl--more-json "timelines/foo" "12345"))))
(ert-deftest mastodon-tl--more-json-id-string ()
"Should request toots older than max_id.
-`mastodon-tl--more-json' should accept and id that is either
-a string or a numeric."
+ `mastodon-tl--more-json' should accept and id that is either
+ a string or a numeric."
(let ((mastodon-instance-url "https://instance.url"))
(with-mock
- (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+ (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo"
+ '(("max_id" . "12345"))))
(mastodon-tl--more-json "timelines/foo" "12345"))))
(ert-deftest mastodon-tl--update-json-id-string ()
"Should request toots more recent than since_id.
-`mastodon-tl--updated-json' should accept and id that is either
-a string or a numeric."
+ `mastodon-tl--updated-json' should accept and id that is either
+ a string or a numeric."
(let ((mastodon-instance-url "https://instance.url"))
(with-mock
- (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
+ (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo"
+ '(("since_id" . "12345"))))
(mastodon-tl--updated-json "timelines/foo" "12345"))))
(ert-deftest mastodon-tl--relative-time-description ()
@@ -314,7 +317,7 @@ a string or a numeric."
byline)
"Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
-"))
+ "))
(should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
'user-handle))
(should (string= (get-text-property handle-location 'mastodon-handle byline)
@@ -337,7 +340,7 @@ a string or a numeric."
'mastodon-tl--byline-boosted))
"Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
-")))))
+ ")))))
(ert-deftest mastodon-tl--byline-boosted ()
"Should format the boosted toot correctly."
@@ -354,7 +357,7 @@ a string or a numeric."
'mastodon-tl--byline-boosted))
"(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
-")))))
+ ")))))
(ert-deftest mastodon-tl--byline-favorited ()
"Should format the favourited toot correctly."
@@ -371,7 +374,7 @@ a string or a numeric."
'mastodon-tl--byline-boosted))
"(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
-")))))
+ ")))))
(ert-deftest mastodon-tl--byline-boosted/favorited ()
@@ -389,7 +392,7 @@ a string or a numeric."
'mastodon-tl--byline-boosted))
"(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
-")))))
+ ")))))
(ert-deftest mastodon-tl--byline-reblogged ()
"Should format the reblogged toot correctly."
@@ -413,9 +416,9 @@ a string or a numeric."
(handle2-location 65))
(should (string= (substring-no-properties byline)
"Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+ Boosted Account 43 (@acct43@example.space) original time
------------
-"))
+ "))
(should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
'user-handle))
(should (equal (get-text-property handle1-location 'help-echo byline)
@@ -446,9 +449,9 @@ a string or a numeric."
'mastodon-tl--byline-author
'mastodon-tl--byline-boosted))
"Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+ Boosted Account 43 (@acct43@example.space) original time
------------
-")))))
+ ")))))
(ert-deftest mastodon-tl--byline-reblogged-boosted/favorited ()
"Should format the reblogged toot that was also boosted & favoritedcorrectly."
@@ -470,9 +473,9 @@ a string or a numeric."
'mastodon-tl--byline-author
'mastodon-tl--byline-boosted))
"(B) (F) Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+ Boosted Account 43 (@acct43@example.space) original time
------------
-")))))
+ ")))))
(ert-deftest mastodon-tl--byline-timestamp-has-relative-display ()
"Should display the timestamp with a relative time."
@@ -808,8 +811,8 @@ a string or a numeric."
(defun tl-tests--property-values-at (property ranges)
"Returns a list with property values at the given ranges.
-The property value for PROPERTY within a region is assumed to be
-constant."
+ The property value for PROPERTY within a region is assumed to be
+ constant."
(let (result)
(dolist (range ranges (nreverse result))
(push (get-text-property (car range) property) result))))