diff options
| author | marty hiatt <martianhiatus@riseup.net> | 2024-02-21 10:26:53 +0100 |
|---|---|---|
| committer | marty hiatt <martianhiatus@riseup.net> | 2024-02-21 10:26:53 +0100 |
| commit | 5977495b8a7d2782b36723289e805f018375275b (patch) | |
| tree | fd8c7d7610e1ae0ff952e48b73eb8988aab64dd2 | |
| parent | 52b7775cb7ce96fb023078ed5048f8bd5c080bc9 (diff) | |
move condition case from http get-response to credential-account
| -rw-r--r-- | lisp/mastodon-http.el | 9 | ||||
| -rw-r--r-- | lisp/mastodon.el | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el index a345324..aef8975 100644 --- a/lisp/mastodon-http.el +++ b/lisp/mastodon-http.el @@ -180,13 +180,8 @@ SILENT means don't message. NO-HEADERS means don't collect http response headers. VECTOR means return json arrays as vectors." (let ((buf (mastodon-http--get url params silent))) - ;; (if (not buf) - ;; (error "Request returned nada") - (condition-case x - (with-current-buffer buf - (mastodon-http--process-response no-headers vector)) - (wrong-type-argument - (error "Request returned nada"))))) + (with-current-buffer buf + (mastodon-http--process-response no-headers vector)))) (defun mastodon-http--get-json (url &optional params silent vector) "Return only JSON data from URL request. diff --git a/lisp/mastodon.el b/lisp/mastodon.el index ffeee82..abc7787 100644 --- a/lisp/mastodon.el +++ b/lisp/mastodon.el @@ -315,7 +315,12 @@ FORCE means to fetch from the server and update nil :silent))) (if force (setq mastodon-profile-credential-account - (eval req)) + ;; TODO: we should also signal a quit condition after like 5 + ;; secs here + (condition-case x + (eval req) + (t ; req fails, return old value + mastodon-profile-credential-account))) (or mastodon-profile-credential-account (setq mastodon-profile-credential-account (eval req)))))) |