diff options
author | Sacha Chua <sacha@sachachua.com> | 2022-11-06 15:13:44 -0500 |
---|---|---|
committer | Sacha Chua <sacha@sachachua.com> | 2022-11-06 15:14:03 -0500 |
commit | 9dd9e9bd8876bab7bdae91ef560deb3a74411544 (patch) | |
tree | 2e6e2031d1bde31cb73ea4bf3f56020849fb6d0b /emacsconf-erc.el | |
parent | 40a1f6de23fddf6f5515dcad93193ea3a4528aed (diff) | |
parent | 1d117af1a18a5aeeb8d6f4e4daf7ed5def0c6385 (diff) | |
download | emacsconf-el-9dd9e9bd8876bab7bdae91ef560deb3a74411544.tar.xz emacsconf-el-9dd9e9bd8876bab7bdae91ef560deb3a74411544.zip |
Merge branch 'main' of git.emacsconf.org:pub/emacsconf-el into main
Diffstat (limited to '')
-rw-r--r-- | emacsconf-erc.el | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/emacsconf-erc.el b/emacsconf-erc.el index 5791987..6c9a742 100644 --- a/emacsconf-erc.el +++ b/emacsconf-erc.el @@ -247,15 +247,7 @@ If MESSAGE is not specified, reset the topic to the template." ;;; For todo hooks -(defun emacsconf-erc-add-to-todo-hook () - (interactive) - (emacsconf-add-org-after-todo-state-change-hook #'emacsconf-erc-org-after-todo-state-change)) - -(defun emacsconf-erc-remove-from-todo-hook () - (interactive) - (emacsconf-remove-org-after-todo-state-change-hook #'emacsconf-erc-org-after-todo-state-change)) - -(defun emacsconf-erc-org-after-todo-state-change () +(defun emacsconf-erc-announce-on-change (talk) "Announce talk." (let ((func (pcase org-state @@ -265,7 +257,7 @@ If MESSAGE is not specified, reset the topic to the template." ("UNSTREAMED_Q" #'erc-cmd-NOWUNSTREAMEDQ) ("TO_ARCHIVE" #'erc-cmd-NOWDONE)))) (when func - (funcall func (emacsconf-get-talk-info-for-subtree))))) + (funcall func talk)))) ;;; Change TODO states (defun erc-cmd-MARKPLAYING (talk) @@ -324,7 +316,7 @@ If MESSAGE is not specified, reset the topic to the template." (defun erc-cmd-BROADCAST (&rest message) "Say MESSAGE in all the emacsconference channels." (emacsconf-erc-with-channels (mapcar 'car emacsconf-topic-templates) - (erc-send-message (s-join " " message)))) + (erc-send-message (string-join message " ")))) (defun erc-cmd-JUMP (talk) (emacsconf-go-to-talk talk)) @@ -444,7 +436,7 @@ ${video-description} "Go to TALK and store NOTES in the :LOGBOOK:. Usage: /conflog keyword notes go here" (save-window-excursion - (emacsconf-with-talk-heading talk (emacsconf-org-log-note (s-join " " notes))))) + (emacsconf-with-talk-heading talk (emacsconf-org-log-note (string-join notes " "))))) (defun erc-cmd-GIT (&optional location) (if (string= location "conf") |