foll reqs/faves bindings global, autoloads and declarations, readme

6 files changed, 64 insertions, 34 deletions

diff --git a/README.org b/README.org
index d06c93a..af2c46c 100644
--- a/README.org
+++ b/README.org
@@ -4,33 +4,57 @@ This is a fork of of the great but seemingly dormant https://github.com/jdenen/m
 
 It adds the following features:
 
-|                   | display profile metadata fields                                |
-| =i=                 | (un)pin toots, display pinned toots on profiles,               |
-|                   | display relationship (follows you/followed by you) on profiles |
-|                   | links and tags in profiles are tab stops like in posts         |
-| =S=                 | search (posts, users, tags) (improved!)                        |
-| =C-c C-a= (=C-c C-n=) | media uploads (including sensitive/nsfw flag)                  |
-| =RET=               | images are links to the full-sized image, can be zoomed        |
-|                   | mention booster in replies by default                          |
-| =W=, =M=, =B=           | (un)follow, (un)mute, (un)block users                          |
-| =R=, =a=, =r=           | view/accept/reject follow requests                             |
-| =v=                 | view your favorited toots                                      |
-| =S-M-P=             | jump to your profile                                           |
-| =C=                 | copy toot url                                                  |
-| =d=                 | delete your toot                                               |
+| Profiles:         |                                                                                    |
+|                   | display profile metadata fields                                                    |
+|                   | display relationship (follows you/followed by you) on profiles                     |
+|                   | display toots/follows/followers counts on profiles                                 |
+|                   | links and tags in profiles are tab stops like in posts                             |
+| =R=, =a=, =r=           | view/accept/reject follow requests                                    |
+| =v=                 | view your favorited toots                                              |
+| =i=                 | (un)pin toots, display pinned toots on profiles                                    |
+| =S-C-P=             | jump to your profile                                                               |
+| Timelines:        |                                                                                    |
+| =W=, =M=, =B=           | (un)follow, (un)mute, (un)block users                                              |
+|                   | images are links to the full image, can be zoomed/rotated/saved (see their keymap) |
+| =C=                 | copy url of toot at point                                                          |
+| =d=                 | delete your toot at point                                                          |
+|                   | display polls (very basic for now)                                                 |
+| Toots:            |                                                                                    |
+| =C-c C-a= (=C-c C-n=) | media uploads (and sensitive/nsfw flag)                                            |
+|                   | mention booster in replies by default                                              |
+| Search:           |                                                                                    |
+| =S=                 | search (posts, users, tags) (improved! but still pretty basic!)                    |
 
 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.
 
-I did this for my own use and to learn more Elisp. If the code is terrible, feel free to improve or replace it.
+The minimum Emacs version is now 25.1. But if you are running an older version it shouldn't be very hard to get it working.
 
-** dependency:
-This version depends on the library =request= (for uploading attachments). You can install it from melpa.
+I did this for my own use and to learn more Elisp. If the code is terrible, feel free to improve or replace it. It surely still contains errors, I'm only weeding them out as I find them.
 
-** bugs
+** NB: dependency:
 
