From 1bb072bb2d142c41b65d512466a637f19905b7a2 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Wed, 5 Apr 2023 13:10:40 +0200 Subject: remove stray multi-accounts code --- lisp/mastodon-views.el | 1 - 1 file changed, 1 deletion(-) diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el index 38344b3..de498f3 100644 --- a/lisp/mastodon-views.el +++ b/lisp/mastodon-views.el @@ -817,7 +817,6 @@ INSTANCE is the instance were are working with." (mastodon-views--print-json-keys response) ;; (mastodon-mode) ; breaks our 'q' binding that avoids leaving ;; split window - (setq mastodon-account--data account) (mastodon-tl--set-buffer-spec (buffer-name buf) "instance" nil) -- cgit v1.2.3 From 6b47afe3fbef88260c0bf14b44e367370684064e Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Wed, 5 Apr 2023 19:53:01 +0200 Subject: fix byline tests w horiz-bar. FIX #428. --- test/mastodon-tl-tests.el | 57 ++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el index a284c25..a3ac330 100644 --- a/test/mastodon-tl-tests.el +++ b/test/mastodon-tl-tests.el @@ -316,9 +316,10 @@ Strict-Transport-Security: max-age=31536000 (handle-location 20)) (should (string= (substring-no-properties byline) - "Account 42 (@acct42@example.space) 2999-99-99 00:11:22 - ------------ -")) + (concat "Account 42 (@acct42@example.space) 2999-99-99 00:11:22 + " + mastodon-tl--horiz-bar " +"))) (should (eq (get-text-property handle-location 'mastodon-tab-stop byline) 'user-handle)) (should (string= (get-text-property handle-location 'mastodon-handle byline) @@ -340,9 +341,10 @@ Strict-Transport-Security: max-age=31536000 (mastodon-tl--byline mastodon-tl-test-base-toot 'mastodon-tl--byline-author 'mastodon-tl--byline-boosted)) - "Account 42 (@acct42@example.space) 2999-99-99 00:11:22 - ------------ -"))))) + (concat "Account 42 (@acct42@example.space) 2999-99-99 00:11:22 + " + mastodon-tl--horiz-bar " +")))))) (ert-deftest mastodon-tl--byline-boosted () "Should format the boosted toot correctly." @@ -359,9 +361,10 @@ Strict-Transport-Security: max-age=31536000 (mastodon-tl--byline toot 'mastodon-tl--byline-author 'mastodon-tl--byline-boosted)) - "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22 - ------------ -"))))) + (concat "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22 + " + mastodon-tl--horiz-bar " +")))))) (ert-deftest mastodon-tl--byline-favorited () "Should format the favourited toot correctly." @@ -378,9 +381,10 @@ Strict-Transport-Security: max-age=31536000 (mastodon-tl--byline toot 'mastodon-tl--byline-author 'mastodon-tl--byline-boosted)) - "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22 - ------------ -"))))) + (concat "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22 + " + mastodon-tl--horiz-bar " +")))))) (ert-deftest mastodon-tl--byline-boosted/favorited () @@ -401,9 +405,10 @@ Strict-Transport-Security: max-age=31536000 (mastodon-tl--byline toot 'mastodon-tl--byline-author 'mastodon-tl--byline-boosted)) - "(?) (?) Account 42 (@acct42@example.space) 2999-99-99 00:11:22 - ------------ -"))))) + (concat "(?) (?) Account 42 (@acct42@example.space) 2999-99-99 00:11:22 + " + mastodon-tl--horiz-bar " +")))))) (ert-deftest mastodon-tl--byline-reblogged () "Should format the reblogged toot correctly." @@ -427,10 +432,10 @@ Strict-Transport-Security: max-age=31536000 (handle1-location 20) (handle2-location 65)) (should (string= (substring-no-properties byline) - "Account 42 (@acct42@example.space) + (concat "Account 42 (@acct42@example.space) Boosted Account 43 (@acct43@example.space) original time - ------------ -")) + " mastodon-tl--horiz-bar " +"))) (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline) 'user-handle)) (should (equal (get-text-property handle1-location 'help-echo byline) @@ -461,10 +466,10 @@ Strict-Transport-Security: max-age=31536000 (mastodon-tl--byline toot 'mastodon-tl--byline-author 'mastodon-tl--byline-boosted)) - "Account 42 (@acct42@example.space) + (concat "Account 42 (@acct42@example.space) Boosted Account 43 (@acct43@example.space) original time - ------------ -"))))) + " mastodon-tl--horiz-bar " +")))))) (ert-deftest mastodon-tl--byline-reblogged-boosted/favorited () "Should format the reblogged toot that was also boosted & favoritedcorrectly." @@ -490,10 +495,10 @@ Strict-Transport-Security: max-age=31536000 (mastodon-tl--byline toot 'mastodon-tl--byline-author 'mastodon-tl--byline-boosted)) - "(?) (?) Account 42 (@acct42@example.space) + (concat "(?) (?) Account 42 (@acct42@example.space) Boosted Account 43 (@acct43@example.space) original time - ------------ -"))))) + " mastodon-tl--horiz-bar " +")))))) (ert-deftest mastodon-tl--byline-timestamp-has-relative-display () "Should display the timestamp with a relative time." @@ -829,8 +834,8 @@ Strict-Transport-Security: max-age=31536000 (defun tl-tests--property-values-at (property ranges) "Returns a list with property values at the given ranges. - The property value for PROPERTY within a region is assumed to be - constant." + The property value for PROPERTY within a region is assumed to be + constant." (let (result) (dolist (range ranges (nreverse result)) (push (get-text-property (car range) property) result)))) -- cgit v1.2.3 From 319560d2ba769ae43e8a5a19cd3cdfb2d3daf5f0 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Fri, 7 Apr 2023 10:48:58 +0200 Subject: info update --- mastodon.info | 47 +++++++++++++++++++++++++---------------------- mastodon.texi | 12 ++++++++---- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/mastodon.info b/mastodon.info index b1b679c..6d8ba6d 100644 --- a/mastodon.info +++ b/mastodon.info @@ -211,7 +211,7 @@ your ‘mastodon-token-file’ does not contain ‘:client_id’ and 1. Keybindings Key Action - ----------------------------------------------------------------------------------------------------- + ----------------------------------------------------------------------------------------------------------- *Help* ‘?’ Show discover menu of all bindings, if ‘discover’ is available *Timeline actions* @@ -219,9 +219,9 @@ your ‘mastodon-token-file’ does not contain ‘:client_id’ and ‘p’ Go to previous item (toot, notification, user) ‘M-n=/=’ Go to the next interesting thing that has an action ‘M-p=/=’ Go to the previous interesting thing that has an action - ‘F’ Open federated timeline - ‘H’ Open home timeline - ‘L’ Open local timeline + ‘F’ Open federated timeline (1 prefix arg: hide-replies, 2 prefix args: media only) + ‘H’ Open home timeline (1 prefix arg: hide-replies) + ‘L’ Open local timeline (1 prefix arg: hide-replies, 2 prefix args: media only) ‘N’ Open notifications timeline ‘@’ Open mentions-only notifications timeline ‘u’ Update current timeline @@ -233,6 +233,7 @@ your ‘mastodon-token-file’ does not contain ‘:client_id’ and ‘U’ update your profile bio note ‘;’ view instance description for toot at point ‘:’ view followed tags and load a tag timeline + ‘C-:’ view timeline of all followed tags ‘,’ view favouriters of toot at point ‘.’ view boosters of toot at point ‘/’ switch between mastodon buffers @@ -365,6 +366,8 @@ and should work without first loading ‘mastodon.el’: instance. • ‘mastodon-search--trending-tags’: View a list of trending hashtags on your instance. + • ‘mastodon-search--trending-statuses’: View a list of trending + statuses on your instance. • ‘mastodon-tl--add-toot-account-at-point-to-list’: Add the account of the toot at point to a list. @@ -636,24 +639,24 @@ Node: Usage3098 Node: Logging in to your instance3508 Node: Timelines4505 Ref: Keybindings4980 -Ref: Toot byline legend9253 -Node: Composing toots9525 -Ref: Keybindings (1)11102 -Ref: Draft toots11620 -Node: Other commands and account settings12091 -Node: Customization14914 -Node: Alternative timeline layout15700 -Node: Live-updating timelines mastodon-async-mode16077 -Node: Translating toots16913 -Node: bookmarks and mastodonel18085 -Node: Dependencies18555 -Node: Network compatibility19147 -Node: Contributing19633 -Node: Bug reports19922 -Node: Fixes and features20828 -Node: Coding style21311 -Node: Supporting mastodonel21935 -Node: Contributors22465 +Ref: Toot byline legend9469 +Node: Composing toots9741 +Ref: Keybindings (1)11318 +Ref: Draft toots11836 +Node: Other commands and account settings12307 +Node: Customization15235 +Node: Alternative timeline layout16021 +Node: Live-updating timelines mastodon-async-mode16398 +Node: Translating toots17234 +Node: bookmarks and mastodonel18406 +Node: Dependencies18876 +Node: Network compatibility19468 +Node: Contributing19954 +Node: Bug reports20243 +Node: Fixes and features21149 +Node: Coding style21632 +Node: Supporting mastodonel22256 +Node: Contributors22786  End Tag Table diff --git a/mastodon.texi b/mastodon.texi index 577f133..dee530f 100644 --- a/mastodon.texi +++ b/mastodon.texi @@ -214,7 +214,7 @@ not contain @samp{:client_id} and @samp{:client_secret}. @anchor{Keybindings}Keybindings -@multitable {aaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} +@multitable {aaaaaaaaaaaaaaaaaaaaaa} {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa} @headitem Key @tab Action @item @@ -232,11 +232,11 @@ not contain @samp{:client_id} and @samp{:client_secret}. @item @samp{M-p=/=} @tab Go to the previous interesting thing that has an action @item @samp{F} -@tab Open federated timeline +@tab Open federated timeline (1 prefix arg: hide-replies, 2 prefix args: media only) @item @samp{H} -@tab Open home timeline +@tab Open home timeline (1 prefix arg: hide-replies) @item @samp{L} -@tab Open local timeline +@tab Open local timeline (1 prefix arg: hide-replies, 2 prefix args: media only) @item @samp{N} @tab Open notifications timeline @item @samp{@@} @@ -259,6 +259,8 @@ not contain @samp{:client_id} and @samp{:client_secret}. @tab view instance description for toot at point @item @samp{:} @tab view followed tags and load a tag timeline +@item @samp{C-:} +@tab view timeline of all followed tags @item @samp{,} @tab view favouriters of toot at point @item @samp{.} @@ -457,6 +459,8 @@ that the author of the toot at point is on. @item @samp{mastodon-search--trending-tags}: View a list of trending hashtags on your instance. +@item +@samp{mastodon-search--trending-statuses}: View a list of trending statuses on your instance. @end itemize -- cgit v1.2.3 From 9397615be63d35cdfb3b46c919cd1573478a2e50 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Tue, 11 Apr 2023 12:53:14 +0200 Subject: readme byline legend update symbols --- README.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.org b/README.org index bcc08e8..575a920 100644 --- a/README.org +++ b/README.org @@ -188,8 +188,8 @@ not contain =:client_id= and =:client_secret=. |---------------+------------------------| | Marker | Meaning | |---------------+------------------------| -| =(B)= | I boosted this toot | -| =(F)= | I favourited this toot | +| =(🔁)= (or =(B)=) | I boosted this toot | +| =(⭐)= (or =(F)=) | I favourited this toot | | =(🔖)= (or (=K=)) | I bookmarked this toot | |---------------+------------------------| -- cgit v1.2.3 From b6e07b0a9559fb4fb9dcdeed1057085ed7a650eb Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Tue, 11 Apr 2023 15:40:09 +0200 Subject: add some-followed-tags-timeline --- lisp/mastodon-tl.el | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 794b198..e90be9a 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -414,7 +414,9 @@ With a double PREFIX arg, limit results to your own instance." (let ((list (mastodon-http--build-array-params-alist "any[]" (cdr tag)))) (while list (push (pop list) params)))) - (mastodon-tl--init (concat "tag-" (if (listp tag) "followed-tags" tag)) + (mastodon-tl--init (if (listp tag) + "tags-multiple" + (concat "tag-" tag)) (concat "timelines/tag/" (if (listp tag) ;; endpoint needs to be /tag/:sometag (car tag) tag)) @@ -2093,6 +2095,16 @@ Prefix is sent to `mastodon-tl--show-tag-timeline', which see." (tags (mastodon-tl--map-alist 'name followed-tags-json))) (mastodon-tl--show-tag-timeline prefix tags))) +(defun mastodon-tl--some-followed-tags-timeline (&optional prefix) + "Prompt for some tags, and open a timeline for them. +The suggestions are from followed tags, but any other tags are also allowed." + (interactive "p") + (let* ((followed-tags-json (mastodon-tl--followed-tags)) + (tags (mastodon-tl--map-alist 'name followed-tags-json)) + (selection (completing-read-multiple + "Tags' timelines to view [TAB to view, comma to separate]: " + tags))) + (mastodon-tl--show-tag-timeline prefix selection))) ;;; UPDATING, etc. -- cgit v1.2.3 From 38f92955166a9780731eda8107b6e369cc434c88 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Tue, 11 Apr 2023 15:41:14 +0200 Subject: readme tags timeline funs --- README.org | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.org b/README.org index 575a920..c168401 100644 --- a/README.org +++ b/README.org @@ -280,6 +280,8 @@ work without first loading =mastodon.el=: - =mastodon-tl--follow-tag=: Follow a tag (works like following a user) - =mastodon-tl--unfollow-tag=: Unfollow a tag - =mastodon-tl--list-followed-tags=: View a list of tags you're following. +- =mastodon-tl--followed-tags-timeline=: View a timeline of all your followed tags. +- =mastodon-tl--some-followed-tags-timleine=: View a timeline of multiple tags, from your followed tags or any other. - =mastodon-switch-to-buffer=: switch between mastodon buffers. -- cgit v1.2.3 From e54deed13f3ccf3dc14d9a77417ee0688dc30987 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Wed, 12 Apr 2023 10:05:02 +0200 Subject: discover typo --- lisp/mastodon-discover.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el index c06de1f..57c4bd1 100644 --- a/lisp/mastodon-discover.el +++ b/lisp/mastodon-discover.el @@ -79,7 +79,7 @@ ("Views" ("h/?" "View mode help/keybindings" describe-mode) ("#" "Tag search" mastodon-tl--get-tag-timeline) - (";" "List followed tags" mastodon-tl--list-followed-tags) + (":" "List followed tags" mastodon-tl--list-followed-tags) ("F" "Federated" mastodon-tl--get-federated-timeline) ("H" "Home" mastodon-tl--get-home-timeline) ("L" "Local" mastodon-tl--get-local-timeline) -- cgit v1.2.3