branch: elpa/mastodon commit c4bb842f466a38289a598c4fa2f255d44d49fa90 Merge: 53e5b80aff 8cf65d9d9e Author: marty hiatt <martianhia...@disroot.org> Commit: marty hiatt <martianhia...@disroot.org>
Merge branch 'snac-tag' into develop --- lisp/mastodon-tl.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index b1a5b90cdd..5c7b30c2ac 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -1162,11 +1162,14 @@ the toot)." (let* ((instance-host (url-host (url-generic-parse-url instance-url))) (parsed (url-generic-parse-url url)) - (path (url-filename parsed)) - (split (split-string path "/"))) - (when (and (string= instance-host (url-host parsed)) - (string-prefix-p "/tag" path)) ;; "/tag/" or "/tags/" - (nth 2 split)))) + (path (url-filename parsed))) + (when (string= instance-host (url-host parsed)) + (cond ((string-prefix-p "/tag" path) ;; "/tag/" or "/tags/" + (let ((split (split-string path "/"))) + (nth 2 split))) + ((string-prefix-p "?t=" path) ;; snac tag + (let ((split (split-string path "="))) + (nth 1 split))))))) (defun mastodon-tl--base-tags (tags body-tags) "Return a string of all tags not in BODY-TAGS, linkified.