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 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'lisp/mastodon-notifications.el')

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."
-- 
cgit v1.2.3


From d0041dd190edb9eecd627ead1208a562f5ab2006 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 17 Nov 2022 11:03:22 +0100
Subject: reorder notif types to match masto api docs

---
 lisp/mastodon-notifications.el | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index f05e670..b145fdd 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -52,25 +52,26 @@
 (autoload 'mastodon-tl--reload-timeline-or-profile "mastodon-tl")
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--display-media-p)
+(defvar mastodon-mode-map)
 
 (defvar mastodon-notifications--types-alist
-  '(("mention" . mastodon-notifications--mention)
-    ("follow" . mastodon-notifications--follow)
+  '(("follow" . mastodon-notifications--follow)
     ("favourite" . mastodon-notifications--favourite)
     ("reblog" . mastodon-notifications--reblog)
+    ("mention" . mastodon-notifications--mention)
+    ("poll" . mastodon-notifications--poll)
     ("follow_request" . mastodon-notifications--follow-request)
-    ("status" . mastodon-notifications--status)
-    ("poll" . mastodon-notifications--poll))
+    ("status" . mastodon-notifications--status))
   "Alist of notification types and their corresponding function.")
 
 (defvar mastodon-notifications--response-alist
-  '(("Mentioned" . "you")
-    ("Followed" . "you")
+  '(("Followed" . "you")
     ("Favourited" . "your status from")
     ("Boosted" . "your status from")
+    ("Mentioned" . "you")
+    ("Posted a poll" . "that has now ended")
     ("Requested to follow" . "you")
-    ("Posted" . "a post")
-    ("Posted a poll" . "that has now ended"))
+    ("Posted" . "a post"))
   "Alist of subjects for notification types.")
 
 (defvar mastodon-notifications--map
-- 
cgit v1.2.3


From f03f26e953bfd521432efdd62c565755d90991cc Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 17 Nov 2022 11:03:43 +0100
Subject: kw arg for foll-req reject

---
 lisp/mastodon-notifications.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index b145fdd..45bd222 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -140,7 +140,7 @@ Can be called in notifications view or in follow-requests view."
   "Reject a follow request.
 Can be called in notifications view or in follow-requests view."
   (interactive)
-  (mastodon-notifications--follow-request-process t))
+  (mastodon-notifications--follow-request-process :reject))
 
 (defun mastodon-notifications--mention (note)
   "Format for a `mention' NOTE."
-- 
cgit v1.2.3


From 0bd8213302e4cbeb8483a2bef47f09cf2d8e9da2 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 17 Nov 2022 11:08:24 +0100
Subject: add notifications--get-mentions

fix endpoint arg in init-sync
---
 lisp/mastodon-notifications.el | 19 ++++++++++++++++---
 lisp/mastodon-tl.el            | 15 +++++++++++++--
 lisp/mastodon.el               |  1 +
 3 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 45bd222..27b01c1 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -268,16 +268,29 @@ of the toot responded to."
     (mapc #'mastodon-notifications--by-type json)
     (goto-char (point-min))))
 
