aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml9
-rw-r--r--README.org25
-rw-r--r--lisp/mastodon-auth.el1
3 files changed, 14 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml
index 6311b0a..5f5796c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,7 @@
language: emacs-lisp
sudo: false
before_install:
- - git clone https://github.com/cask/cask ~/.cask
- - PATH=$HOME/.cask/bin:$PATH
- - export PATH="/home/travis/.evm/bin:$PATH"
- # - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
- - git clone https://github.com/rejeep/evm.git /home/travis/.evm
- - evm config path /tmp
+ - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
- evm install $EVM_EMACS --use --skip
- cask install
env:
@@ -16,7 +11,7 @@ script:
- emacs --version
- cask build
- cask clean-elc
- # - cask exec ert-runner -l test/ert-helper.el test/*-tests.el
+ - cask exec ert-runner -l test/ert-helper.el test/*-tests.el
- cask emacs --batch -Q -l package-lint.el -f package-lint-batch-and-exit lisp/*.el
notifications:
webhooks:
diff --git a/README.org b/README.org
index 88e8c41..6041ae6 100644
--- a/README.org
+++ b/README.org
@@ -1,8 +1,10 @@
#+OPTIONS: toc:nil
-* mastodon.el fork
+* mastodon.el updated
-This is a fork of of the great but seemingly dormant https://github.com/jdenen/mastodon.el.
+This is an updated version of the great but seemingly dormant mastodon client for emacs.
+
+[The original readme is below.]
It adds the following features:
@@ -51,23 +53,21 @@ It adds the following features:
It also makes some small cosmetic changes to make timelines easier to read, and makes some functions asynchronous, based on https://github.com/ieure/mastodon.el.
-This updated version is not on MELPA, to use it you need to clone and require it as per the installation instructions below.
-
-The minimum Emacs version is now 26.1. But if you are running an older version it shouldn't be very hard to get it working.
-
-I did this for my own use and to learn more Elisp. Feel free to improve it.
+The minimum Emacs version is now 27.1. But if you are running an older version it shouldn't be very hard to get it working.
** live-updating timelines: =mastodon-async-mode=
(code taken from https://github.com/alexjgriffith/mastodon-future.el.)
-Works for federated, local, and home timelines and for notifications. It's pretty necro, sometimes it goes off the rails, so use at your own risk. Not a super high priority for me, but some people dig it.
+Works for federated, local, and home timelines and for notifications. It's a little touchy, one thing to avoid is trying to load a timeline more than once at a time. It can go off the rails a bit, but it's still pretty cool.
To enable, it, add =(require 'mastodon-async)= to your =init.el=. Then you can view a timeline with one of the commands that begin with =mastodon-async--stream-=.
-** NB: dependency
+** NB: dependencies
-This version depends on the library =request= (for uploading attachments). You can install it from MELPA, or https://github.com/tkf/emacs-request.
+This version depends on the library =request= (for uploading attachments). You can install it from MELPA, or https://github.com/tkf/emacs-request. It also depends on =seq=.
+
+Optional dependencies are =company= for autocompletion of mentions when composing a toot, and =emojify= for inserting and viewing emojis.
** NB: bugs
@@ -81,10 +81,9 @@ It looks like 2-factor auth was never completed in the original repo. It's not a
** contributing
-Contributions are welcome. Registration is disabled by default on the gitea instance, but if you are interested, get in touch with me on mastodon:
-
-[[https://todon.nl/@mousebot][@mousebot@todon.nl]]
+Contributions are welcome. Registration is disabled by default on the gitea instance, but if you are interested, get in touch with me on mastodon: [[https://todon.nl/@mousebot][@mousebot@todon.nl]]. Or just leave an issue on github.
+For now, to get started with hacking, pull off the develop branch of the blast repo.
* Original README
** Installation
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 74d4404..a3d51fa 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -153,7 +153,6 @@ Handle any errors from the server."
(`(:error ,class :error_description ,error)
(error "Mastodon-auth--access-token: %s: %s" class error))
-
(_ (error "Unknown response from mastodon-auth--get-token!"))))
(defun mastodon-auth--get-account-name ()