add more info

2 files changed, 52 insertions, 8 deletions

diff --git a/emacsconf-publish.el b/emacsconf-publish.el
index 8e42f79..711fa42 100644
--- a/emacsconf-publish.el
+++ b/emacsconf-publish.el
@@ -204,12 +204,6 @@
 				  (plist-get track :watch)
 				  "web-based player")
 			   "\n"
-         (emacsconf-surround "- Etherpad: " (plist-get talk :pad-url) "\n" "")
-         (emacsconf-surround "- Chat: "
-													   (org-link-make-string
-														  (plist-get talk :webchat-url)
-														  (concat "#" (plist-get talk :channel)))
-													   "\n" "")
          (emacsconf-surround "- Q&A: "
 													   (if (plist-get talk :qa-url)
 															   (org-make-link-string
@@ -217,6 +211,41 @@
 																  (plist-get talk :qa-info))
 														   (plist-get talk :qa-info))
 													   "\n" "")
+         (emacsconf-surround "- Etherpad: " (plist-get talk :pad-url) "\n" "")
+         (emacsconf-surround "  - Text version (no JS): " (plist-get talk :pad-url) "/export/txt\n" "")
+         (emacsconf-surround "  - HTML version (no JS): " (plist-get talk :pad-url) "/export/html\n" "")
+         (emacsconf-surround "- Chat: "
+													   (org-link-make-string
+														  (plist-get talk :webchat-url)
+														  (concat "#" (plist-get talk :channel)))
+													   "\n" "")
+         "- " (org-link-make-string
+               (plist-get talk :video-url)
+               (if (plist-get talk :video-time)
+
+                   "Talk recording (posted soon after the talk starts)"
+                 "Recording for live talk (posted in a week or two)")) "\n"
+         "- "
+         (org-link-make-string
+          (plist-get talk :captions-url)
+          (if (plist-get talk :video-time)
+              "Captions (posted soon after the talk starts)"
+            "Captions for live talk (posted in a week or two)"))
+         "\n"
+         "- Email for questions: "
+         (let ((email (or (plist-get talk :public-email)
+                          emacsconf-fallback-email)))
+           (org-link-make-string
+            (concat "mailto:"
+                    email
+                    "?body=&subject="
+                    (url-hexify-string
+                     (format "%s %s: %s"
+                             emacsconf-name
+                             emacsconf-year
+                             (plist-get talk :title))))
+            email))
+         "\n"
          (emacsconf-surround "\n" (plist-get talk :intro-note) "\n" "")
 			   (emacsconf-surround "\nDescription:\n\n"
 													   (when (plist-get talk :org-description)
@@ -686,7 +715,7 @@ ${alternate-apac-info}\n")))
 																 (and (string= (plist-get talk :public-email) "t")
 																			(plist-get talk :email))
 																 (plist-get talk :public-email)
-																 "emacsconf-org-private@gnu.org"))))
+																 emacsconf-fallback-email))))
 
 (defun emacsconf-publish-captions-in-wiki (talk)
   "Copy the captions file."
diff --git a/emacsconf.el b/emacsconf.el
index 3e9bdbd..d655d7c 100644
--- a/emacsconf.el
+++ b/emacsconf.el
@@ -103,6 +103,11 @@
   :type 'file
   :group 'emacsconf)
 
+(defcustom emacsconf-fallback-email "emacsconf-org-private@gnu.org"
+  "E-mail for public wiki pages if the speaker doesn't have a public email address."
+  :type 'string
+  :group 'emacsconf)
+
 (defcustom emacsconf-upcoming-file nil
   "Path to the Org file with upcoming talks."
   :type 'file
@@ -842,7 +847,8 @@ The subheading should match `emacsconf-abstract-heading-regexp'."
     emacsconf-add-timezone-conversions
     emacsconf-add-speakers-with-pronouns
     emacsconf-add-live-info
-		emacsconf-add-video-info)
+		emacsconf-add-video-info
+    emacsconf-add-media-info)
 	"Functions to collect information.")
 
 (defun emacsconf-add-speakers-with-pronouns (o)
@@ -901,6 +907,15 @@ The subheading should match `emacsconf-abstract-heading-regexp'."
 				(list "youtube" "qa-youtube" "toobnix" "qa-toobnix"))
 	o)
 
+(defun emacsconf-add-media-info (o)
+  (plist-put o
+             :video-url (format "%s%s/%s--main.webm" emacsconf-media-base-url emacsconf-year (plist-get o :file-prefix)))
+  (plist-put o
+             :captions-url (format "%s%s/%s--main.vtt" emacsconf-media-base-url emacsconf-year (plist-get o :file-prefix)))
+  (plist-put o
+             :audio-url (format "%s%s/%s--main.opus" emacsconf-media-base-url emacsconf-year (plist-get o :file-prefix)))
+  o)
+
 (defun emacsconf-add-live-info (o)
   (plist-put o :absolute-url (concat emacsconf-base-url (plist-get o :url)))
   (plist-put o :in-between-url (format "%s%s/in-between/%s.png"