From d18f86a0e21b17eb67685c4c0500819e864d4427 Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus@riseup.net>
Date: Wed, 14 Aug 2024 13:56:24 +0200
Subject: clean up filters code
---
lisp/mastodon-views.el | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el
index 160de47..0d0277e 100644
--- a/lisp/mastodon-views.el
+++ b/lisp/mastodon-views.el
@@ -594,17 +594,32 @@ NO-CONFIRM means there is no ask or message, there is only do."
JSON is what is returned by by the server."
(mastodon-views--minor-view
"filters"
- #'mastodon-views--insert-filter-string-set
+ #'mastodon-views--insert-filters
json))
-(defun mastodon-views--insert-filter-string-set (json)
+(defun mastodon-views--insert-filters (json)
"Insert a filter string plus a blank line.
JSON is the filters data."
- (mapc #'mastodon-views--insert-filter-string json))
-
-(defun mastodon-views--insert-filter-string (filter)
+ (mapc #'mastodon-views--insert-filter json))
+
+(defun mastodon-views--insert-filter-kws (kws)
+ "Insert filter keywords KWS."
+ (mapc (lambda (kw)
+ (let ((whole (alist-get 'whole_word kw)))
+ (insert
+ (propertize (concat
+ (format "\n %s \"%s\" | whole word: %s"
+ (if (char-displayable-p ?―) "―" "-")
+ (alist-get 'keyword kw)
+ whole))
+ 'kw-id (alist-get 'id kw)
+ 'whole-word whole))))
+ kws))
+
+(defun mastodon-views--insert-filter (filter)
"Insert a single FILTER."
(let-alist filter
+ ;; heading:
(insert
(mastodon-tl--set-face
(concat "\n " mastodon-tl--horiz-bar "\n "
@@ -616,18 +631,16 @@ JSON is the filters data."
" " "\n"
" " mastodon-tl--horiz-bar "\n")
'success))
+ ;; context:
(insert "Context: "
(mapconcat #'identity .context ", "))
+ ;; type (warn or hide):
(insert "\n\nType: " .filter_action)
+ ;; terms list:
(if (not .keywords)
""
(insert "\n\nTerms:")
- (mapc (lambda (kw)
- (insert
- (concat (format "\n %s \"%s\""
- (if (char-displayable-p ?―) "―" "-")
- (alist-get 'keyword kw)))))
- .keywords))
+ (mastodon-views--insert-filter-kws \.keywords))
(insert "\n")))
(defvar mastodon-views--filter-types
@@ -677,7 +690,7 @@ Prompt for a context, must be a list containting at least one of \"home\",
(interactive)
(let* ((id (mastodon-tl--property 'item-id :no-move))
(title (mastodon-tl--property 'filter-title :no-move))
- (url (mastodon-http--api (format "filters/%s" id) "v2")))
+ (url (mastodon-http--api-v2 (format "filters/%s" id))))
(if (null id)
(user-error "No filter at point?")
(when (y-or-n-p (format "Delete filter %s? " title))
--
cgit v1.2.3