From a164bda8719733f4a13e22ba7257ca4bcab0fb17 Mon Sep 17 00:00:00 2001 From: mousebot Date: Fri, 24 Dec 2021 14:36:37 +0100 Subject: refactor follow request accept/reject functions. previously we had duplication of functions depending on whether we were in follow requests view or notificaitons view. now we just check which kind of f-req we have and act accordingly. main function being `mastodon-notifications--follow-request-process'. also updates keybindings for both views. we no longer need them included separately in profile-mode. --- lisp/mastodon-profile.el | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) (limited to 'lisp/mastodon-profile.el') diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el index 05cacde..21b40b3 100644 --- a/lisp/mastodon-profile.el +++ b/lisp/mastodon-profile.el @@ -69,8 +69,6 @@ (let ((map (make-sparse-keymap))) (define-key map (kbd "s") #'mastodon-profile--open-followers) (define-key map (kbd "g") #'mastodon-profile--open-following) - (define-key map (kbd "a") #'mastodon-profile--follow-request-accept) - (define-key map (kbd "j") #'mastodon-profile--follow-request-reject) map) "Keymap for `mastodon-profile-mode'.") @@ -153,50 +151,6 @@ extra keybindings." "follow_requests" 'mastodon-profile--add-author-bylines)) -(defun mastodon-profile--follow-request-accept () - "Accept the follow request of user at point." - (interactive) - (if (mastodon-tl--find-property-range 'toot-json (point)) - (let* ((acct-json (mastodon-profile--toot-json)) - (id (alist-get 'id acct-json)) - (handle (alist-get 'acct acct-json)) - (name (alist-get 'username acct-json))) - (if id - (let ((response - (mastodon-http--post - (concat - (mastodon-http--api "follow_requests") - (format "/%s/authorize" id)) - nil nil))) - (mastodon-http--triage response - (lambda () - (message "Follow request of %s (@%s) accepted!" - name handle)))) - (message "No account result at point?"))) - (message "No follow request at point?"))) - -(defun mastodon-profile--follow-request-reject () - "Reject the follow request of user at point." - (interactive) - (if (mastodon-tl--find-property-range 'toot-json (point)) - (let* ((acct-json (mastodon-profile--toot-json)) - (id (alist-get 'id acct-json)) - (handle (alist-get 'acct acct-json)) - (name (alist-get 'username acct-json))) - (if id - (let ((response - (mastodon-http--post - (concat - (mastodon-http--api "follow_requests") - (format "/%s/reject" id)) - nil nil))) - (mastodon-http--triage response - (lambda () - (message "Follow request of %s (@%s) rejected!" - name handle)))) - (message "No account result at point?"))) - (message "No follow request at point?"))) - (defun mastodon-profile--update-user-profile-note () "Fetch user's profile note and display for editing." (interactive) -- cgit v1.2.3