update

Author: breadchris

client/src/rpc/chalgen/base_pb.ts

@@ -240,20 +240,30 @@ export class AudioPlayer extends Message$1<AudioPlayer> {
  */
 export class Song extends Message$1<Song> {
   /**
-   * @generated from field: string title = 1;
+   * @generated from field: string name = 1;
    */
-  title = "";
+  name = "";
 
   /**
    * @generated from field: string artist = 2;
    */
   artist = "";
 
   /**
-   * @generated from field: string url = 3;
+   * @generated from field: string album = 3;
+   */
+  album = "";
+
+  /**
+   * @generated from field: string url = 4;
    */
   url = "";
 
+  /**
+   * @generated from field: string cover_art_url = 5;
+   */
+  coverArtUrl = "";
+
   constructor(data?: PartialMessage<Song>) {
     super();
     proto3.util.initPartial(data, this);
@@ -262,9 +272,11 @@ export class Song extends Message$1<Song> {
   static readonly runtime: typeof proto3 = proto3;
   static readonly typeName = "chalgen.Song";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: "title", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "artist", kind: "scalar", T: 9 /* ScalarType.STRING */ },
-    { no: 3, name: "url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 3, name: "album", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 4, name: "url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 5, name: "cover_art_url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): Song {

pkg/chals/chals.go

@@ -198,6 +198,10 @@ func (s *Handler) Handle() (string, http.Handler) {
 				case *chalgen.Node_Base:
 					switch t := u.Base.Type.(type) {
 					case *chalgen.Challenge_Audioplayer:
+						t.Audioplayer.Songs = append(t.Audioplayer.Songs, &chalgen.Song{
+							Name:   n.Meta.Flag,
+							Artist: "flag",
+						})
 						templ.Handler(tmpl.Page(tmpl.AudioPlayer(t.Audioplayer))).ServeHTTP(w, r)
 						return
 					case *chalgen.Challenge_Data:

pkg/chals/tmpl/audioplayer.templ

@@ -6,9 +6,18 @@ import (
 
 type AudioPlayerState struct {
     BaseURL string
+    Songs  []Song
 }
 
-script Player() {
+type Song struct {
+    Name string
+    Artist string
+    Album string
+    URL string
+    CoverArtURL string
+}
+
+script Player(songs []*chalgen.Song) {
     let theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
 
     if( theme == 'dark' ){
@@ -47,43 +56,7 @@ script Player() {
                 slider.style.backgroundSize = percentage + '% 100%';
             }
         },
-        "songs": [
-            {
-                "name": "First Snow",
-                "artist": "Emancipator",
-                "album": "Soon It Will Be Cold Enough",
-                "url": "https://521dimensions.com/song/FirstSnow-Emancipator.mp3",
-                "cover_art_url": "https://521dimensions.com/img/open-source/amplitudejs/album-art/soon-it-will-be-cold-enough.jpg"
-            },
-            {
-                "name": "Intro / Sweet Glory",
-                "artist": "Jimkata",
-                "album": "Die Digital",
-                "url": "https://521dimensions.com/song/IntroSweetGlory-Jimkata.mp3",
-                "cover_art_url": "https://521dimensions.com/img/open-source/amplitudejs/album-art/die-digital.jpg"
-            },
-            {
-                "name": "Offcut #6",
-                "artist": "Little People",
-                "album": "We Are But Hunks of Wood Remixes",
-                "url": "https://521dimensions.com/song/Offcut6-LittlePeople.mp3",
-                "cover_art_url": "https://521dimensions.com/img/open-source/amplitudejs/album-art/we-are-but-hunks-of-wood.jpg"
-            },
-            {
-                "name": "Dusk To Dawn",
-                "artist": "Emancipator",
-                "album": "Dusk To Dawn",
-                "url": "https://521dimensions.com/song/DuskToDawn-Emancipator.mp3",
-                "cover_art_url": "https://521dimensions.com/img/open-source/amplitudejs/album-art/from-dusk-to-dawn.jpg"
-            },
-            {
-                "name": "Anthem",
-                "artist": "Emancipator",
-                "album": "Soon It Will Be Cold Enough",
-                "url": "https://521dimensions.com/song/Anthem-Emancipator.mp3",
-                "cover_art_url": "https://521dimensions.com/img/open-source/amplitudejs/album-art/soon-it-will-be-cold-enough.jpg"
-            }
-        ]
+        "songs": songs,
     });
 
     window.onkeydown = function(e) {
@@ -1186,5 +1159,5 @@ div.amplitude-repeat-song.amplitude-repeat-song-on svg path{
         </div>
         </div>
         </div>
-        @Player()
+        @Player(a.Songs)
 }