diff options
| -rw-r--r-- | README.org | 5 | ||||
| -rw-r--r-- | lisp/mastodon-profile.el | 160 | ||||
| -rw-r--r-- | lisp/mastodon-tl.el | 15 | ||||
| -rw-r--r-- | lisp/mastodon.el | 4 |
4 files changed, 175 insertions, 9 deletions
@@ -87,8 +87,8 @@ Opens a =*mastodon-home*= buffer in the major mode so you can see toots. You wil | =>= | Move to end of buffer | | =j= | Go to next item (toot, notification) | | =k= | Go to previous item (toot, notification) | -| =<tab>= | Go to the next interesting thing that has an action | -| =<S-tab>= | Go to the previous interesting thing that has an action | +| =<tab>= / =h= | Go to the next interesting thing that has an action | +| =<S-tab>= / =l= | Go to the previous interesting thing that has an action | | | /In-buffer actions/ | | =?= | Open context menu (if =discover= is available) | | =c= | Toggle the visibility of sensitive text (if there is text with a content warning) | @@ -102,6 +102,7 @@ Opens a =*mastodon-home*= buffer in the major mode so you can see toots. You wil | =F= | Open federated timeline | | =H= | Open home timeline | | =L= | Open local timeline | +| =U= | Open User Profile | | =t= | Open thread buffer for toot under =point= | | =T= | Prompt for tag and open its timeline | | =q= | Quit mastodon buffer, leave window open | diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el new file mode 100644 index 0000000..9b0e51c --- /dev/null +++ b/lisp/mastodon-profile.el @@ -0,0 +1,160 @@ +;;; mastodon-profile.el --- Functions for inspecting Mastodon profiles -*- lexical-binding: t -*- + +;; Copyright (C) 2017 Johnson Denen +;; Author: Johnson Denen <johnson.denen@gmail.com> +;; Version: 0.7.2 +;; Package-Requires: ((emacs "24.4")) +;; Homepage: https://github.com/jdenen/mastodon.el + +;; This file is not part of GNU Emacs. + +;; This file is part of mastodon.el. + +;; mastodon.el is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; mastodon.el is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with mastodon.el. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: + +;; mastodon-profile.el generates stream of users toots. +;; To fix +;; 1. Render Image at top of frame [x] +;; 2. Get toot author [x] +;; 3. Load more toots [x] +;; Later +;; 1. List followers [x] +;; 2. List people they follow [x] +;; 3. Option to follow +;; 4. wheather they follow you or not +;; 5. Show only Media + +;;; Code: + +(defun mastodon-profile--toot-json () + "Get the next toot-json." + (interactive) + (mastodon-tl--property 'toot-json)) + +(defun mastodon-profile--make-author-buffer (account) + "Take a ACCOUNT and inserts a user account into a new buffer." + (let* ((id (mastodon-profile--account-field account 'id)) + (acct (mastodon-profile--account-field account 'acct)) + (url (mastodon-http--api + (concat "accounts/" + (format "%s" id) + "/statuses" ))) + (buffer (concat "*mastodon-" acct "*")) + (note (mastodon-profile--account-field account 'note)) + (json (mastodon-http--get-json url))) + (with-output-to-temp-buffer buffer + (switch-to-buffer buffer) + (mastodon-mode) + (setq mastodon-tl--buffer-spec + `(buffer-name ,buffer + endpoint ,(format "accounts/%s/statuses" id) + update-function + ,'mastodon-tl--timeline json)) + (let ((inhibit-read-only t)) + (insert + "\n" + (mastodon-profile--image-from-account account) + "\n" + (propertize (mastodon-profile--account-field + account 'display_name) + 'face 'mastodon-display-name-face) + "\n" + (propertize acct + 'face 'default) + "\n ------------\n" + (mastodon-tl--render-text note nil) + (mastodon-tl--set-face + (concat " ------------\n" + " TOOTS \n" + " ------------\n") + 'success)) + (mastodon-tl--timeline json))) + (mastodon-tl--goto-next-toot))) + +(defun mastodon-profile--get-toot-author () + "Opens authors profile of toot under point." + (interactive) + (mastodon-profile--make-author-buffer + (cdr (assoc 'account (mastodon-profile--toot-json))))) + +(defun mastodon-profile--image-from-account (status) + "Generate an image from a STATUS." + (let ((url (cdr (assoc 'avatar_static status)))) + (unless (equal url "/avatars/original/missing.png") + (mastodon-media--get-media-link-rendering url)))) + +(defun mastodon-profile--account-field (account field) + "Return FIELD from the ACCOUNT. + +FIELD is used to identify regions under 'account" + (cdr (assoc field account))) + +(defun mastodon-profile--get-next-authour-id () + "Get the author id of the next toot." + (interactive) + (get-authour-id (toot-proporties))) + +(defun mastodon-profile--add-author-bylines (tootv) + "Convert TOOTV into a author-bylines and insert." + (let ((inhibit-read-only t)) + (mapc (lambda(toot) + (insert (propertize + (mastodon-tl--byline-author + (list (append (list 'account) toot))) + 'byline 't + 'toot-id (cdr (assoc 'id toot)) 'toot-json toot) + "\n")) + tootv)) + (mastodon-media--inline-images)) + + +(defun mastodon-profile--get-following () + "Request a list of those who the user under point follows." + (interactive) + (mastodon-profile--make-follow-buffer "following")) + +(defun mastodon-profile--followers () + "Request a list of those following the user under point." + (interactive) + (mastodon-profile--make-follow-buffer "followers")) + +(defun mastodon-profile--make-follow-buffer (string) + "Make a buffer contining followers or following of user under point. + +STRING is an endpoint, either following or followers." + (let* ((account + (cdr (assoc 'account (mastodon-profile--toot-json)))) + (id (mastodon-profile--account-field + account 'id)) + (acct (mastodon-profile--account-field + account 'acct)) + (buffer (format "*%s-%s*" string acct)) + (tootv (mastodon-http--get-json + (mastodon-http--api (format "accounts/%s/%s" + id string))))) + (with-output-to-temp-buffer buffer + (switch-to-buffer buffer) + (mastodon-mode) + (setq mastodon-tl--buffer-spec + `(buffer-name ,buffer + endpoint ,(format "accounts/%s/%s" id string) + update-function + ,'mastodon-profile--add-author-bylines)) + (mastodon-profile--add-author-bylines tootv)))) + + +(provide 'mastodon-profile) +;;; mastodon-profile.el ends here diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 4790589..00dc50c 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -372,7 +372,7 @@ it is `mastodon-tl--byline-boosted'" "Returns a propertized text giving the rendering of the given HTML string STRING. The contents comes from the given TOOT which is used in parsing -links in the text." +links in the text. If TOOT is nil no parsing occurs." (with-temp-buffer (insert string) (let ((shr-use-fonts mastodon-tl--enable-proportional-fonts) @@ -381,12 +381,13 @@ links in the text." (shr-render-region (point-min) (point-max))) ;; Make all links a tab stop recognized by our own logic, make things point ;; to our own logic (e.g. hashtags), and update keymaps where needed: - (let (region) - (while (setq region (mastodon-tl--find-property-range - 'shr-url (or (cdr region) (point-min)))) - (mastodon-tl--process-link toot - (car region) (cdr region) - (get-text-property (car region) 'shr-url)))) + (when toot + (let (region) + (while (setq region (mastodon-tl--find-property-range + 'shr-url (or (cdr region) (point-min)))) + (mastodon-tl--process-link toot + (car region) (cdr region) + (get-text-property (car region) 'shr-url))))) (buffer-string))) (defun mastodon-tl--process-link (toot start end url) diff --git a/lisp/mastodon.el b/lisp/mastodon.el index 8bf227c..1b040a9 100644 --- a/lisp/mastodon.el +++ b/lisp/mastodon.el @@ -48,6 +48,7 @@ (autoload 'mastodon-toot--reply "mastodon-toot") (autoload 'mastodon-toot--toggle-boost "mastodon-toot") (autoload 'mastodon-toot--toggle-favourite "mastodon-toot") +(autoload 'mastodon-profile--get-next-author "mastodon-profile") (autoload 'mastodon-notifications--get "mastodon-notifications") (defgroup mastodon nil @@ -74,12 +75,15 @@ Use. e.g. \"%c\" for your locale's date and time format." ;; Navigation (define-key map (kbd "j") #'mastodon-tl--goto-next-toot) (define-key map (kbd "k") #'mastodon-tl--goto-prev-toot) + (define-key map (kbd "h") #'mastodon-tl--next-tab-item) + (define-key map (kbd "l") #'mastodon-tl--previous-tab-item) (define-key map [?\t] #'mastodon-tl--next-tab-item) (define-key map [backtab] #'mastodon-tl--previous-tab-item) (define-key map [?\S-\t] #'mastodon-tl--previous-tab-item) (define-key map [?\M-\t] #'mastodon-tl--previous-tab-item) ;; Navigating to other buffers: (define-key map (kbd "N") #'mastodon-notifications--get) + (define-key map (kbd "U") #'mastodon-profile--get-toot-author) (define-key map (kbd "F") #'mastodon-tl--get-federated-timeline) (define-key map (kbd "H") #'mastodon-tl--get-home-timeline) (define-key map (kbd "L") #'mastodon-tl--get-local-timeline) |