branch: elpa/mastodon
commit 9319d0647755e1d9dfc081241bfcb2ef3ec96be3
Merge: 3e05dc0952c b16ee14b60a
Author: marty hiatt <martianhia...@disroot.org>
Commit: marty hiatt <martianhia...@disroot.org>
Merge branch 'develop'
---
README.org | 8 ++++++--
lisp/mastodon-tl.el | 12 ++++++++++--
lisp/mastodon.el | 4 ++--
mastodon.info | 34 +++++++++++++++++++++-------------
mastodon.texi | 20 ++++++++++++++------
test/mastodon-tl-tests.el | 9 ++++++++-
6 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/README.org b/README.org
index 3a73175c7e0..2ce2e85a48c 100644
--- a/README.org
+++ b/README.org
@@ -139,7 +139,7 @@ will instead be stored encrypted in
=mastodon-client--token-file=, a plstore.
If for some reason you reauthenticate, you'll need to either remove the
entry in your auth sources file, or manually update the token in it after
doing so, as mastodon.el is unable to reliably update (or even remove)
-entires.
+entries.
The format for a mastodon.el auth source entry is as follows:
@@ -147,7 +147,7 @@ The format for a mastodon.el auth source entry is as
follows:
with the token being what you copy from the browser when authenticating.
If you have =auth-source-save-behavior= set to nil, you'll also need to add
-such an entry manually.
+such an entry manually. Moreover, you should ensure that your =auth-sources=
file is actually writable.
Finally, if you find you're asked for your key passphrase too often while
authenticating, consider setting =epa-file-encrypt-to= (for auth-source
@@ -467,6 +467,10 @@
http://takeonrules.com/2024/10/31/hacking-on-mastodon-emacs-package-to-narrow-vi
The incomparable sachac has a bunch of =mastodon.el= extensions and goodies in
their literate config, available here:
https://sachachua.com/dotemacs/index.html#mastodon.
+**** syntax highlighting in posts
+
+If you would like to have syntax highlighting when viewing posts containing
code (provided it is in =<pre>= tags), consider installing
https://github.com/xuchunyang/shr-tag-pre-highlight.el.
+
*** Live-updating timelines: =mastodon-async-mode=
(code taken from
[[https://github.com/alexjgriffith/mastodon-future.el][mastodon-future]].)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 73d7c5462f2..b7a24d74ce9 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -432,7 +432,13 @@ If search returns nil, execute REFRESH function.
Optionally start from POS."
(let* ((npos ; toot/user items have byline:
(funcall find-pos
- (or pos (point))
+ (or pos
+ (if (save-excursion
+ (when (not (= 1 (point)))
+ (backward-char 1))
+ (looking-at "\u2068"))
+ (1- (point))
+ (point)))
;; FIXME: we need to fix item-type?
;; 'item-type ; breaks nav to last item in a view?
'byline
@@ -445,7 +451,9 @@ Optionally start from POS."
(mastodon-tl--goto-item-pos find-pos refresh npos)
(goto-char npos)
;; force display of help-echo on moving to a toot byline:
- (mastodon-tl--message-help-echo))
+ (mastodon-tl--message-help-echo)
+ (when (looking-at "\u2068")
+ (forward-char 1)))
(condition-case nil
(funcall refresh)
(error "No more items")))))
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index b9d30a4f0d5..051ac8e309b 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -6,8 +6,8 @@
;; Author: Johnson Denen <johnson.de...@gmail.com>
;; Marty Hiatt <mouse...@disroot.org>
;; Maintainer: Marty Hiatt <mouse...@disroot.org>
-;; Version: 2.0.2
-;; Package-Requires: ((emacs "28.1") (persist "0.4") (tp "0.7"))
+;; Version: 2.0.3
+;; Package-Requires: ((emacs "28.1") (persist "0.7") (tp "0.7"))
;; Homepage: https://codeberg.org/martianh/mastodon.el
;; This file is not part of GNU Emacs.
diff --git a/mastodon.info b/mastodon.info
index 993ce508655..ca01e7e88c6 100644
--- a/mastodon.info
+++ b/mastodon.info
@@ -249,7 +249,7 @@ Emacs and follow the steps again.
If for some reason you reauthenticate, you’ll need to either remove
the entry in your auth sources file, or manually update the token
in it after doing so, as mastodon.el is unable to reliably update
- (or even remove) entires.
+ (or even remove) entries.
The format for a mastodon.el auth source entry is as follows:
@@ -744,12 +744,16 @@ File: mastodon.info, Node: Fixes and features, Next:
Coding style, Prev: Bug
1.5.2 Fixes and features
------------------------
- 1. Create an issue (https://codeberg.org/martianh/mastodon.el/issues)
+ 1. Install Cask
+ (https://cask.readthedocs.io/en/latest/guide/installation.html) if
+ you don’t already have it installed
+ 2. Create an issue (https://codeberg.org/martianh/mastodon.el/issues)
detailing what you’d like to do.
- 2. Fork the repository and create a branch off of ‘develop’.
- 3. Run the tests and ensure that your code doesn’t break any of them.
- 4. Create a pull request (to develop) referencing the issue created in
- step 1.
+ 3. Fork the repository and create a branch off of ‘develop’.
+ 4. Run the tests (with ‘make tests’) and ensure that your code doesn’t
+ break any of them.
+ 5. Create a pull request (to develop) referencing the issue created in
+ step 2.
File: mastodon.info, Node: Coding style, Prev: Fixes and features, Up:
Contributing
@@ -774,9 +778,13 @@ File: mastodon.info, Node: Supporting mastodonel, Next:
Contributors, Prev: C
If you’d like to support continued development of ‘mastodon.el’, I
accept donations via paypal: paypal.me/martianh
-(https://paypal.me/martianh). If you would prefer a different payment
-method, please write to me at <mousebot {at} disroot.org> and I can
-provide IBAN or other bank account details.
+(https://paypal.me/martianh).
+
+ I also accept support via liberapay:
+
+ If you would prefer a different payment method, please write to me at
+<mousebot {at} disroot.org> and I can provide IBAN or other bank account
+details.
I don’t have a tech worker’s income, so even a small tip would help
out.
@@ -864,10 +872,10 @@ Node: Network compatibility25711
Node: Contributing26652
Node: Bug reports27148
Node: Fixes and features28059
-Node: Coding style28560
-Node: Supporting mastodonel29184
-Node: Contributors29741
-Node: Screenshots30176
+Node: Coding style28722
+Node: Supporting mastodonel29346
+Node: Contributors29947
+Node: Screenshots30382
End Tag Table
diff --git a/mastodon.texi b/mastodon.texi
index f5b2689f90b..fbf40d85fc6 100644
--- a/mastodon.texi
+++ b/mastodon.texi
@@ -247,7 +247,7 @@ will instead be stored encrypted in
@samp{mastodon-client--token-file}, a plstor
If for some reason you reauthenticate, you'll need to either remove the
entry in your auth sources file, or manually update the token in it after
doing so, as mastodon.el is unable to reliably update (or even remove)
-entires.
+entries.
The format for a mastodon.el auth source entry is as follows:
@@ -895,14 +895,16 @@ version and what kind of server your account is on.
@enumerate
@item
+Install @uref{https://cask.readthedocs.io/en/latest/guide/installation.html,
Cask} if you don't already have it installed
+@item
Create an @uref{https://codeberg.org/martianh/mastodon.el/issues, issue}
detailing what you'd like to do.
@item
Fork the repository and create a branch off of @samp{develop}.
@item
-Run the tests and ensure that your code doesn't break any of them.
+Run the tests (with @samp{make tests}) and ensure that your code doesn't break
any of them.
@item
Create a pull request (to develop) referencing the issue created in
-step 1.
+step 2.
@end enumerate
@node Coding style
@@ -926,9 +928,15 @@ added automatically when documentation is displayed).
@section Supporting @samp{mastodon.el}
If you'd like to support continued development of @samp{mastodon.el}, I accept
-donations via paypal: @uref{https://paypal.me/martianh, paypal.me/martianh}.
If you would prefer a different
-payment method, please write to me at <mousebot @{at@} disroot.org> and I
-can provide IBAN or other bank account details.
+donations via paypal: @uref{https://paypal.me/martianh, paypal.me/martianh}.
+
+I also accept support via liberapay:
+
+
+
+If you would prefer a different payment method, please write to me at
+<mousebot @{at@} disroot.org> and I can provide IBAN or other bank account
+details.
I don't have a tech worker's income, so even a small tip would help out.
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 1d01fee2f01..e939e42f8f4 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -1302,4 +1302,11 @@ The key is 'id."
(equal
(mastodon-tl--map-alist-vals-to-alist
'id 'text mastodon-tl--test-instance-rules)
- '(("1" . "We do not accept racism.") ("2" . "We do not accept
homophobia.") ("3" . "We do not accept sexism.") ("4" . "We do not accept
ableism.") ("5" . "We do not accept harassment.") ("6" . "We also do not accept
hate speech.") ("7" . "We do not accept abuse of minors.") ("8" . "We do not
accept glorification of violence.")))))
+ '(("1" . "We do not accept racism.")
+ ("2" . "We do not accept homophobia.")
+ ("3" . "We do not accept sexism.")
+ ("4" . "We do not accept ableism.")
+ ("5" . "We do not accept harassment.")
+ ("6" . "We also do not accept hate speech.")
+ ("7" . "We do not accept abuse of minors.")
+ ("8" . "We do not accept glorification of violence.")))))
