From d3cda98308f5bdf604d3d69800454d827fe814e9 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 18:57:50 +0100
Subject: a rough crack at handling company to capf conversion if cape/corfu

---
 lisp/mastodon-toot.el | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 6162f52..92cbc53 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1469,14 +1469,24 @@ a draft into the buffer."
       ;; no need to fetch from `mastodon-profile-account-settings' as
       ;; `mastodon-toot--max-toot-chars' is set when we set it
       (mastodon-toot--get-max-toot-chars))
-    ;; set up company backends:
+    ;; set up completion backends:
     (when (require 'company nil :noerror)
       (when mastodon-toot--enable-completion
-        (set (make-local-variable 'company-backends)
-             (add-to-list 'company-backends 'mastodon-toot-mentions))
-        (add-to-list 'company-backends 'mastodon-toot-tags))
-      (unless (bound-and-true-p corfu-mode) ; don't clash w corfu mode
-        (company-mode-on)))
+        ;; convert our company backends into capfs for use with corfu:
+        ;; FIXME replace this with a customize
+        (if (and (require 'cape nil :noerror)
+                 (bound-and-true-p corfu-mode))
+            (dolist (company-backend (list #'mastodon-toot-tags #'mastodon-toot-mentions))
+              (add-hook 'completion-at-point-functions
+                        (cape-company-to-capf company-backend)
+                        nil
+                        'local))
+          ;; else stick with company:
+          (set (make-local-variable 'company-backends)
+               (add-to-list 'company-backends 'mastodon-toot-mentions))
+          (add-to-list 'company-backends 'mastodon-toot-tags))
+        (unless (bound-and-true-p corfu-mode) ; don't clash w corfu mode
+          (company-mode-on))))
     (make-local-variable 'after-change-functions)
     (push #'mastodon-toot--update-status-fields after-change-functions)
     (mastodon-toot--refresh-attachments-display)
-- 
cgit v1.2.3


From b3269374ada3255e7bf4a0e7ff0cfa4084083773 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 20:47:28 +0100
Subject: defvar mastodon-toot-tag-regex

---
 lisp/mastodon-toot.el | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 92cbc53..f195a87 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -204,6 +204,13 @@ send.")
    "\\(@[^ \n\t]*\\)?\\)" ; with poss domain, * = allow only @
    "\\b"))
 
+(defvar mastodon-toot-tag-regex
+  (concat
+   ;; preceding space or bol [boundary doesn't work with #]
+   "\\([\n\t ]\\|^\\)"
+   "\\(?2:#[1-9a-zA-Z_]+\\)" ; tag
+   "\\b")) ; boundary
+
 (defvar mastodon-toot-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "C-c C-c") #'mastodon-toot--send)
@@ -1415,13 +1422,12 @@ Added to `after-change-functions'."
       ;; stops all text after a handle or mention being propertized:
       (set-text-properties (cdr header-region) (point-max) nil)
       ;; TODO: confirm allowed hashtag/handle characters:
-      (mastodon-toot--propertize-item "\\([\n\t ]\\|^\\)\\(?2:#[1-9a-zA-Z_]+\\)\\b"
+      (mastodon-toot--propertize-item mastodon-toot-tag-regex
                                       'success
                                       (cdr header-region))
-      (mastodon-toot--propertize-item
-       mastodon-toot-handle-regex
-       'mastodon-display-name-face
-       (cdr header-region)))))
+      (mastodon-toot--propertize-item mastodon-toot-handle-regex
+                                      'mastodon-display-name-face
+                                      (cdr header-region)))))
 
 (defun mastodon-toot--propertize-item (regex face start)
   "Propertize item matching REGEX with FACE starting from START."
-- 
cgit v1.2.3


From 04221419595887ad2ac84e4531310235986075e3 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 20:48:21 +0100
Subject: a first go at capf completion backends for mentions and tags

the regex searches still fail sometimes, and completions don't show urls or
usernames like the old company backends.
---
 lisp/mastodon-search.el | 12 +++++--
 lisp/mastodon-toot.el   | 87 +++++++++++++++++++++++++++++++++++++------------
 2 files changed, 77 insertions(+), 22 deletions(-)

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 31fcae3..fc7bd8e 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -49,13 +49,19 @@
 
 ;; functions for company completion of mentions in mastodon-toot
 
+(defun mastodon-search--get-user-info-@-capf (account)
+  "Get user handle, display name and account URL from ACCOUNT."
+  (list (concat "@" (cdr (assoc 'acct account)))
+        (cdr (assoc 'url account))
+        (cdr (assoc 'display_name account))))
+
 (defun mastodon-search--get-user-info-@ (account)
   "Get user handle, display name and account URL from ACCOUNT."
   (list (cdr (assoc 'display_name account))
         (concat "@" (cdr (assoc 'acct account)))
         (cdr (assoc 'url account))))
 
-(defun mastodon-search--search-accounts-query (query)
+(defun mastodon-search--search-accounts-query (query &optional capf)
   "Prompt for a search QUERY and return accounts synchronously.
 Returns a nested list containing user handle, display name, and URL."
   (interactive "sSearch mastodon for: ")
@@ -63,7 +69,9 @@ Returns a nested list containing user handle, display name, and URL."
          (response (if (equal mastodon-toot--completion-style-for-mentions "following")
                        (mastodon-http--get-search-json url query "following=true")
                      (mastodon-http--get-search-json url query))))
-    (mapcar #'mastodon-search--get-user-info-@ response)))
+    (if capf
+        (mapcar #'mastodon-search--get-user-info-@-capf response)
+      (mapcar #'mastodon-search--get-user-info-@ response))))
 
 ;; functions for tags completion:
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index f195a87..6ba3a75 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -108,13 +108,14 @@
 (defcustom mastodon-toot--enable-completion
   (if (require 'company nil :noerror) t nil)
   "Whether to enable completion of mentions and hashtags.
-
 Used for completion in toot compose buffer.
-
 This is only used if company mode is installed."
   :group 'mastodon-toot
   :type 'boolean)
 
+(defcustom mastodon-toot--use-company-for-completion t
+  "Whether to use company for completion.")
+
 (defcustom mastodon-toot--completion-style-for-mentions
   (if (require 'company nil :noerror) "following" "off")
   "The company completion style to use for mentions."
@@ -913,6 +914,56 @@ meta fields respectively."
       (annotation (funcall annot-fun arg))
       (meta (funcall meta-fun arg)))))
 
+(defun mastodon-toot-mentions-capf ()
+  "Build a mentions completion backend for `completion-at-point-functions'."
+  (let* ((handle-bounds
+          ;; hack for @handles@with.domains, as "@" is not inc in any thing at pt!
+          (save-match-data
+            (save-excursion
+              ;; match full handle inc. domain (see the regex for subexp 2)
+              (when (re-search-backward mastodon-toot-handle-regex nil :no-error)
+                ;; (when (match-string-no-properties 2)
+                (cons (match-beginning 2)
+                      (match-end 2))))))
+         (start (car handle-bounds))
+         (end (cdr handle-bounds)))
+    (when handle-bounds
+      (list start
+            end
+            ;; only search when necessary:
+            (completion-table-dynamic
+             (lambda (_)
+               (mastodon-search--search-accounts-query
+                (buffer-substring-no-properties start end)
+                :capf)))
+            :exclusive 'no))))
+
+(defun mastodon-toot-tags-capf ()
+  "Build a tags completion backend for `completion-at-point-functions'."
+  (let* ((tag-bounds
+          (save-match-data
+            (save-excursion
+              ;; match full tag with # (see regex for subexp)
+              (re-search-backward mastodon-toot-tag-regex nil :no-error)
+              (when (match-string-no-properties 2)
+                (cons (match-beginning 2)
+                      (match-end 2))))))
+         (start (car tag-bounds))
+         (end (cdr tag-bounds)))
+    (when tag-bounds
+      (list start
+            end
+            ;; only search when necessary:
+            (completion-table-dynamic
+             (lambda (_)
+               (let ((tags (mastodon-search--search-tags-query
+                            (buffer-substring-no-properties start end))))
+                 (mapcar (lambda (x)
+                           (list (concat "#" (car x))
+                                 (cdr x)))
+                         tags))))
+            :exclusive 'no))))
+
 (defun mastodon-toot-mentions (command &optional arg &rest ignored)
   "A company completion backend for toot mentions.
 COMMAND is either prefix, to fetch a prefix query, candidates, to
@@ -1475,24 +1526,20 @@ a draft into the buffer."
       ;; no need to fetch from `mastodon-profile-account-settings' as
       ;; `mastodon-toot--max-toot-chars' is set when we set it
       (mastodon-toot--get-max-toot-chars))
-    ;; set up completion backends:
-    (when (require 'company nil :noerror)
-      (when mastodon-toot--enable-completion
-        ;; convert our company backends into capfs for use with corfu:
-        ;; FIXME replace this with a customize
-        (if (and (require 'cape nil :noerror)
-                 (bound-and-true-p corfu-mode))
-            (dolist (company-backend (list #'mastodon-toot-tags #'mastodon-toot-mentions))
-              (add-hook 'completion-at-point-functions
-                        (cape-company-to-capf company-backend)
-                        nil
-                        'local))
-          ;; else stick with company:
-          (set (make-local-variable 'company-backends)
-               (add-to-list 'company-backends 'mastodon-toot-mentions))
-          (add-to-list 'company-backends 'mastodon-toot-tags))
-        (unless (bound-and-true-p corfu-mode) ; don't clash w corfu mode
-          (company-mode-on))))
+    ;; set up completion:
+    (when mastodon-toot--enable-completion
+      ;; (setq-local
+      (set
+       (make-local-variable 'completion-at-point-functions)
+       (add-to-list
+        'completion-at-point-functions
+        #'mastodon-toot-mentions-capf))
+      (add-to-list
+       'completion-at-point-functions
+       #'mastodon-toot-tags-capf)
+      (when mastodon-toot--use-company-for-completion
+        (company-mode-on)))
+    ;; after-change:
     (make-local-variable 'after-change-functions)
     (push #'mastodon-toot--update-status-fields after-change-functions)
     (mastodon-toot--refresh-attachments-display)
-- 
cgit v1.2.3


From 468add918b8e1e790294cdc7ff5e34cf1bf862f6 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Tue, 22 Nov 2022 21:44:43 +0100
Subject: silence the tags/handles searche queries

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

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index fc7bd8e..8530b5c 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -67,8 +67,8 @@ Returns a nested list containing user handle, display name, and URL."
   (interactive "sSearch mastodon for: ")
   (let* ((url (mastodon-http--api "accounts/search"))
          (response (if (equal mastodon-toot--completion-style-for-mentions "following")
-                       (mastodon-http--get-search-json url query "following=true")
-                     (mastodon-http--get-search-json url query))))
+                       (mastodon-http--get-search-json url query "following=true" :silent)
+                     (mastodon-http--get-search-json url query nil :silent))))
     (if capf
         (mapcar #'mastodon-search--get-user-info-@-capf response)
       (mapcar #'mastodon-search--get-user-info-@ response))))
@@ -81,7 +81,7 @@ QUERY is the string to search."
   (interactive "sSearch for hashtag: ")
   (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
          (type-param (concat "type=hashtags"))
-         (response (mastodon-http--get-search-json url query type-param))
+         (response (mastodon-http--get-search-json url query type-param :silent))
          (tags (alist-get 'hashtags response)))
     (mapcar #'mastodon-search--get-hashtag-info tags)))
 
-- 
cgit v1.2.3


From 264230f58acd1dea38eae29c57b555a5b48d5b35 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 23 Nov 2022 10:46:07 +0100
Subject: working capf completion

---
 lisp/mastodon-toot.el | 52 +++++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 6ba3a75..5abe362 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -914,20 +914,24 @@ meta fields respectively."
       (annotation (funcall annot-fun arg))
       (meta (funcall meta-fun arg)))))
 
-(defun mastodon-toot-mentions-capf ()
+(defun mastodon-toot--get-bounds (regex)
+  "Get bounds of tag or handle before point."
+  ;; needed because # and @ are not part of any existing thing at point
+  (save-match-data
+    (save-excursion
+      ;; match full handle inc. domain, or tag including #
+      ;; (see the regexes for subexp 2)
+      (when (re-search-backward regex nil :no-error)
+        (cons (match-beginning 2)
+              (match-end 2))))))
+
+(defun mastodon-toot--mentions-capf ()
   "Build a mentions completion backend for `completion-at-point-functions'."
-  (let* ((handle-bounds
-          ;; hack for @handles@with.domains, as "@" is not inc in any thing at pt!
-          (save-match-data
-            (save-excursion
-              ;; match full handle inc. domain (see the regex for subexp 2)
-              (when (re-search-backward mastodon-toot-handle-regex nil :no-error)
-                ;; (when (match-string-no-properties 2)
-                (cons (match-beginning 2)
-                      (match-end 2))))))
-         (start (car handle-bounds))
-         (end (cdr handle-bounds)))
-    (when handle-bounds
+  (let* ((bounds
+          (mastodon-toot--get-bounds mastodon-toot-handle-regex))
+         (start (car bounds))
+         (end (cdr bounds)))
+    (when bounds
       (list start
             end
             ;; only search when necessary:
@@ -938,19 +942,13 @@ meta fields respectively."
                 :capf)))
             :exclusive 'no))))
 
-(defun mastodon-toot-tags-capf ()
+(defun mastodon-toot--tags-capf ()
   "Build a tags completion backend for `completion-at-point-functions'."
-  (let* ((tag-bounds
-          (save-match-data
-            (save-excursion
-              ;; match full tag with # (see regex for subexp)
-              (re-search-backward mastodon-toot-tag-regex nil :no-error)
-              (when (match-string-no-properties 2)
-                (cons (match-beginning 2)
-                      (match-end 2))))))
-         (start (car tag-bounds))
-         (end (cdr tag-bounds)))
-    (when tag-bounds
+  (let* ((bounds
+          (mastodon-toot--get-bounds mastodon-toot-tag-regex))
+         (start (car bounds))
+         (end (cdr bounds)))
+    (when bounds
       (list start
             end
             ;; only search when necessary:
@@ -1533,10 +1531,10 @@ a draft into the buffer."
        (make-local-variable 'completion-at-point-functions)
        (add-to-list
         'completion-at-point-functions
-        #'mastodon-toot-mentions-capf))
+        #'mastodon-toot--mentions-capf))
       (add-to-list
        'completion-at-point-functions
-       #'mastodon-toot-tags-capf)
+       #'mastodon-toot--tags-capf)
       (when mastodon-toot--use-company-for-completion
         (company-mode-on)))
     ;; after-change:
-- 
cgit v1.2.3


From 2249680459ad9c46bfddb2c28c277b73ee9c4aa5 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 23 Nov 2022 10:49:16 +0100
Subject: disable company completion by default

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

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 5abe362..96ff8fc 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -113,7 +113,7 @@ This is only used if company mode is installed."
   :group 'mastodon-toot
   :type 'boolean)
 
-(defcustom mastodon-toot--use-company-for-completion t
+(defcustom mastodon-toot--use-company-for-completion nil
   "Whether to use company for completion.")
 
 (defcustom mastodon-toot--completion-style-for-mentions
-- 
cgit v1.2.3


From 9dd3db84b9164517239121188e58e188fe13b393 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 23 Nov 2022 11:03:12 +0100
Subject: clean up compose-buffer capf control flow

---
 lisp/mastodon-toot.el | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 96ff8fc..c13d43b 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -114,7 +114,19 @@ This is only used if company mode is installed."
   :type 'boolean)
 
 (defcustom mastodon-toot--use-company-for-completion nil
-  "Whether to use company for completion.")
+  "Whether to use company completion backends directly.
+When non-nil, company backends `mastodon-toot-mentions' and
+`mastodon-toot-tags' are used for completion.
+
+A nil setting will use `completion-at-point-functions' for
+completion, which also work with company, provided that the
+backend `company-capf' is enabled.
+
+If setting this to non-nil, ensure `corfu-mode' is disabled as the
+two are incompatible.
+
+When the `completion-at-point-functions' backends are more
+complete, direct company backends will be removed.")
 
 (defcustom mastodon-toot--completion-style-for-mentions
   (if (require 'company nil :noerror) "following" "off")
@@ -1526,16 +1538,21 @@ a draft into the buffer."
       (mastodon-toot--get-max-toot-chars))
     ;; set up completion:
     (when mastodon-toot--enable-completion
-      ;; (setq-local
-      (set
-       (make-local-variable 'completion-at-point-functions)
-       (add-to-list
-        'completion-at-point-functions
-        #'mastodon-toot--mentions-capf))
-      (add-to-list
-       'completion-at-point-functions
-       #'mastodon-toot--tags-capf)
-      (when mastodon-toot--use-company-for-completion
+      (if (not mastodon-toot--use-company-for-completion)
+          ;; capf
+          (progn
+            (set ; (setq-local
+             (make-local-variable 'completion-at-point-functions)
+             (add-to-list
+              'completion-at-point-functions
+              #'mastodon-toot--mentions-capf))
+            (add-to-list
+             'completion-at-point-functions
+             #'mastodon-toot--tags-capf))
+        ;; company
+        (set (make-local-variable 'company-backends)
+             (add-to-list 'company-backends 'mastodon-toot-mentions))
+        (add-to-list 'company-backends 'mastodon-toot-tags)
         (company-mode-on)))
     ;; after-change:
     (make-local-variable 'after-change-functions)
-- 
cgit v1.2.3


From f5420dd98a335d434f3cdc2c8456504f25c6ac9d Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 24 Nov 2022 11:42:13 +0100
Subject: add annotation to completions (URL for tag, username for mention)

this is still rough, uses a defvar-local which may be avoidable.
---
 lisp/mastodon-toot.el | 47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index c13d43b..6855280 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -949,10 +949,17 @@ meta fields respectively."
             ;; only search when necessary:
             (completion-table-dynamic
              (lambda (_)
-               (mastodon-search--search-accounts-query
-                (buffer-substring-no-properties start end)
-                :capf)))
-            :exclusive 'no))))
+               ;; TODO: do we really need to set a local var here
+               ;; just for the annotation-function?
+               (setq mastodon-toot-completions
+                     (mastodon-search--search-accounts-query
+                      (buffer-substring-no-properties start end)
+                      :capf))))
+            :exclusive 'no
+            :annotation-function
+            (lambda (candidate)
+              (concat " "
+                      (mastodon-toot--mentions-annotation-fun candidate)))))))
 
 (defun mastodon-toot--tags-capf ()
   "Build a tags completion backend for `completion-at-point-functions'."
@@ -966,13 +973,31 @@ meta fields respectively."
             ;; only search when necessary:
             (completion-table-dynamic
              (lambda (_)
-               (let ((tags (mastodon-search--search-tags-query
-                            (buffer-substring-no-properties start end))))
-                 (mapcar (lambda (x)
-                           (list (concat "#" (car x))
-                                 (cdr x)))
-                         tags))))
-            :exclusive 'no))))
+               (setq mastodon-toot-completions
+                     (let ((tags (mastodon-search--search-tags-query
+                                  (buffer-substring-no-properties start end))))
+                       (mapcar (lambda (x)
+                                 (list (concat "#" (car x))
+                                       (cdr x)))
+                               tags)))))
+            :exclusive 'no
+            :annotation-function
+            (lambda (candidate)
+              (concat " "
+                      (mastodon-toot--tags-annotation-fun candidate)))))))
+
+(defvar-local mastodon-toot-completions nil
+  "The data of completion candidates for the current completion at point.")
+
+(defun mastodon-toot--mentions-annotation-fun (candidate)
+  "Given a handle completion CANDIDATE, return its annotation string, a username."
+  (caddr (assoc candidate mastodon-toot-completions)))
+
+(defun mastodon-toot--tags-annotation-fun (candidate)
+  "Given a tag string CANDIDATE, return an annotation, the tag's URL."
+  ;; FIXME check the list returned here? should be cadr
+  ;;or make it an alist and use cdr
+  (caadr (assoc candidate mastodon-toot-completions)))
 
 (defun mastodon-toot-mentions (command &optional arg &rest ignored)
   "A company completion backend for toot mentions.
-- 
cgit v1.2.3


From 1713abbe28c4a8ad684b651450b2c6e06a512c9a Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 24 Nov 2022 12:58:22 +0100
Subject: discover.el - remove (when (require and RET, both break it

---
 lisp/mastodon-discover.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 5d1a86e..5b8141b 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -57,8 +57,8 @@
                        ("p" "Prev" mastodon-tl--goto-prev-toot)
                        ("TAB" "Next link item" mastodon-tl--next-tab-item)
                        ("S-TAB" "Prev link item" mastodon-tl--previous-tab-item)
-                       (when (require 'mpv nil :noerror)
-                         ("C-RET" "Play media" mastodon-tl--mpv-play-video-at-point))
+                       ;; NB: (when (require 'mpv etc. calls don't work here
+                       ("C-RET" "Play media" mastodon-tl--mpv-play-video-at-point)
                        ("t" "New toot" mastodon-toot)
                        ("r" "Reply" mastodon-toot--reply)
                        ("C" "Copy toot URL" mastodon-toot--copy-toot-url)
@@ -66,8 +66,7 @@
                        ("D" "Delete and redraft (your) toot" mastodon-toot--delete-toot)
                        ("i" "Pin/Unpin (your) toot" mastodon-toot--pin-toot-toggle)
                        ("P" "View user profile" mastodon-profile--show-user)
-                       (when (require 'lingva nil :noerror)
-                         "s" "Translate toot at point" mastodon-toot--translate-toot-text)
+                       ("s" "Translate toot at point" mastodon-toot--translate-toot-text)
                        ("T" "View thread" mastodon-tl--thread)
                        ("v" "Vote on poll" mastodon-tl--poll-vote))
                       ("Views"
@@ -94,7 +93,8 @@
                        ("B" "Block" mastodon-tl--block-user)
                        ("C-S-B" "Unblock" mastodon-tl--unblock-user))
                       ("Images"
-                       ("RET/i" "Load full image in browser" 'shr-browse-image)
+                       ;; RET errors here also :/
+                       ("<return>/i" "Load full image in browser" 'shr-browse-image)
                        ("r" "rotate" 'image-rotate)
                        ("+" "zoom in" 'image-increase-size)
                        ("-" "zoom out" 'image-decrease-size)
-- 
cgit v1.2.3


From b2b8fe39b6863a1398bf7d50e9ee9bc3143d2fe2 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Thu, 24 Nov 2022 15:03:20 +0100
Subject: display icon for boosts

will later follow rougier's lead on this, but just wanted to see how it looked
---
 lisp/mastodon-tl.el   | 29 +++++++++++++++++++++--------
 lisp/mastodon-toot.el |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 46ec8fe..e65d3a5 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -600,9 +600,6 @@ this just means displaying toot client."
          (faved (equal 't (mastodon-tl--field 'favourited toot)))
          (boosted (equal 't (mastodon-tl--field 'reblogged toot)))
          (bookmarked (equal 't (mastodon-tl--field 'bookmarked toot)))
-         (bookmark-str (if (fontp (char-displayable-p #10r128278))
-                           "🔖"
-                         "K"))
          (visibility (mastodon-tl--field 'visibility toot))
          (account (alist-get 'account toot))
          (avatar-url (alist-get 'avatar account))
@@ -617,12 +614,14 @@ this just means displaying toot client."
      ;; displayed for an already boosted/favourited toot or as the result of
      ;; the toot having just been favourited/boosted.
      (concat (when boosted
-               (mastodon-tl--format-faved-or-boosted-byline "B"))
+               (mastodon-tl--format-faved-or-boosted-byline
+                (mastodon-tl--return-boost-char)))
              (when faved
                (mastodon-tl--format-faved-or-boosted-byline
                 (mastodon-tl--return-fave-char)))
              (when bookmarked
-               (mastodon-tl--format-faved-or-boosted-byline bookmark-str)))
+               (mastodon-tl--format-faved-or-boosted-byline
+                (mastodon-tl--return-bookmark-char))))
      ;; we remove avatars from the byline also, so that they also do not mess
      ;; with `mastodon-tl--goto-next-toot':
      (when (and mastodon-tl--show-avatars
@@ -667,10 +666,10 @@ this just means displaying toot client."
                           'face 'mastodon-display-name-face
                           'follow-link t
                           'mouse-face 'highlight
-		                  'mastodon-tab-stop 'shr-url
-		                  'shr-url app-url
+		          'mastodon-tab-stop 'shr-url
+		          'shr-url app-url
                           'help-echo app-url
-		                  'keymap mastodon-tl--shr-map-replacement)))))
+		          'keymap mastodon-tl--shr-map-replacement)))))
        (if edited-time
            (concat
             (if (fontp (char-displayable-p #10r128274))
@@ -694,6 +693,14 @@ this just means displaying toot client."
                       (mastodon-toot--get-toot-edits (alist-get 'id toot)))
       'byline       t))))
 
+(defun mastodon-tl--return-boost-char ()
+  ""
+  (cond
+   ((fontp (char-displayable-p #10r128257))
+    "🔁")
+   (t
+    "B")))
+
 (defun mastodon-tl--return-fave-char ()
   ""
   (cond
@@ -704,6 +711,12 @@ this just means displaying toot client."
    (t
     "F")))
 
+(defun mastodon-tl--return-bookmark-char ()
+  ""
+  (if (fontp (char-displayable-p #10r128278))
+      "🔖"
+    "K"))
+
 (defun mastodon-tl--format-edit-timestamp (timestamp)
   "Convert edit TIMESTAMP into a descriptive string."
   (let ((parsed (ts-human-duration
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 4f9fb1b..7211183 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -334,7 +334,7 @@ TYPE is a symbol, either 'favourite or 'boost."
                                       (list 'favourited-p (not faved))))
                (mastodon-toot--action-success
                 (if boost-p
-                    "B"
+                    (mastodon-tl--return-boost-char)
                   (mastodon-tl--return-fave-char))
                 byline-region remove))
              (message (format "%s #%s" (if boost-p msg action) id))))))
-- 
cgit v1.2.3


From 9b0fdec55f6770d7c270e0a1e501ceb5e3ebcd95 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 16:33:43 +0100
Subject: remove all company backends, use company-capf + use-company custom

---
 lisp/mastodon-toot.el | 182 ++++++--------------------------------------------
 1 file changed, 21 insertions(+), 161 deletions(-)

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 8e6f4df..b12e7e1 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -41,12 +41,6 @@
 (require 'cl-lib)
 (require 'persist)
 
-(when (require 'company nil :noerror)
-  (declare-function company-mode-on "company")
-  (declare-function company-begin-backend "company")
-  (declare-function company-grab-symbol "company")
-  (defvar company-backends))
-
 (require 'mastodon-iso)
 
 (defvar mastodon-instance-url)
@@ -105,31 +99,24 @@
   :group 'mastodon-toot
   :type 'integer)
 
-(defcustom mastodon-toot--enable-completion
-  (if (require 'company nil :noerror) t nil)
+(defcustom mastodon-toot--enable-completion t
   "Whether to enable completion of mentions and hashtags.
-Used for completion in toot compose buffer.
-This is only used if company mode is installed."
+Used for completion in toot compose buffer."
   :group 'mastodon-toot
   :type 'boolean)
 
 (defcustom mastodon-toot--use-company-for-completion nil
-  "Whether to use company completion backends directly.
-When non-nil, company backends `mastodon-toot-mentions' and
-`mastodon-toot-tags' are used for completion.
-
-A nil setting will use `completion-at-point-functions' for
-completion, which also work with company, provided that the
-backend `company-capf' is enabled.
+  "Whether to enable company for completion.
 
-If setting this to non-nil, ensure `corfu-mode' is disabled as the
-two are incompatible.
+When non-nil, `company-mode' is enabled in the toot compose
+buffer, and mastodon completion backends are added to
+`company-capf'.
 
-When the `completion-at-point-functions' backends are more
-complete, direct company backends will be removed.")
+You need to install company yourself to use this."
+  :group 'mastodon-toot
+  :type 'boolean)
 
-(defcustom mastodon-toot--completion-style-for-mentions
-  (if (require 'company nil :noerror) "following" "off")
+(defcustom mastodon-toot--completion-style-for-mentions "all"
   "The company completion style to use for mentions."
   :group 'mastodon-toot
   :type '(choice
@@ -837,98 +824,6 @@ eg. \"feduser@fed.social\" -> \"feduser@fed.social\"."
                (reverse (append mentions nil))
                "")))
 
-(defun mastodon-toot--mentions-company-meta (candidate)
-  "Format company completion CANDIDATE's meta field."
-  (format " %s"
-          (get-text-property 0 'meta candidate)))
-
-(defun mastodon-toot--mentions-company-annotation (candidate)
-  "Format company completion CANDIDATE's annotation."
-  (format " %s" (get-text-property 0 'annot candidate)))
-
-(defun mastodon-toot--mentions-company-make-candidate (candidate)
-  "Construct a company completion CANDIDATE for display."
-  (let ((display-name (car candidate))
-        (handle (cadr candidate))
-        (url (caddr candidate)))
-    (propertize handle 'annot display-name 'meta url)))
-
-(defun mastodon-toot--tags-company-make-candidate (candidate)
-  "Construct a company completion CANDIDATE for display."
-  (let ((tag (concat "#" (car candidate)))
-        (url (cadr candidate)))
-    (propertize tag 'annot url 'meta url)))
-
-(defun mastodon-toot--company-build-candidates (query list-fun make-fun)
-  "Build a list of completion candidates for a company backend.
-QUERY is the search prefix, LIST-FUN builds a list of items to
-match against, and MAKE-FUN builds the actual cadidate list item
-for display by company."
-  (let ((query (substring query 1)) ; remove @ or # for search
-        (res))
-    (dolist (item (funcall list-fun query))
-      (when (or (string-prefix-p query (substring (cadr item) 1) t)
-                (string-prefix-p query (car item) t))
-        (push (funcall make-fun item) res)))
-    res))
-
-(defun mastodon-toot--mentions-company-candidates (query)
-  "Given a company QUERY, build a list of candidates.
-The query can match both user handles and display names."
-  (mastodon-toot--company-build-candidates
-   query
-   'mastodon-search--search-accounts-query
-   'mastodon-toot--mentions-company-make-candidate))
-
-(defun mastodon-toot--tags-company-candidates (query)
-  "Given a company QUERY, build a list of candidates.
-The query is matched against a tag search on the server."
-  (mastodon-toot--company-build-candidates
-   query
-   'mastodon-search--search-tags-query
-   'mastodon-toot--tags-company-make-candidate))
-
-(defun mastodon-toot--make-company-backend
-    (command _backend-name str-prefix candidates-fun annot-fun meta-fun
-             &optional arg
-             &rest ignored)
-  "Make a company backend for `mastodon-toot-mode'.
-COMMAND, ARG, IGNORED are all company backend args.
-COMMAND is either prefix, to fetch a prefix query, candidates, to
-build a list of candidates with query ARG, annotation, to format
-an annotation for candidate ARG, or meta, to format meta info for
-candidate ARG. IGNORED remains a mystery.
-
-BACKEND-NAME is the backend's name, STR-PREFIX is used to search
-for matches, CANDIDATES-FUN, ANNOT-FUN, and META-FUN are
-functions called on ARG to generate formatted candidates, annotation, and
-meta fields respectively."
-  (interactive (list 'interactive))
-  (let ((handle-before
-         ;; hack to handle @handles@with.domains, as "@" is a word/symbol boundary
-         (if (string= str-prefix "@")
-             (save-match-data
-               (save-excursion
-                 (re-search-backward mastodon-toot-handle-regex nil :no-error)
-                 (if (match-string-no-properties 2)
-                     ;; match full handle inc. domain (see the regex for subexp 2)
-                     (buffer-substring-no-properties (match-beginning 2) (match-end 2))
-                   ""))))))
-    (cl-case command
-      (interactive (company-begin-backend (quote backend-name)))
-      (prefix (when (and (bound-and-true-p mastodon-toot-mode) ; if masto toot minor mode
-                         (save-excursion
-                           (forward-whitespace -1)
-                           (forward-whitespace 1)
-                           (looking-at str-prefix)))
-                (if (and (string= str-prefix "@")
-                         (> (length handle-before) 1)) ; more than just @
-                    (concat str-prefix (substring-no-properties handle-before 1)) ;handle
-                  (concat str-prefix (company-grab-symbol))))) ; tag
-      (candidates (funcall candidates-fun arg))
-      (annotation (funcall annot-fun arg))
-      (meta (funcall meta-fun arg)))))
-
 (defun mastodon-toot--get-bounds (regex)
   "Get bounds of tag or handle before point."
   ;; needed because # and @ are not part of any existing thing at point
@@ -1002,38 +897,6 @@ meta fields respectively."
   ;;or make it an alist and use cdr
   (caadr (assoc candidate mastodon-toot-completions)))
 
-(defun mastodon-toot-mentions (command &optional arg &rest ignored)
-  "A company completion backend for toot mentions.
-COMMAND is either prefix, to fetch a prefix query, candidates, to
-build a list of candidates with query ARG, annotation, to format
-an annotation for candidate ARG, or meta, to format meta info for
-candidate ARG. IGNORED remains a mystery."
-  (mastodon-toot--make-company-backend
-   command
-   'mastodon-toot-mentions
-   "@"
-   'mastodon-toot--mentions-company-candidates
-   'mastodon-toot--mentions-company-annotation
-   'mastodon-toot--mentions-company-meta
-   arg
-   ignored))
-
-(defun mastodon-toot-tags (command &optional arg &rest ignored)
-  "A company completion backend for toot tags.
-COMMAND is either prefix, to fetch a prefix query, candidates, to
-build a list of candidates with query ARG, annotation, to format
-an annotation for candidate ARG, or meta, to format meta info for
-candidate ARG. IGNORED remains a mystery."
-  (mastodon-toot--make-company-backend
-   command
-   'mastodon-toot-tags
-   "#"
-   'mastodon-toot--tags-company-candidates
-   'mastodon-toot--mentions-company-annotation
-   'mastodon-toot--mentions-company-meta
-   arg
-   ignored))
-
 (defun mastodon-toot--reply ()
   "Reply to toot at `point'.
 Customize `mastodon-toot-display-orig-in-reply-buffer' to display
@@ -1566,21 +1429,18 @@ a draft into the buffer."
       (mastodon-toot--get-max-toot-chars))
     ;; set up completion:
     (when mastodon-toot--enable-completion
-      (if (not mastodon-toot--use-company-for-completion)
-          ;; capf
-          (progn
-            (set ; (setq-local
-             (make-local-variable 'completion-at-point-functions)
-             (add-to-list
-              'completion-at-point-functions
-              #'mastodon-toot--mentions-capf))
-            (add-to-list
-             'completion-at-point-functions
-             #'mastodon-toot--tags-capf))
-        ;; company
+      (set ; (setq-local
+       (make-local-variable 'completion-at-point-functions)
+       (add-to-list
+        'completion-at-point-functions
+        #'mastodon-toot--mentions-capf))
+      (add-to-list
+       'completion-at-point-functions
+       #'mastodon-toot--tags-capf)
+      ;; company
+      (when mastodon-toot--use-company-for-completion
         (set (make-local-variable 'company-backends)
-             (add-to-list 'company-backends 'mastodon-toot-mentions))
-        (add-to-list 'company-backends 'mastodon-toot-tags)
+             (add-to-list 'company-backends 'company-capf))
         (company-mode-on)))
     ;; after-change:
     (make-local-variable 'after-change-functions)
-- 
cgit v1.2.3


From d1242bec43a65a8e7f53a53c1a38cbb4816533f3 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 17:06:54 +0100
Subject: capf readme

---
 README.org | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.org b/README.org
index bacab59..06473f4 100644
--- a/README.org
+++ b/README.org
@@ -189,9 +189,7 @@ Pops a new buffer/window in =mastodon-toot= minor mode. Enter the
 contents of your toot here. =C-c C-c= sends the toot. =C-c C-k= cancels.
 Both actions kill the buffer and window.
 
-Autocompletion of mentions and tags is provided by mastodon company backends
-(requires =company-mode= and =mastodon-toot--enable-completion= must be set to =t=)
-. Type =@= or =#= followed by two or more characters for candidates to appear.
+Autocompletion of mentions and tags is provided by =completion-at-point-functions= (capf) backends. =mastodon-toot--enable-completion= is enabled by default. If you want to enable =company-mode= in the toot compose buffer, set =mastodon-toot--use-company-for-completion= to =t=. (=mastodon.el= used to run its own native company backends, but these have been removed in favour of capfs.)
 
 Replies preserve visibility status/content warnings, and include boosters by default.
 
@@ -312,7 +310,6 @@ Hard dependencies (should all install with =mastodon.el=):
 - =ts= for poll relative expiry times
 
 Optional dependencies:
-- =company= for autocompletion of mentions and tags when composing a toot
 - =emojify= for inserting and viewing emojis
 - =mpv= and =mpv.el= for viewing videos and gifs
 - =lingva.el= for translating toots
-- 
cgit v1.2.3


From 28b73ab054b15de2cdc4943dea125431c1866a5b Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Fri, 25 Nov 2022 17:12:18 +0100
Subject: move mastodon-toot-completions to top of file

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

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 1e364df..59a3813 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -188,6 +188,9 @@ Takes its form from `window-configuration-to-register'.")
 (defvar mastodon-toot--max-toot-chars nil
   "The maximum allowed characters count for a single toot.")
 
+(defvar-local mastodon-toot-completions nil
+  "The data of completion candidates for the current completion at point.")
+
 (defvar mastodon-toot-current-toot-text nil
   "The text of the toot being composed.")
 
@@ -885,9 +888,6 @@ eg. \"feduser@fed.social\" -> \"feduser@fed.social\"."
               (concat " "
                       (mastodon-toot--tags-annotation-fun candidate)))))))
 
-(defvar-local mastodon-toot-completions nil
-  "The data of completion candidates for the current completion at point.")
-
 (defun mastodon-toot--mentions-annotation-fun (candidate)
   "Given a handle completion CANDIDATE, return its annotation string, a username."
   (caddr (assoc candidate mastodon-toot-completions)))
-- 
cgit v1.2.3