Merge branch 'main' of git.emacsconf.org:pub/emacsconf-el into main

2 files changed, 5 insertions, 13 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")
diff --git a/emacsconf.el b/emacsconf.el
index 7ea24ef..4443f7e 100644
--- a/emacsconf.el
+++ b/emacsconf.el
@@ -1119,7 +1119,7 @@ Filter by TRACK if given.  Use INFO as the list of talks."
 (defvar emacsconf-todo-hooks
   '(emacsconf-stream-play-talk-on-change ;; play the talk
     emacsconf-stream-open-qa-windows-on-change
-    ;; emacsconf-erc-org-after-todo-state-change ;; announce via ERC
+    emacsconf-erc-announce-on-change ;; announce via ERC
     emacsconf-publish-media-files-on-change
     emacsconf-publish-bbb-redirect
     emacsconf-publish-backstage-org-on-state-change ;; update the backstage index