-(defun mastodon-notifications--get ()
-  "Display NOTIFICATIONS in buffer."
+(defun mastodon-notifications--get (&optional type)
+  "Display NOTIFICATIONS in buffer.
+Optionally only print notifications of type TYPE, a string."
   (interactive)
   (message "Loading your notifications...")
   (mastodon-tl--init-sync
    "notifications"
    "notifications"
-   'mastodon-notifications--timeline)
+   'mastodon-notifications--timeline
+   type)
   (use-local-map mastodon-notifications--map))
 
+(defun mastodon-notifications--get-mentions ()
+  "Display mention notifications in buffer."
+  (interactive)
+  (mastodon-notifications--get "mention"))
+
+(defun mastodon-notifications--filter-types-list (type)
+  "Return a list of notification types with TYPE (and \"status\") removed."
+  (let ((types (remove "status"
+                       (mapcar #'car mastodon-notifications--types-alist))))
+    (remove type types)))
+
 (defun mastodon-notifications--clear-all ()
   "Clear all notifications."
   (interactive)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index f0ef000..8c02adf 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2103,12 +2103,23 @@ headers."
         ;; for everything save profiles
         (mastodon-tl--goto-first-item)))))
 
-(defun mastodon-tl--init-sync (buffer-name endpoint update-function)
+(defun mastodon-tl--init-sync (buffer-name endpoint update-function &optional note-type)
   "Initialize BUFFER-NAME with timeline targeted by ENDPOINT.
 
 UPDATE-FUNCTION is used to receive more toots.
 Runs synchronously."
-  (let* ((url (mastodon-http--api endpoint))
+  (let* ((exclude-types (when note-type
+                          (mastodon-notifications--filter-types-list note-type)))
+         (args (when note-type
+                 (mapcar (lambda (x)
+                           `("exclude_types[]" . ,x))
+                         exclude-types)))
+         (query-string (when note-type
+                         (mastodon-http--build-query-string args)))
+         ;; add note-type exclusions to endpoint so it works in `mastodon-tl--buffer-spec'
+         ;; that way `mastodon-tl--more' works seamlessly too:
+         (endpoint (if note-type (concat endpoint "?" query-string) endpoint))
+         (url (mastodon-http--api endpoint))
          (buffer (concat "*mastodon-" buffer-name "*"))
          (json (mastodon-http--get-json url)))
     (with-output-to-temp-buffer buffer
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 1aec556..707ce82 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -193,6 +193,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "K") #'mastodon-profile--view-bookmarks)
     (define-key map (kbd "I") #'mastodon-tl--view-filters)
     (define-key map (kbd "G") #'mastodon-tl--get-follow-suggestions)
+    (define-key map (kbd "@") #'mastodon-notifications--get-mentions)
     (when (require 'lingva nil :no-error)
       (define-key map (kbd "s") #'mastodon-toot--translate-toot-text))
     map)
-- 
cgit v1.2.3


From 560292b335e89101f00a941bca30143c4fda9275 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 17 Nov 2022 13:38:51 +0100
Subject: binding for clear notif at point

---
 README.org                     | 1 +
 lisp/mastodon-notifications.el | 1 +
 2 files changed, 2 insertions(+)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/README.org b/README.org
index ffe65df..a310f97 100644
--- a/README.org
+++ b/README.org
@@ -155,6 +155,7 @@ take place if your =mastodon-token-file= does not contain =:client_id= and
 |---------------+-----------------------------------------------------------------------|
 |               | Notifications view                                                    |
 | =a=, =j=          | accept/reject follow request                                          |
+| =c=             | clear notification at point                                           |
 |---------------+-----------------------------------------------------------------------|
 |               | *Quitting*                                                              |
 | =q=             | Quit mastodon buffer, leave window open                               |
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 27b01c1..bb01b77 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -79,6 +79,7 @@
          (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 "c") #'mastodon-notifications--clear-current)
     (define-key map (kbd "g") #'mastodon-notifications--get)
     (keymap-canonicalize map))
   "Keymap for viewing notifications.")
-- 
cgit v1.2.3


From 1f3f41e9832d0a485e95c0c5c57f70809684a12d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 18 Nov 2022 12:31:53 +0100
Subject: notifs mentions -- also set buffer name

---
 lisp/mastodon-notifications.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index bb01b77..a33a96b 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -269,13 +269,13 @@ of the toot responded to."
     (mapc #'mastodon-notifications--by-type json)
     (goto-char (point-min))))
 
-(defun mastodon-notifications--get (&optional type)
+(defun mastodon-notifications--get (&optional type buffer-name)
   "Display NOTIFICATIONS in buffer.
 Optionally only print notifications of type TYPE, a string."
   (interactive)
   (message "Loading your notifications...")
   (mastodon-tl--init-sync
-   "notifications"
+   (or buffer-name "notifications")
    "notifications"
    'mastodon-notifications--timeline
    type)
@@ -284,7 +284,7 @@ Optionally only print notifications of type TYPE, a string."
 (defun mastodon-notifications--get-mentions ()
   "Display mention notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "mention"))
+  (mastodon-notifications--get "mention" "mentions"))
 
 (defun mastodon-notifications--filter-types-list (type)
   "Return a list of notification types with TYPE (and \"status\") removed."
-- 
cgit v1.2.3


From d5e91d63d130d69c6fc45fb90962a31733004f94 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 19 Nov 2022 12:40:23 +0100
Subject: notifs: don't remove "status" from types, add other notifs views

---
 lisp/mastodon-notifications.el | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index a33a96b..24a8492 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -286,10 +286,35 @@ Optionally only print notifications of type TYPE, a string."
   (interactive)
   (mastodon-notifications--get "mention" "mentions"))
 
+(defun mastodon-notifications--get-favourites ()
+  "Display favourite notifications in buffer."
+  (interactive)
+  (mastodon-notifications--get "favourite" "favourites"))
+
+(defun mastodon-notifications--get-boosts ()
+  "Display boost notifications in buffer."
+  (interactive)
+  (mastodon-notifications--get "reblog" "boosts"))
+
+(defun mastodon-notifications--get-polls ()
+  "Display poll notifications in buffer."
+  (interactive)
+  (mastodon-notifications--get "poll" "polls"))
+
+(defun mastodon-notifications--get-statuses ()
+  "Display status notifications in buffer.
+Status notifications are created when you call
+`mastodon-tl--enable-notify-user-posts'."
+  (interactive)
+  (mastodon-notifications--get "status" "statuses"))
+
 (defun mastodon-notifications--filter-types-list (type)
-  "Return a list of notification types with TYPE (and \"status\") removed."
-  (let ((types (remove "status"
-                       (mapcar #'car mastodon-notifications--types-alist))))
+  "Return a list of notification types with TYPE removed."
+  (let ((types
+         ;; the docs don't mention "status" as an options
+         ;; but we do need to exclude it, so keep it in the list here
+         ;;(remove "status"
+         (mapcar #'car mastodon-notifications--types-alist)))
     (remove type types)))
 
 (defun mastodon-notifications--clear-all ()
-- 
cgit v1.2.3


From 61024cb96750f11ade4c42f872f3d6b44f53423b Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 19 Nov 2022 13:48:05 +0100
Subject: notifs--get: switch and update if we already have the buffer

---
 lisp/mastodon-notifications.el | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 24a8492..b23e3c5 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -273,13 +273,17 @@ of the toot responded to."
   "Display NOTIFICATIONS in buffer.
 Optionally only print notifications of type TYPE, a string."
   (interactive)
-  (message "Loading your notifications...")
-  (mastodon-tl--init-sync
-   (or buffer-name "notifications")
-   "notifications"
-   'mastodon-notifications--timeline
-   type)
-  (use-local-map mastodon-notifications--map))
+  (let ((buffer "*mastodon-notifications*"))
+    (if (get-buffer buffer)
+        (progn (switch-to-buffer buffer)
+               (mastodon-tl--update))
+      (message "Loading your notifications...")
+      (mastodon-tl--init-sync
+       (or buffer-name "notifications")
+       "notifications"
+       'mastodon-notifications--timeline
+       type)
+      (use-local-map mastodon-notifications--map))))
 
 (defun mastodon-notifications--get-mentions ()
   "Display mention notifications in buffer."
-- 
cgit v1.2.3


From 25f7e47beddb8fcf789a7e06a03fce5339f8500d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 19 Nov 2022 17:58:01 +0100
Subject: http--post - make args + headers optional args

also update all calls to it, no need for nil nil everywhere.
---
 lisp/mastodon-http.el          |  4 +-
 lisp/mastodon-notifications.el |  9 ++---
 lisp/mastodon-tl.el            | 14 +++----
 lisp/mastodon-toot.el          |  4 +-
 test/mastodon-tl-tests.el      | 90 +++++++++++++++++++++---------------------
 test/mastodon-toot-tests.el    | 16 ++++----
 6 files changed, 66 insertions(+), 71 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index e67cf2d..6e7bfb3 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -130,8 +130,8 @@ Used for API form data parameters that take an array."
   (cl-loop for x in array
            collect (cons param-str x)))
 
-(defun mastodon-http--post (url args headers &optional unauthenticated-p)
-  "POST synchronously to URL with ARGS and HEADERS.
+(defun mastodon-http--post (url &optional args headers unauthenticated-p)
+  "POST synchronously to URL, optionally with ARGS and HEADERS.
 
 Authorization header is included by default unless UNAUTHENTICATED-P is non-nil."
   (mastodon-http--authorized-request
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index b23e3c5..127a9e2 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -117,8 +117,7 @@ follow-requests view."
                          (mastodon-http--api "follow_requests")
                          (format "/%s/%s" id (if reject
                                                  "reject"
-                                               "authorize")))
-                        nil nil)))
+                                               "authorize"))))))
                   (mastodon-http--triage response
                                          (lambda ()
                                            (if f-reqs-view-p
@@ -326,8 +325,7 @@ Status notifications are created when you call
   (interactive)
   (when (y-or-n-p "Clear all notifications?")
     (let ((response
-           (mastodon-http--post (mastodon-http--api "notifications/clear")
-                                nil nil)))
+           (mastodon-http--post (mastodon-http--api "notifications/clear"))))
       (mastodon-http--triage
        response (lambda ()
                   (when mastodon-tl--buffer-spec
@@ -342,8 +340,7 @@ Status notifications are created when you call
                                      (mastodon-tl--property 'toot-json))))
          (response
           (mastodon-http--post (mastodon-http--api
-                                (format "notifications/%s/dismiss" id))
-                               nil nil)))
+                                (format "notifications/%s/dismiss" id)))))
     (mastodon-http--triage
      response (lambda ()
                 (when mastodon-tl--buffer-spec
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index b8486cc..6618c48 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1145,7 +1145,7 @@ this just means displaying toot client."
            ;; need to zero-index our option:
            (option-as-arg (number-to-string (1- (string-to-number (car option)))))
            (arg `(("choices[]" . ,option-as-arg)))
-           (response (mastodon-http--post url arg nil)))
+           (response (mastodon-http--post url arg)))
       (mastodon-http--triage response
                              (lambda ()
                                (message "You voted for option %s: %s!"
@@ -1604,8 +1604,7 @@ If ID is provided, use that list."
          (account-id (alist-get account handles nil nil 'equal))
          (url (mastodon-http--api (format "lists/%s/accounts" list-id)))
          (response (mastodon-http--post url
-                                        `(("account_ids[]" . ,account-id))
-                                        nil)))
+                                        `(("account_ids[]" . ,account-id)))))
     (mastodon-tl--list-action-triage
      response
      (message "%s added to list %s!" account list-name))))
@@ -1685,8 +1684,7 @@ Prompt for a context, must be a list containting at least one of \"home\",
                     contexts)))
          (response (mastodon-http--post url (push
                                              `("phrase" . ,word)
-                                             contexts-processed)
-                                        nil)))
+                                             contexts-processed))))
     (mastodon-http--triage response
                            (lambda ()
                              (message "Filter created for %s!" word)
@@ -2117,7 +2115,7 @@ NOTIFY is only non-nil when called by `mastodon-tl--follow-user'."
   "Post ACTION on user NAME/USER-HANDLE to URL.
 NOTIFY is either \"true\" or \"false\", and used when we have been called
 by `mastodon-tl--follow-user' to enable or disable notifications."
-  (let ((response (mastodon-http--post url nil nil)))
+  (let ((response (mastodon-http--post url)))
     (mastodon-http--triage response
                            (lambda ()
                              (cond ((string-equal notify "true")
@@ -2145,7 +2143,7 @@ If TAG provided, follow it."
   (interactive)
   (let* ((tag (or tag (read-string "Tag to follow: ")))
          (url (mastodon-http--api (format "tags/%s/follow" tag)))
-         (response (mastodon-http--post url nil nil)))
+         (response (mastodon-http--post url)))
     (mastodon-http--triage response
                            (lambda ()
                              (message "tag #%s followed!" tag)))))
@@ -2166,7 +2164,7 @@ If TAG if provided, unfollow it."
          (tag (or tag (completing-read "Unfollow tag: "
                                        tags)))
          (url (mastodon-http--api (format "tags/%s/unfollow" tag)))
-         (response (mastodon-http--post url nil nil)))
+         (response (mastodon-http--post url)))
     (mastodon-http--triage response
                            (lambda ()
                              (message "tag #%s unfollowed!" tag)))))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 53e60bd..d0eb143 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -268,7 +268,7 @@ boosting, or bookmarking toots."
                                           (mastodon-tl--as-string id)
                                           "/"
                                           action))))
-    (let ((response (mastodon-http--post url nil nil)))
+    (let ((response (mastodon-http--post url)))
       (mastodon-http--triage response callback))))
 
 (defun mastodon-toot--toggle-boost-or-favourite (type)
@@ -666,7 +666,7 @@ If media items have been attached and uploaded with
           ((mastodon-toot--empty-p)
            (message "Empty toot. Cowardly refusing to post this."))
           (t
-           (let ((response (mastodon-http--post endpoint args nil)))
+           (let ((response (mastodon-http--post endpoint args)))
              (mastodon-http--triage response
                                     (lambda ()
                                       (mastodon-toot--kill)
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index bb5d00f..19934dd 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -1047,53 +1047,53 @@ correct value for following, as well as notifications enabled or disabled."
       (let ((response-buffer-true (current-buffer)))
         (insert mastodon-tl--follow-notify-true-response)
         (with-mock
-          (mock (mastodon-http--post url-follow-only nil nil)
-                => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-follow-only
-                                                  user-name
-                                                  user-handle
-                                                  "follow")
-            "User some-user (@some-user@instance.url) followed!"))
-          (mock (mastodon-http--post url-mute nil nil)
-                => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-mute
-                                                  user-name
-                                                  user-handle
-                                                  "mute")
-            "User some-user (@some-user@instance.url) muted!"))
-          (mock (mastodon-http--post url-block nil nil)
-                => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-block
-                                                  user-name
-                                                  user-handle
-                                                  "block")
-            "User some-user (@some-user@instance.url) blocked!")))
+         (mock (mastodon-http--post url-follow-only)
+               => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-follow-only
+                                                 user-name
+                                                 user-handle
+                                                 "follow")
+           "User some-user (@some-user@instance.url) followed!"))
+         (mock (mastodon-http--post url-mute)
+               => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-mute
+                                                 user-name
+                                                 user-handle
+                                                 "mute")
+           "User some-user (@some-user@instance.url) muted!"))
+         (mock (mastodon-http--post url-block)
+               => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-block
+                                                 user-name
+                                                 user-handle
+                                                 "block")
+           "User some-user (@some-user@instance.url) blocked!")))
         (with-mock
-          (mock (mastodon-http--post url-true nil nil) => response-buffer-true)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-true
-                                                  user-name
-                                                  user-handle
-                                                  "follow"
-                                                  "true")
-            "Receiving notifications for user some-user (@some-user@instance.url)!")))))
+         (mock (mastodon-http--post url-true) => response-buffer-true)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-true
+                                                 user-name
+                                                 user-handle
+                                                 "follow"
+                                                 "true")
+           "Receiving notifications for user some-user (@some-user@instance.url)!")))))
     (with-temp-buffer
       (let ((response-buffer-false (current-buffer)))
         (insert mastodon-tl--follow-notify-false-response)
         (with-mock
-          (mock (mastodon-http--post url-false nil nil) => response-buffer-false)
-          (should
-           (equal
-            (mastodon-tl--do-user-action-function url-false
-                                                  user-name
-                                                  user-handle
-                                                  "follow"
-                                                  "false")
-            "Not receiving notifications for user some-user (@some-user@instance.url)!")))))))
+         (mock (mastodon-http--post url-false) => response-buffer-false)
+         (should
+          (equal
+           (mastodon-tl--do-user-action-function url-false
+                                                 user-name
+                                                 user-handle
+                                                 "follow"
+                                                 "false")
+           "Not receiving notifications for user some-user (@some-user@instance.url)!")))))))
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index 39e0984..9741964 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -152,14 +152,14 @@ mention string."
           (toot mastodon-toot-test-base-toot)
           (id 61208))
       (with-mock
-        (mock (mastodon-tl--property 'base-toot-id) => id)
-        (mock (mastodon-http--api "statuses/61208/pin")
-        => "https://example.space/statuses/61208/pin")
-        (mock (mastodon-http--post "https://example.space/statuses/61208/pin" nil nil)
-              => pin-response)
-        (should (equal (mastodon-toot--action "pin" (lambda ()
-                                                      (message "Toot pinned!")))
-                       "Toot pinned!"))))))
+       (mock (mastodon-tl--property 'base-toot-id) => id)
+       (mock (mastodon-http--api "statuses/61208/pin")
+             => "https://example.space/statuses/61208/pin")
+       (mock (mastodon-http--post "https://example.space/statuses/61208/pin")
+             => pin-response)
+       (should (equal (mastodon-toot--action "pin" (lambda ()
+                                                     (message "Toot pinned!")))
+                      "Toot pinned!"))))))
 
 (ert-deftest mastodon-toot--pin-toot-fail ()
   (with-temp-buffer
-- 
cgit v1.2.3


From f1c083bcf68106ff2de7e6532f8db7e3888eed18 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sun, 20 Nov 2022 22:23:55 +0100
Subject: display edit notifications

---
 lisp/mastodon-notifications.el | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 127a9e2..c4570ea 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -61,7 +61,8 @@
     ("mention" . mastodon-notifications--mention)
     ("poll" . mastodon-notifications--poll)
     ("follow_request" . mastodon-notifications--follow-request)
-    ("status" . mastodon-notifications--status))
+    ("status" . mastodon-notifications--status)
+    ("update" . mastodon-notifications--edit))
   "Alist of notification types and their corresponding function.")
 
 (defvar mastodon-notifications--response-alist
@@ -71,7 +72,8 @@
     ("Mentioned" . "you")
     ("Posted a poll" . "that has now ended")
     ("Requested to follow" . "you")
-    ("Posted" . "a post"))
+    ("Posted" . "a post")
+    ("Edited" . "a post"))
   "Alist of subjects for notification types.")
 
 (defvar mastodon-notifications--map
@@ -172,6 +174,10 @@ Status notifications are given when
   "Format for a `poll' NOTE."
   (mastodon-notifications--format-note note 'poll))
 
+(defun mastodon-notifications--edit (note)
+  "Format for an `edit' NOTE."
+  (mastodon-notifications--format-note note 'edit))
+
 (defun mastodon-notifications--format-note (note type)
   "Format for a NOTE of TYPE."
   (let ((id (alist-get 'id note))
@@ -196,7 +202,7 @@ Status notifications are given when
                          "Congratulations, you have a new follower!"
                        (format "You have a follow request from... %s"
                                follower))
-                       'face 'default)
+                     'face 'default)
        (mastodon-tl--clean-tabs-and-nl
         (if (mastodon-tl--has-spoiler status)
             (mastodon-tl--spoiler status)
@@ -223,7 +229,9 @@ Status notifications are given when
               ((equal type 'status)
                "Posted")
               ((equal type 'poll)
-               "Posted a poll"))))
+               "Posted a poll")
+              ((equal type 'edit)
+               "Edited"))))
      id
      (when (or (equal type 'favourite)
                (equal type 'boost))
@@ -314,9 +322,6 @@ Status notifications are created when you call
 (defun mastodon-notifications--filter-types-list (type)
   "Return a list of notification types with TYPE removed."
   (let ((types
-         ;; the docs don't mention "status" as an options
-         ;; but we do need to exclude it, so keep it in the list here
-         ;;(remove "status"
          (mapcar #'car mastodon-notifications--types-alist)))
     (remove type types)))
 
-- 
cgit v1.2.3


From 6e75db20584272ee4a9954129359f5e19d737d75 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 10:09:01 +0100
Subject: notifs: switch to filtered view when already in notifs view

we just have to set the let var propertly for filtered views.
---
 lisp/mastodon-notifications.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index c4570ea..62cdfe7 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -280,7 +280,8 @@ of the toot responded to."
   "Display NOTIFICATIONS in buffer.
 Optionally only print notifications of type TYPE, a string."
   (interactive)
-  (let ((buffer "*mastodon-notifications*"))
+  (let ((buffer (or (concat "*mastodon-" buffer-name)
+                    "*mastodon-notifications*")))
     (if (get-buffer buffer)
         (progn (switch-to-buffer buffer)
                (mastodon-tl--update))
-- 
cgit v1.2.3


From 51c2e36901fda077a438b311d7618e637bae3ee7 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 11:31:39 +0100
Subject: autoload notifs--get, clean up buffer-name arg/handling in same

---
 lisp/mastodon-notifications.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 62cdfe7..ae82b60 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -50,6 +50,7 @@
 (autoload 'mastodon-http--get-params-async-json "mastodon-http.el")
 (autoload 'mastodon-profile--view-follow-requests "mastodon-profile.el")
 (autoload 'mastodon-tl--reload-timeline-or-profile "mastodon-tl")
+(autoload 'mastodon-tl--update "mastodon-tl")
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--display-media-p)
 (defvar mastodon-mode-map)
@@ -276,11 +277,13 @@ of the toot responded to."
     (mapc #'mastodon-notifications--by-type json)
     (goto-char (point-min))))
 
+;;;###autoload
 (defun mastodon-notifications--get (&optional type buffer-name)
   "Display NOTIFICATIONS in buffer.
-Optionally only print notifications of type TYPE, a string."
+Optionally only print notifications of type TYPE, a string.
+BUFFER-NAME is added to \"*mastodon-\" to create the buffer name."
   (interactive)
-  (let ((buffer (or (concat "*mastodon-" buffer-name)
+  (let ((buffer (or (concat "*mastodon-" buffer-name "*")
                     "*mastodon-notifications*")))
     (if (get-buffer buffer)
         (progn (switch-to-buffer buffer)
-- 
cgit v1.2.3


From c19cd695b3f40a9de508e066989cb23438c9c7f7 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 11:46:20 +0100
Subject: make mastodon-notifications-get a global function

so we can view notifs without first openin other masto buffers

- move it to mastodon.el
- autoload cookie
- rename all instances
- pray the keymap works
---
 README.org                           |  5 ++++-
 lisp/mastodon-discover.el            |  2 +-
 lisp/mastodon-notifications.el       | 34 ++++++++--------------------------
 lisp/mastodon-tl.el                  |  4 ++--
 lisp/mastodon.el                     | 26 ++++++++++++++++++++++++--
 test/mastodon-notifications-tests.el |  2 +-
 6 files changed, 40 insertions(+), 33 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/README.org b/README.org
index 97e2f4f..8eb9242 100644
--- a/README.org
+++ b/README.org
@@ -222,7 +222,10 @@ You can download and use your instance's custom emoji
 
 *** Other commands and account settings:
 
-- =mastodon-url-lookup=: Attempt to load URL in =mastodon.el=. URL may be the one at point or provided in the minibuffer. Should also work if =mastodon.el= is not yet loaded.
+In addition to =mastodon=, the following functions are autoloaded and should work without first loading =mastodon.el=:
+- =mastodon-toot=: Compose new toot
+- =mastodon-notifications-get=: View all notifications
+- =mastodon-url-lookup=: Attempt to load a URL in =mastodon.el=. URL may be at point or provided in the minibuffer.
 
 
 - =mastodon-tl--view-instance-description=: View information about the instance that the author of the toot at point is on.
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 5d1a86e..dc8a924 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -76,7 +76,7 @@
                        ("F" "Federated" mastodon-tl--get-federated-timeline)
                        ("H" "Home" mastodon-tl--get-home-timeline)
                        ("L" "Local" mastodon-tl--get-local-timeline)
-                       ("N" "Notifications" mastodon-notifications--get)
+                       ("N" "Notifications" mastodon-notifications-get)
                        ("u" "Update timeline" mastodon-tl--update)
                        ("S" "Search" mastodon-search--search-query)
                        ("O" "Jump to your profile" mastodon-profile--my-profile)
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index ae82b60..a11513e 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -51,6 +51,7 @@
 (autoload 'mastodon-profile--view-follow-requests "mastodon-profile.el")
 (autoload 'mastodon-tl--reload-timeline-or-profile "mastodon-tl")
 (autoload 'mastodon-tl--update "mastodon-tl")
+(autoload 'mastodon-notifications-get "mastodon")
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--display-media-p)
 (defvar mastodon-mode-map)
@@ -83,7 +84,7 @@
     (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept)
     (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject)
     (define-key map (kbd "c") #'mastodon-notifications--clear-current)
-    (define-key map (kbd "g") #'mastodon-notifications--get)
+    (define-key map (kbd "g") #'mastodon-notifications-get)
     (keymap-canonicalize map))
   "Keymap for viewing notifications.")
 
@@ -125,7 +126,7 @@ follow-requests view."
                                          (lambda ()
                                            (if f-reqs-view-p
                                                (mastodon-profile--view-follow-requests)
-                                             (mastodon-notifications--get))
+                                             (mastodon-notifications-get))
                                            (message "Follow request of %s (@%s) %s!"
                                                     name handle (if reject
                                                                     "rejected"
@@ -277,51 +278,32 @@ of the toot responded to."
     (mapc #'mastodon-notifications--by-type json)
     (goto-char (point-min))))
 
-;;;###autoload
-(defun mastodon-notifications--get (&optional type buffer-name)
-  "Display NOTIFICATIONS in buffer.
-Optionally only print notifications of type TYPE, a string.
-BUFFER-NAME is added to \"*mastodon-\" to create the buffer name."
-  (interactive)
-  (let ((buffer (or (concat "*mastodon-" buffer-name "*")
-                    "*mastodon-notifications*")))
-    (if (get-buffer buffer)
-        (progn (switch-to-buffer buffer)
-               (mastodon-tl--update))
-      (message "Loading your notifications...")
-      (mastodon-tl--init-sync
-       (or buffer-name "notifications")
-       "notifications"
-       'mastodon-notifications--timeline
-       type)
-      (use-local-map mastodon-notifications--map))))
-
 (defun mastodon-notifications--get-mentions ()
   "Display mention notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "mention" "mentions"))
+  (mastodon-notifications-get "mention" "mentions"))
 
 (defun mastodon-notifications--get-favourites ()
   "Display favourite notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "favourite" "favourites"))
+  (mastodon-notifications-get "favourite" "favourites"))
 
 (defun mastodon-notifications--get-boosts ()
   "Display boost notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "reblog" "boosts"))
+  (mastodon-notifications-get "reblog" "boosts"))
 
 (defun mastodon-notifications--get-polls ()
   "Display poll notifications in buffer."
   (interactive)
-  (mastodon-notifications--get "poll" "polls"))
+  (mastodon-notifications-get "poll" "polls"))
 
 (defun mastodon-notifications--get-statuses ()
   "Display status notifications in buffer.
 Status notifications are created when you call
 `mastodon-tl--enable-notify-user-posts'."
   (interactive)
-  (mastodon-notifications--get "status" "statuses"))
+  (mastodon-notifications-get "status" "statuses"))
 
 (defun mastodon-notifications--filter-types-list (type)
   "Return a list of notification types with TYPE removed."
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 34048e7..aa58771 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -61,7 +61,7 @@
 (autoload 'mastodon-profile--lookup-account-in-status "mastodon-profile")
 (autoload 'mastodon-profile-mode "mastodon-profile")
 ;; make notifications--get available via M-x and outside our keymap:
-(autoload 'mastodon-notifications--get "mastodon-notifications"
+(autoload 'mastodon-notifications-get "mastodon-notifications"
   "Display NOTIFICATIONS in buffer." t) ; interactive
 (autoload 'mastodon-search--propertize-user "mastodon-search")
 (autoload 'mastodon-search--insert-users-propertized "mastodon-search")
@@ -2238,7 +2238,7 @@ For use after e.g. deleting a toot."
         ((equal (mastodon-tl--get-endpoint) "timelines/public?local=true")
          (mastodon-tl--get-local-timeline))
         ((equal (mastodon-tl--get-endpoint) "notifications")
-         (mastodon-notifications--get))
+         (mastodon-notifications-get))
         ((equal (mastodon-tl--buffer-name)
                 (concat "*mastodon-" (mastodon-auth--get-account-name) "-statuses*"))
          (mastodon-profile--my-profile))
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 5be168c..527de18 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -57,7 +57,6 @@
 (autoload 'mastodon-tl--thread "mastodon-tl")
 (autoload 'mastodon-tl--toggle-spoiler-text-in-toot "mastodon-tl")
 (autoload 'mastodon-tl--update "mastodon-tl")
-(autoload 'mastodon-notifications--get "mastodon-notifications")
 (autoload 'mastodon-profile--get-toot-author "mastodon-profile")
 (autoload 'mastodon-profile--make-author-buffer "mastodon-profile")
 (autoload 'mastodon-profile--show-user "mastodon-profile")
@@ -96,6 +95,10 @@
 (autoload 'mastodon-tl--view-lists "mastodon-tl")
 (autoload 'mastodon-toot--edit-toot-at-point "mastodon-toot")
 (autoload 'mastodon-toot--view-toot-history "mastodon-tl")
+(autoload 'mastodon-tl--init-sync "mastodon-tl")
+(autoload 'mastodon-notifications--timeline "mastodon-notifications")
+
+(defvar mastodon-notifications--map)
 
 (defgroup mastodon nil
   "Interface with Mastodon."
@@ -160,7 +163,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (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)
-    (define-key map (kbd "N") #'mastodon-notifications--get)
+    (define-key map (kbd "N") #'mastodon-notifications-get)
     (define-key map (kbd "P") #'mastodon-profile--show-user)
     (define-key map (kbd "T") #'mastodon-tl--thread)
     ;; navigation out of mastodon
@@ -267,6 +270,25 @@ If REPLY-JSON is the json of the toot being replied to."
   (interactive)
   (mastodon-toot--compose-buffer user reply-to-id reply-json))
 
+;;;###autoload
+(defun mastodon-notifications-get (&optional type buffer-name)
+  "Display NOTIFICATIONS in buffer.
+Optionally only print notifications of type TYPE, a string.
+BUFFER-NAME is added to \"*mastodon-\" to create the buffer name."
+  (interactive)
+  (let ((buffer (or (concat "*mastodon-" buffer-name "*")
+                    "*mastodon-notifications*")))
+    (if (get-buffer buffer)
+        (progn (switch-to-buffer buffer)
+               (mastodon-tl--update))
+      (message "Loading your notifications...")
+      (mastodon-tl--init-sync
+       (or buffer-name "notifications")
+       "notifications"
+       'mastodon-notifications--timeline
+       type)
+      (use-local-map mastodon-notifications--map))))
+
 ;; URL lookup: should be available even if `mastodon.el' not loaded:
 
 ;;;###autoload
diff --git a/test/mastodon-notifications-tests.el b/test/mastodon-notifications-tests.el
index bc70e49..1275c72 100644
--- a/test/mastodon-notifications-tests.el
+++ b/test/mastodon-notifications-tests.el
@@ -191,7 +191,7 @@
      (mock (mastodon-profile--fetch-server-account-settings)
            => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
 
-     (mastodon-notifications--get))))
+     (mastodon-notifications-get))))
 
 (defun mastodon-notifications--test-type (fun sample)
   "Test notification draw functions.
-- 
cgit v1.2.3


From 01d44daa21cc24e99e61bba36e0dc2a111e46586 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Mon, 21 Nov 2022 16:48:05 +0100
Subject: masto mode map: 'g' calls --update

also remove notifs-get from same key in notifs map, for consistency
---
 lisp/mastodon-notifications.el | 1 -
 lisp/mastodon.el               | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lisp/mastodon-notifications.el')

diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index a11513e..f5ddea3 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -84,7 +84,6 @@
     (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept)
     (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject)
     (define-key map (kbd "c") #'mastodon-notifications--clear-current)
-    (define-key map (kbd "g") #'mastodon-notifications-get)
     (keymap-canonicalize map))
   "Keymap for viewing notifications.")
 
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 527de18..04330f6 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -174,11 +174,13 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "c") #'mastodon-tl--toggle-spoiler-text-in-toot)
     (define-key map (kbd "f") #'mastodon-toot--toggle-favourite)
     (define-key map (kbd "r") #'mastodon-toot--reply)
+    ;; this is now duplicated by 'g', cd remove/use for else:
     (define-key map (kbd "u") #'mastodon-tl--update)
     ;; new toot
     (define-key map (kbd "t") #'mastodon-toot)
     ;; override special mode binding
     (define-key map (kbd "g") #'undefined)
+    (define-key map (kbd "g") #'mastodon-tl--update)
     ;; mousebot additions
     (define-key map (kbd "W") #'mastodon-tl--follow-user)
     (define-key map (kbd "C-S-W") #'mastodon-tl--unfollow-user)
@@ -207,7 +209,6 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (when (require 'lingva nil :no-error)
       (define-key map (kbd "s") #'mastodon-toot--translate-toot-text))
     map)
-
   "Keymap for `mastodon-mode'.")
 
 (defcustom mastodon-mode-hook nil
-- 
cgit v1.2.3