From 44e3f3796c529ea3b52be54be4636ca8d6f54c3f Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 16 Nov 2022 12:47:17 +0100
Subject: notifications - use local map with foll-req acc/rej

this way we can remove these bindings from mastodon mode map
---
 lisp/mastodon-notifications.el | 12 +++++++++++-
 lisp/mastodon.el               |  6 ------
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'lisp')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 7c5d40b..f05e670 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -73,6 +73,15 @@
     ("Posted a poll" . "that has now ended"))
   "Alist of subjects for notification types.")
 
+(defvar mastodon-notifications--map
+  (let ((map
+         (copy-keymap mastodon-mode-map)))
+    (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept)
+    (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject)
+    (define-key map (kbd "g") #'mastodon-notifications--get)
+    (keymap-canonicalize map))
+  "Keymap for viewing notifications.")
+
 (defun mastodon-notifications--byline-concat (message)
   "Add byline for TOOT with MESSAGE."
   (concat
@@ -265,7 +274,8 @@ of the toot responded to."
   (mastodon-tl--init-sync
    "notifications"
    "notifications"
-   'mastodon-notifications--timeline))
+   'mastodon-notifications--timeline)
+  (use-local-map mastodon-notifications--map))
 
 (defun mastodon-notifications--clear-all ()
   "Clear all notifications."
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 11741e1..1aec556 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -187,13 +187,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (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)
-    ;; (define-key map (kbd "C-c h") #'mastodon-async--stream-home)
-    ;; (define-key map (kbd "C-c f") #'mastodon-async--stream-federated)
-    ;; (define-key map (kbd "C-c l") #'mastodon-async--stream-local)
-    ;; (define-key map (kbd "C-c n") #'mastodon-async--stream-notifications)
     (define-key map (kbd "U") #'mastodon-profile--update-user-profile-note)
-    (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept)
-    (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject)
     (define-key map (kbd "v") #'mastodon-tl--poll-vote)
     (define-key map (kbd "k") #'mastodon-toot--bookmark-toot-toggle)
     (define-key map (kbd "K") #'mastodon-profile--view-bookmarks)
-- 
cgit v1.2.3