Fixed #9

apps/static/js/home.js

@@ -39,10 +39,10 @@ async function loadServerOptions() {
         const servers = await loadGuilds();
         servers.forEach(server => {
             $("#serverOptions").append($("<option>", {
-                value: server.guild_id,
+                value: server.id,
                 text: server.name,
                 "data-icon": server.icon,
-                "data-id": server.id
+                // "data-id": server.id
             }));
         });
     }
@@ -105,31 +105,35 @@ $("#serverForm").on("submit", function(event) {
     var selectedOption = $("#serverOptions option:selected");
         serverName = selectedOption.text();
         serverGuildId = selectedOption.val();
-        serverId = selectedOption.attr("data-id");
         serverIconHash = selectedOption.attr("data-icon");
 
-    registerNewServer(serverName, serverGuildId, serverIconHash);
-    addToLoadedServers({
-        id: serverId,
-        name: serverName,
-        guild_id: serverGuildId,
-        icon: serverIconHash
-    });
+    var serverPrimaryKey = registerNewServer(serverName, serverGuildId, serverIconHash);
+
+    if (serverPrimaryKey !== false) {
+        addToLoadedServers({
+            id: serverPrimaryKey,
+            name: serverName,
+            guild_id: serverGuildId,
+            icon: serverIconHash
+        });
+        addServerTemplate(serverGuildId, serverName, serverIconHash);
+    }
 
     $("#serverForm .modal").modal("hide");
 });
 
 // Add a new 'saved guild' based on the info provided
-async function registerNewServer(serverName, serverId, serverIconHash) {
+// returns `response.id` if successful, else false
+async function registerNewServer(serverName, serverGuildId, serverIconHash) {
     var formData = new FormData();
     formData.append("name", serverName);
-    formData.append("guild_id", serverId);
+    formData.append("guild_id", serverGuildId);
     formData.append("icon", serverIconHash);
 
-    alert(JSON.stringify(formData, null, 4))
-
     try { response = await newSavedGuild(formData); }
-    catch (err) { alert(err) }
+    catch (err) { return false }
+
+    return response.id
 }
 
 function selectServer(sideElem) {