aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.org6
-rw-r--r--lisp/mastodon-http.el2
-rw-r--r--lisp/mastodon-profile.el5
3 files changed, 10 insertions, 3 deletions
diff --git a/README.org b/README.org
index 2f48aac..60f04eb 100644
--- a/README.org
+++ b/README.org
@@ -51,6 +51,12 @@ Works for federated, local, and home timelines and for notifications. It's prett
This version depends on the library =request= (for uploading attachments). You can install it from MELPA, or https://github.com/tkf/emacs-request.
+** NB: bugs
+
+This repo also incorporates fixes for two bugs that were never merged into the upstream repo:
+- https://github.com/jdenen/mastodon.el/issues/227 (and https://github.com/jdenen/mastodon.el/issues/234)
+- https://github.com/jdenen/mastodon.el/issues/228
+
** roadmap-ish
I might add a few more features if the ones I added turn out to work ok. Possible additions/amendments:
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)))