From 0fc64df90d9cb8ccb6b1968e0dc36ece6c9b639c Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Sat, 14 Oct 2023 20:18:38 +0200 Subject: fix minor-view disaster disastrously: put it all init-sync --- lisp/mastodon-tl.el | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'lisp/mastodon-tl.el') diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index d5d127d..47824c0 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -2656,8 +2656,9 @@ JSON and http headers, without it just the JSON." link-header update-params hide-replies) (mastodon-tl--do-init json update-function)))))) -(defun mastodon-tl--init-sync (buffer-name endpoint update-function - &optional note-type params headers) +(defun mastodon-tl--init-sync + (buffer-name endpoint update-function + &optional note-type params headers view-name binding-str) "Initialize BUFFER-NAME with timeline targeted by ENDPOINT. UPDATE-FUNCTION is used to receive more toots. Runs synchronously. @@ -2676,7 +2677,15 @@ Optional arg NOTE-TYPE means only get that type of note." (headers (if headers (cdr response) nil)) (link-header (mastodon-tl--get-link-header-from-response headers))) (with-mastodon-buffer buffer #'mastodon-mode nil - (mastodon-tl--set-buffer-spec buffer endpoint update-function link-header params) + ;; insert view-name/ heading-str + (when view-name + (mastodon-search--insert-heading view-name)) + (when binding-str + (insert (mastodon-tl--set-face (concat "[" binding-str "]\n\n") + 'font-lock-comment-face))) + + (mastodon-tl--set-buffer-spec buffer endpoint update-function + link-header params) (mastodon-tl--do-init json update-function) buffer))) -- cgit v1.2.3 From a672c056a8dfb17f9513933189e2786c42542398 Mon Sep 17 00:00:00 2001 From: marty hiatt Date: Sat, 14 Oct 2023 19:55:22 +0200 Subject: fix init-sync for notifs-get compat with link-header/get-response --- lisp/mastodon-tl.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lisp/mastodon-tl.el') diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 47824c0..0c4f8af 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -2673,9 +2673,10 @@ Optional arg NOTE-TYPE means only get that type of note." (url (mastodon-http--api endpoint)) (buffer (concat "*mastodon-" buffer-name "*")) (response (mastodon-http--get-response url params)) - (json (if headers (car response) response)) - (headers (if headers (cdr response) nil)) - (link-header (mastodon-tl--get-link-header-from-response headers))) + (json (car response)) + (headers (when headers (cdr response))) + (link-header (when headers + (mastodon-tl--get-link-header-from-response headers)))) (with-mastodon-buffer buffer #'mastodon-mode nil ;; insert view-name/ heading-str (when view-name @@ -2683,7 +2684,6 @@ Optional arg NOTE-TYPE means only get that type of note." (when binding-str (insert (mastodon-tl--set-face (concat "[" binding-str "]\n\n") 'font-lock-comment-face))) - (mastodon-tl--set-buffer-spec buffer endpoint update-function link-header params) (mastodon-tl--do-init json update-function) -- cgit v1.2.3