-As it stands the client still has some bugs. In particular, when composing a toot, you may have to hit =C-g= before sending your toot. You may also see a related error when you try to add a media attachment. You should be able to run the command again and it should work. See the issues on the original repo.
+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
+
+As it stands the client still has some bugs. In particular, when composing a toot, hit =C-g= before sending your toot. If you don't, your draft may disappear. You may also see a related error when you try to add a media attachment. You should be able to run the command again and it should work. See the issues on the original repo.
+
+Some people have also had niggling troubles with initial auth and set-up, but I couldn't reproduce.
+
+** roadmap-ish
+
+I might add a few more features if the ones I added turn out to work ok. Possible additions/amendments:
+
+- voting on polls
+- better display of polls
+- mention all thread participants in replies
+- handle newlines in toots better, for poetry, etc.
+- improve async.
+- perhaps integrate live timeline updates from https://github.com/alexjgriffith/mastodon-future.el, and add live updates for notifcations and home timeline.
+
+It looks like 2-factor auth was never completed in the original repo. It's not a priority for me, auth ain't my thing. If you want to hack on it, its on the develop branch in the original repo.
 
 ** Original README
 
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 3c61848..4bd1cce 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -32,6 +32,7 @@
 (require 'plstore)
 (require 'auth-source)
 (require 'json)
+(eval-when-compile (require 'subr-x)) ; for if-let
 
 (autoload 'mastodon-client "mastodon-client")
 (autoload 'mastodon-http--api "mastodon-http")
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 6c17ae0..381d994 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -34,6 +34,8 @@
 ;;; Code:
 (defvar url-show-status)
 
+(defvar mastodon-tl--shr-image-map-replacement)
+
 (defgroup mastodon-media nil
   "Inline Mastadon media."
   :prefix "mastodon-media-"
@@ -125,7 +127,7 @@ CAQgEIBAAAIBFiNOFMaY6V1tnFhkDQIQCEAgAIEABAKAQAACAQgEIBCAQAACAQgEIBCAQABIXO4e
 c1y+zhoEIBCAQAAQCEAgAIEABAIQCEAgAIEABAIQCEAgAAgEIBCAQAACAQgEIBCAQAACAQgEAIEA
 BAIQCEAgAIEABAIsJVH58WqHw8FIgjUIQCAACAQgEIBAAAIBCAQgEIBAAAIBCAQgEAAEAhAIQCBA
 fKRJkmVZjAQwh78A6vCRWJE8K+8AAAAASUVORK5CYII=")
-  "The PNG data for a generic 200x200 'broken image' view")
+  "The PNG data for a generic 200x200 'broken image' view.")
 
 (defun mastodon-media--process-image-response
     (status-plist marker image-options region-length)
@@ -134,8 +136,7 @@ fKRJkmVZjAQwh78A6vCRWJE8K+8AAAAASUVORK5CYII=")
 STATUS-PLIST is the usual plist of status events as per `url-retrieve'.
 IMAGE-OPTIONS are the precomputed options to apply to the image.
 MARKER is the marker to where the response should be visible.
-REGION-LENGTH is the length of the region that should be replaced with the image.
-"
+REGION-LENGTH is the length of the region that should be replaced with the image."
   (when (marker-buffer marker) ; only if the buffer hasn't been kill in the meantime
     (let ((url-buffer (current-buffer))
           (is-error-response-p (eq :error (car status-plist))))
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index bf1a3a9..84664c0 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -36,6 +36,8 @@
 
 (autoload 'mastodon-http--api "mastodon-http.el")
 (autoload 'mastodon-http--get-json "mastodon-http.el")
+(autoload 'mastodon-http--post "mastodon-http.el")
+(autoload 'mastodon-http--triage "mastodon-http.el")
 (autoload 'mastodon-auth--get-account-name "mastodon-auth.el")
 (autoload 'mastodon-http--get-json-async "mastodon-http.el")
 (autoload 'mastodon-media--get-media-link-rendering "mastodon-media.el")
@@ -50,6 +52,7 @@
 (autoload 'mastodon-tl--as-string "mastodon-tl.el")
 (autoload 'mastodon-tl--toot-id "mastodon-tl")
 (autoload 'mastodon-tl--toot "mastodon-tl")
+(autoload 'mastodon-tl--init "mastodon-tl.el")
 
 (defvar mastodon-instance-url)
 (defvar mastodon-tl--buffer-spec)
@@ -70,11 +73,9 @@ extra keybindings."
   ;; The key bindings
   :keymap '(((kbd "O") . mastodon-profile--open-followers)
             ((kbd "o") . mastodon-profile--open-following)
-            ((kbd "v") . mastodon-profile--view-favourites)
-            ((kbd "R") . mastodon-profile--view-follow-requests)
             ((kbd "a") . mastodon-profile--follow-request-accept)
             ((kbd "r") . mastodon-profile--follow-request-reject))
-:group 'mastodon)
+  :group 'mastodon)
 
 (defun mastodon-profile--toot-json ()
   "Get the next toot-json."
@@ -214,7 +215,7 @@ Returns a list of lists."
     (mastodon-http--get-json url)))
 
 (defun mastodon-profile--insert-statuses-pinned (pinned-statuses)
-  "Insert each of the PINNED_STATUSES for a given account."
+  "Insert each of the PINNED-STATUSES for a given account."
   (mapc (lambda (pinned-status)
           (insert (mastodon-tl--set-face
                    "   :pinned: " 'success))
@@ -222,6 +223,7 @@ Returns a list of lists."
         pinned-statuses))
 
 (defun mastodon-profile--make-profile-buffer-for (account endpoint-type update-function)
+  "Display profile of ACCOUNT, using ENDPOINT-TYPE and UPDATE-FUNCTION."
   (let* ((id (mastodon-profile--account-field account 'id))
          (url (mastodon-http--api (format "accounts/%s/%s" id endpoint-type)))
          (acct (mastodon-profile--account-field account 'acct))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index ecaeff4..d90a759 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -39,14 +39,14 @@
 (autoload 'mastodon-media--get-media-link-rendering "mastodon-media")
 (autoload 'mastodon-media--inline-images "mastodon-media")
 (autoload 'mastodon-mode "mastodon")
-(autoload 'mastodon-profile--account-from-id "mastodon.el-profile.el")
-(autoload 'mastodon-profile--make-author-buffer "mastodon-profile.el")
-(autoload 'mastodon-profile--search-account-by-handle "mastodon.el-profile.el")
+(autoload 'mastodon-profile--account-from-id "mastodon-profile")
+(autoload 'mastodon-profile--make-author-buffer "mastodon-profile")
+(autoload 'mastodon-profile--search-account-by-handle "mastodon-profile")
 ;; mousebot adds
-(autoload 'mastodon-profile--toot-json "mastodon-profile.el")
-(autoload 'mastodon-profile--account-field "mastodon-profile.el")
-(autoload 'mastodon-profile--extract-users-handles "mastodon-profile.el")
-(autoload 'mastodon-profile--my-profile "mastodon-profile.el")
+(autoload 'mastodon-profile--toot-json "mastodon-profile")
+(autoload 'mastodon-profile--account-field "mastodon-profile")
+(autoload 'mastodon-profile--extract-users-handles "mastodon-profile")
+(autoload 'mastodon-profile--my-profile "mastodon-profile")
 (autoload 'mastodon-toot--delete-toot "mastodon-toot")
 (autoload 'mastodon-http--post "mastodon-http")
 (autoload 'mastodon-http--triage "mastodon-http")
@@ -55,7 +55,7 @@
 
 (defvar mastodon-instance-url)
 (defvar mastodon-toot-timestamp-format)
-(defvar shr-use-fonts)  ;; need to declare it since Emacs24 didn't have this
+(defvar shr-use-fonts)  ;; declare it since Emacs24 didn't have this
 
 (defgroup mastodon-tl nil
   "Timelines in Mastodon."
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index b703b30..d3477cb 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -131,6 +131,8 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "d") #'mastodon-toot--delete-toot)
     (define-key map (kbd "C") #'mastodon-toot--copy-toot-url)
     (define-key map (kbd "i") #'mastodon-toot--pin-toot-toggle)
+    (define-key map (kbd "v") #'mastodon-profile--view-favourites)
+    (define-key map (kbd "R") #'mastodon-profile--view-follow-requests)
     map)
 
   "Keymap for `mastodon-mode'.")