diff options
| author | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2023-03-18 18:22:48 +0100 |
|---|---|---|
| committer | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2023-03-18 18:22:48 +0100 |
| commit | 7fd37350a8a565a71b326462ff5026f729310b67 (patch) | |
| tree | 608df5c686447e846265ab91317d41892bc7cf00 /lisp/mastodon-toot.el | |
| parent | 9c449bd25d196a9545cbe22ba664a35a6df98224 (diff) | |
| parent | dc1149ae594f44944d6807001dd2765ff1766d71 (diff) | |
Merge branch 'views' into develop
Diffstat (limited to 'lisp/mastodon-toot.el')
| -rw-r--r-- | lisp/mastodon-toot.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el index f6f7945..3dc6522 100644 --- a/lisp/mastodon-toot.el +++ b/lisp/mastodon-toot.el @@ -78,8 +78,8 @@ (autoload 'mastodon-http--build-array-params-alist "mastodon-http") (autoload 'mastodon-http--put "mastodon-http") (autoload 'mastodon-tl--symbol "mastodon-tl") -(autoload 'mastodon-tl--view-scheduled-toots "mastodon-tl") -(autoload 'mastodon-tl--cancel-scheduled-toot "mastodon-toot") +(autoload 'mastodon-views--view-scheduled-toots "mastodon-views") +(autoload 'mastodon-views--cancel-scheduled-toot "mastodon-views") (autoload 'org-read-date "org") (autoload 'iso8601-parse "iso8601") (autoload 'mastodon-tl--buffer-type-eq "mastodon-tl") @@ -805,7 +805,7 @@ instance to edit a toot." (message "Toot toot!")) ;; cancel scheduled toot if we were editing it: (when scheduled-id - (mastodon-tl--cancel-scheduled-toot + (mastodon-views--cancel-scheduled-toot scheduled-id :no-confirm)) (mastodon-toot--restore-previous-window-config prev-window-config)))))))) @@ -1234,8 +1234,9 @@ With RESCHEDULE, reschedule the scheduled toot at point without editing." (interactive) (cond ((mastodon-tl--buffer-type-eq 'edit-toot) (message "You can't schedule toots you're editing.")) - ((not (mastodon-tl--buffer-type-eq 'new-toot)) - (message "You can only schedule toots from the compose toot buffer.")) + ((not (or (mastodon-tl--buffer-type-eq 'new-toot) + (mastodon-tl--buffer-type-eq 'scheduled-statuses))) + (message "You can only schedule toots from the compose toot buffer or the scheduled toots view.")) (t (let* ((id (when reschedule (get-text-property (point) 'id))) (ts (when reschedule @@ -1262,7 +1263,7 @@ With RESCHEDULE, reschedule the scheduled toot at point without editing." (mastodon-http--triage response (lambda () ;; reschedule means we are in scheduled toots view: - (mastodon-tl--view-scheduled-toots) + (mastodon-views--view-scheduled-toots) (message (format "Toot rescheduled for %s." msg-str)))))))))) |