diff options
| author | marty hiatt <martianhiatus@disroot.org> | 2024-10-30 12:42:59 +0100 |
|---|---|---|
| committer | marty hiatt <martianhiatus@disroot.org> | 2024-10-30 12:42:59 +0100 |
| commit | 16c4ddcd693068c738ae4bb271c60841f1912f4c (patch) | |
| tree | e7b3c8437ed942ea28a3554e5e784ebd1f3167da | |
| parent | 879eaeefb559ec4e90314e1e94fb8f5045fb0a16 (diff) | |
| parent | e97547a1604944cb281d95c3e94848f2b559a16d (diff) | |
Merge branch 'develop'
| -rw-r--r-- | lisp/mastodon-http.el | 4 | ||||
| -rw-r--r-- | lisp/mastodon-profile.el | 2 | ||||
| -rw-r--r-- | lisp/mastodon-tl.el | 2 | ||||
| -rw-r--r-- | lisp/mastodon.el | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el index 1093de1..47b96fe 100644 --- a/lisp/mastodon-http.el +++ b/lisp/mastodon-http.el @@ -243,7 +243,9 @@ Callback to `mastodon-http--get-response-async', usually ;; ideally we should handle the status code in here rather than ;; this crappy hack? ((string-prefix-p "\n<" json-string) ; html hack - (mastodon-http--render-html-err json-string)) + ;; NB: in this case, process-response returns t!: + (mastodon-http--render-html-err json-string) + nil) ;; return nil instead of t ;; if no json or html, maybe we have a plain string error message ;; (misskey does this, but there are probably better ways to do ;; this): diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el index b4a8d4f..c16d88d 100644 --- a/lisp/mastodon-profile.el +++ b/lisp/mastodon-profile.el @@ -614,7 +614,7 @@ FIELDS means provide a fields vector fetched by other means." "Insert each of the PINNED-STATUSES for a given account." (mapc (lambda (pinned-status) (insert - (concat " " + (concat "\n " (propertize " pinned " 'face '(:inherit success :box t)) " ")) diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 5eb52e3..5178a25 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -159,7 +159,7 @@ nil." (favourite . ("⭐" . "F")) (bookmark . ("🔖" . "K")) (media . ("📹" . "[media]")) - (verified . ("" . "V")) + (verified . ("✓" . "V")) (locked . ("🔒" . "[locked]")) (private . ("🔒" . "[followers]")) (direct . ("✉" . "[direct]")) diff --git a/lisp/mastodon.el b/lisp/mastodon.el index deee0c1..119a045 100644 --- a/lisp/mastodon.el +++ b/lisp/mastodon.el @@ -6,8 +6,8 @@ ;; Author: Johnson Denen <johnson.denen@gmail.com> ;; Marty Hiatt <mousebot@disroot.org> ;; Maintainer: Marty Hiatt <mousebot@disroot.org> -;; Version: 1.1.2 -;; Package-Requires: ((emacs "28.1") (request "0.3.0") (persist "0.4") (tp "0.1")) +;; Version: 1.1.3 +;; Package-Requires: ((emacs "28.1") (request "0.3.0") (persist "0.4") (tp "0.5")) ;; Homepage: https://codeberg.org/martianh/mastodon.el ;; This file is not part of GNU Emacs. |