diff options
| author | mousebot <mousebot@riseup.net> | 2021-10-05 19:07:31 +0200 |
|---|---|---|
| committer | mousebot <mousebot@riseup.net> | 2021-10-05 19:07:31 +0200 |
| commit | 5b64479e34546cea01b600cf5a9fc8c47e2e4a4e (patch) | |
| tree | acd2169c602bddc9e6c1d6539218e76256eb67b8 /lisp | |
| parent | 1d141a98479b4ca09f396adfd82f19f8709242e6 (diff) | |
| parent | 3df45c1cd655f3c3555c47d6cfaf023ef13b6ca7 (diff) | |
Merge branch 'main' into develop
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mastodon-http.el | 2 | ||||
| -rw-r--r-- | lisp/mastodon-profile.el | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el index abd9af0..bc48e8d 100644 --- a/lisp/mastodon-http.el +++ b/lisp/mastodon-http.el @@ -42,7 +42,7 @@ (defvar mastodon-http--api-version "v1") -(defconst mastodon-http--timeout 5 +(defconst mastodon-http--timeout 15 "HTTP request timeout, in seconds. Has no effect on Emacs < 26.1.") (defun mastodon-http--api (endpoint) diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el index 28f2e46..2c364da 100644 --- a/lisp/mastodon-profile.el +++ b/lisp/mastodon-profile.el @@ -297,10 +297,11 @@ Returns a list of lists." (toots-count (mastodon-tl--as-string (mastodon-profile--account-field account 'statuses_count))) + (relationships (mastodon-profile--relationships-get id)) (followed-by-you (cdr (assoc 'following - (aref (mastodon-profile--relationships-get id) 0)))) + (aref relationships 0)))) (follows-you (cdr (assoc 'followed_by - (aref (mastodon-profile--relationships-get id) 0)))) + (aref relationships 0)))) (followsp (or (equal follows-you 't) (equal followed-by-you 't))) (fields (mastodon-profile--fields-get account)) (pinned (mastodon-profile--get-statuses-pinned account))) |