From 3391612bdeb63f602bdccdc086babbd095df27c3 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Wed, 20 Sep 2023 09:44:43 -0400
Subject: add conference as a scheduling phase

---
 emacsconf.el | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'emacsconf.el')

diff --git a/emacsconf.el b/emacsconf.el
index f506626..5f054ec 100644
--- a/emacsconf.el
+++ b/emacsconf.el
@@ -61,15 +61,17 @@
 (defcustom emacsconf-base-url "https://emacsconf.org/" "Includes trailing slash"
   :group 'emacsconf
   :type 'string)
-(defcustom emacsconf-publishing-phase 'resources
+(defcustom emacsconf-publishing-phase 'program
   "Controls what information to include.
 'program - don't include times
 'schedule - include times; use this leading up to the emacsconference
 'resources - after EmacsConf, don't need status"
   :group 'emacsconf
   :type '(choice
+          (const :tag "CFP: include invitation" cfp)
           (const :tag "Program: Don't include times" program)
           (const :tag "Schedule: Include detailed times" schedule)
+					(const :tag "Conference: Show IRC and watching info" conference)
           (const :tag "Resources: Don't include status" resources)))
 
 (defcustom emacsconf-org-file nil
@@ -415,6 +417,7 @@ If INFO is specified, limit it to that list."
                        (:pronouns "PRONOUNS")
 											 (:date-submitted "DATE_SUBMITTED")
 											 (:date-to-notify "DATE_TO_NOTIFY")
+											 (:email-notes "EMAIL_NOTES")
                        ;; Scheduling
                        (:scheduled "SCHEDULED")
                        (:time "TIME")
@@ -683,11 +686,15 @@ If INFO is specified, limit it to that list."
   (let ((track (emacsconf-get-track (plist-get o :track))))
     (when track
       (plist-put o :watch-url (concat emacsconf-base-url emacsconf-year "/watch/" (plist-get track :id)))
-      (plist-put o :webchat-url (concat emacsconf-chat-base "?join=emacsconf,"
-                                        (replace-regexp-in-string "#" ""
-                                                                  (plist-get track :channel))))
+      (plist-put o :webchat-url
+								 (concat emacsconf-chat-base "?join=emacsconf"
+												 (if (eq emacsconf-publishing-phase 'conference)
+														 (concat ","
+																		 (replace-regexp-in-string "#" ""
+																															 (plist-get track :channel)))
+													 "")))
 			(plist-put o :track-id (plist-get track :id))) 
-		(plist-put o :channel (plist-get track :channel))
+		(plist-put o :channel (if (eq emacsconf-publishing-phase 'conference) (plist-get track :channel) "emacsconf"))
     (plist-put o :bbb-backstage (concat emacsconf-media-base-url emacsconf-year "/backstage/current/room/" (plist-get o :slug)))
     (cond
      ((string= (or (plist-get o :q-and-a) "") "")
@@ -922,6 +929,7 @@ If INFO is specified, limit it to that list."
     "u" #'emacsconf-update-talk
     "t" #'emacsconf-insert-talk-title
     "m" #'emacsconf-mail-speaker-from-slug
+    "M" #'emacsconf-mail-insert-info
     "n" #'emacsconf-mail-notmuch-search-for-talk
     "f" #'org-forward-heading-same-level
     "b" #'org-backward-heading-same-level
-- 
cgit v1.2.3