diff options
| -rw-r--r-- | lisp/mastodon-search.el | 21 | ||||
| -rw-r--r-- | lisp/mastodon-tl.el | 25 |
2 files changed, 25 insertions, 21 deletions
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el index 4d1a2d3..c7658ba 100644 --- a/lisp/mastodon-search.el +++ b/lisp/mastodon-search.el @@ -77,27 +77,6 @@ QUERY is the string to search." (tags (alist-get 'hashtags response))) (mapcar #'mastodon-search--get-hashtag-info tags))) -(defun mastodon-search--url-lookup (&optional query-url) - "Do a WebFinger lookup for QUERY-URL. -If a status or account is found, load it in `mastodon.el', if not, just browse the URL in the normal fashion." - (interactive) - (let* ((query (or query-url (url-get-url-at-point))) - (url (format "%s/api/v2/search" mastodon-instance-url)) - (param (concat "resolve=t")) ; webfinger - (response (mastodon-http--get-search-json url query param))) - (if (equal response '((accounts . #1=[]) (statuses . #1#) (hashtags . #1#))) - ;; no results - ;; browse URL here - () - (let ((statuses (assoc 'statuses response)) - (status-1 (seq-first (cdr statuses))) - (status-1-id (alist-get 'id status-1)) - (accounts (assoc 'accounts response))) - ;; TODO: test for a masto URL first? - (when status-1 - (mastodon-tl--single-toot status-1-id)))))) - - ;; trending tags (defun mastodon-search--trending-tags () diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 6a8b0ba..ccc092f 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -688,6 +688,31 @@ START and END are the boundaries of the link in the toot." 'help-echo help-echo) extra-properties)))) +(defun mastodon-tl--url-lookup (&optional query-url) + "Do a WebFinger lookup for QUERY-URL, or the URL at point. +If a status or account is found, load it in `mastodon.el', if +not, just browse the URL in the normal fashion." + (interactive) + (let* ((query (or query-url (url-get-url-at-point))) + (url (format "%s/api/v2/search" mastodon-instance-url)) + (param (concat "resolve=t")) ; webfinger + (response (mastodon-http--get-search-json url query param))) + (if (equal response '((accounts . #1=[]) (statuses . #1#) (hashtags . #1#))) + (shr-browse-url query-url) + (cond ((not (equal '[] + (alist-get 'statuses response))) + (let* ((statuses (assoc 'statuses response)) + (status (seq-first (cdr statuses))) + (status-id (alist-get 'id status))) + (mastodon-tl--thread status-id))) + ((not (equal '[] + (alist-get 'accounts response))) + (let* ((accounts (assoc 'accounts response)) + (account (seq-first (cdr accounts))) + (account-id (alist-get 'id account))) + (mastodon-profile--account-from-id account-id))))))) + + (defun mastodon-tl--extract-userid-toot (toot acct) "Extract a user id for an ACCT from mentions in a TOOT." (let* ((mentions (append (alist-get 'mentions toot) nil)) |