M gametable/server.go → gametable/server.go

@@ -221,7 +221,7 @@ return err
 		}
 	}
 
-	// map image change and token addition/removal require admin authorization
+	// map image change, aux message, and token addition/removal require admin authorization
 	if tableMsg.Auth != nil {
 		authorized, _ := self.udb.ValidateToken(*tableMsg.Auth)
 		if authorized {
@@ -230,6 +230,12 @@ err := self.dbAdapter.SetMapImageUrl(key, *tableMsg.MapImg)
 				if err != nil {
 					return err
 				}
+			}
+			if tableMsg.AuxMsg != nil {
+			 err := self.dbAdapter.SetAuxMessage(key, *tableMsg.AuxMsg)
+			 if err != nil {
+			   return err
+			 }
 			}
 		}
 	}

M models/models.go → models/models.go

@@ -17,12 +17,13 @@ Note      string    `json:"note"`
 	Timestamp time.Time `json:"timestamp"`
 }
 
+
 type Token struct {
 	Id        string `json:"id"`
 	Name      string `json:"name"`
 	SpriteUri string `json:"spriteUrl"`
-	X         int    `json:"x"`
-	Y         int    `json:"y"`
+	X         *int    `json:"x"`
+	Y         *int    `json:"y"`
 }
 
 type Table struct {

M static/admin.js → static/admin.js

@@ -23,9 +23,8 @@ if (res.ok) {
       document.getElementById("input_table_name").value = name;
       document.getElementById("input_table_pass").value = pass;
       dial();
-      infoHtml = "<a href='#' onclick='getTables()'>&larr; table list</a><br><pre>";
-      infoHtml += await res.text();
-      infoHtml += "</pre>"
+      infoHtml = "<a href='#' onclick='getTables()'>&larr; table list</a><br>";
+      infoHtml += `<textarea id='auxMsgZone'>${(await res.json()).auxMsg}</textarea><br><button onclick='publishAuxMsg()'>Change</button>`
       infoHtml += "<button onclick='destroyTable()'>Destroy</button>"
       infoHtml += "<input id='map_img_upload' type='file'>Map Image</input><button onclick='uploadMapImg()'>Upload</button>"
       if (mapImgs.ok) {
@@ -45,6 +44,13 @@ console.log(res.status);
     }
   } catch (err) {
     setErr(`${err.name}: ${err.message}`);
+  }
+}
+
+function publishAuxMsg() {
+  const txtArea = document.getElementById("auxMsgZone");
+  if (txtArea != null) {
+    publish({auxMsg: txtArea.value, auth: adminToken.access_token});
   }
 }