fixes

client/src/ui/lib/editAutomapper.svelte

@@ -43,6 +43,12 @@
     })
 
     rmap = mapView.getRenderMap()
+    rmap.gameLayer.visible = false
+    if (rmap.teleLayer) rmap.teleLayer.visible = false
+    if (rmap.speedupLayer) rmap.speedupLayer.visible = false
+    if (rmap.frontLayer) rmap.frontLayer.visible = false
+    if (rmap.switchLayer) rmap.switchLayer.visible = false
+    if (rmap.tuneLayer) rmap.tuneLayer.visible = false
 
     $server.on('create/automapper', onUploadAutomapper)
     $server.on('delete/automapper', onDeleteAutomapper)

client/src/ui/lib/editInfo.svelte

@@ -1,17 +1,22 @@
 <script lang="ts">
+  import type { MapInfo } from '../../twmap/map'
   import { sync } from '../../server/util'
   import { server, map } from '../global'
 
 
-  $: syncInfo = sync($server, $map.info, { query: 'edit/info' }) 
+  $: syncInfo = sync($server, cloneInfo($map.info), { query: 'edit/info' }) 
+
+  function cloneInfo(info: MapInfo): MapInfo {
+    return { ...info }
+  }
 
   function onChangeSettings(e: Event & { currentTarget: HTMLTextAreaElement }) {
     $syncInfo.settings = e.currentTarget.value.split('\n').filter(s => s !== '')
     onChange()
   }
 
   function onChange() {
-    $syncInfo = { ...$syncInfo }
+    syncInfo.sync($syncInfo)
   }
 </script>
 

client/src/ui/lib/editor.svelte

@@ -102,10 +102,6 @@
     }
     $automappers = $automappers
   }
-  function serverOnError(e: string) {
-    showError('Server Error: ' + e)
-  }
-
   async function onServerClosed() {
     await showError('You have been disconnected from the server.')
     navigate('/')
@@ -124,7 +120,6 @@
     $server.on('edit/automap', serverOnApplyAutomapper)
     $server.on('delete/automapper', serverOnDeleteAutomapper)
     $server.on('create/automapper', serverOnUploadAutomapper)
-    $server.onError(serverOnError)
     $server.query('get/users', undefined)
       .then(u => $peers = u)
 

client/src/ui/lib/util.ts

@@ -28,17 +28,24 @@ export async function download(file: string, name: string) {
 }
 
 export async function uploadMap(httpRoot: string, name: string, file: Blob) {
-  await fetch(`${httpRoot}/maps/${name}`, {
+  const resp = await fetch(`${httpRoot}/maps/${name}`, {
     method: 'PUT',
     body: file
   })
+
+  if (!resp.ok)
+    throw await resp.text()
 }
 
 export async function createMap(httpRoot: string, name: string, create: MapCreation) {
-  await fetch(`${httpRoot}/maps/${name}`, {
+  const resp = await fetch(`${httpRoot}/maps/${name}`, {
     method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(create)
   })
+
+  if (!resp.ok)
+    throw await resp.text()
 }
 
 // export async function uploadImage(httpRoot: string, mapName: string, imageName: string, file: Blob) {

client/src/ui/routes/edit.svelte

@@ -5,7 +5,8 @@
   import EditAutomapper from '../lib/editAutomapper.svelte'
   import Headerbar from '../lib/headerbar.svelte'
   import Fence from '../lib/fence.svelte'
-  import { onDestroy } from 'svelte'
+  import { onDestroy, onMount } from 'svelte'
+  import { showError } from '../lib/dialog'
 
   export let name: string
 
@@ -17,7 +18,16 @@
     $map = map_
   })()
 
+  function serverOnError(e: string) {
+    showError('Server Error: ' + e)
+  }
+
+  onMount(() => {
+    $server.onError(serverOnError)
+  })
+
   onDestroy(() => {
+    $server.onError(() => {})
     $server.query('leave', name)
   })
 

client/src/ui/routes/lobby.svelte

@@ -197,31 +197,31 @@
     const { name, method } = modalCreateMap
     const access = modalCreateMap.public ? 'public' : 'unlisted'
 
-    showInfo('Querying the server…', 'none')
-
-    if (method === 'upload' && modalCreateMap.uploadFile !== null) {
-      await uploadMap(serverConfs[serverId].httpUrl, name, modalCreateMap.uploadFile)
-    }
-    else if (method === 'blank') {
-      await createMap(serverConfs[serverId].httpUrl, name, {
-        version: 'ddnet06', // TODO
-        access,
-        blank: {
-          w: modalCreateMap.blankWidth,
-          h: modalCreateMap.blankHeight,
-        }
-      })
-    }
-    else if (method === 'clone' && modalCreateMap.clone !== undefined) {
-      await createMap(serverConfs[serverId].httpUrl, name, {
-        version: 'ddnet06',
-        access,
-        clone: maps[modalCreateMap.clone].name
-      })
-    }
+    const id = showInfo('Querying the server…', 'none')
 
     try {
-      clearDialog()
+      if (method === 'upload' && modalCreateMap.uploadFile !== null) {
+        await uploadMap(serverConfs[serverId].httpUrl, name, modalCreateMap.uploadFile)
+      }
+      else if (method === 'blank') {
+        await createMap(serverConfs[serverId].httpUrl, name, {
+          version: 'ddnet06', // TODO
+          access,
+          blank: {
+            w: modalCreateMap.blankWidth,
+            h: modalCreateMap.blankHeight,
+          }
+        })
+      }
+      else if (method === 'clone' && modalCreateMap.clone !== undefined) {
+        await createMap(serverConfs[serverId].httpUrl, name, {
+          version: 'ddnet06',
+          access,
+          clone: maps[modalCreateMap.clone].name
+        })
+      }
+
+      clearDialog(id)
       if (access === 'unlisted') {
         const url = window.location.origin + '/edit/' + encodeURIComponent(name)
         showWarning(
@@ -230,7 +230,9 @@
         )
       }
       navigate('/edit/' + name)
-    } catch (e) {
+    }
+    catch (e) {
+      clearDialog(id)
       showError('Map creation failed: ' + e)
     }
   }

server/src/protocol.rs

@@ -123,10 +123,16 @@ pub enum CreationMethod {
     Blank { w: u32, h: u32 },
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum Version {
+    DDNet06,
+    Teeworlds07,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct MapCreation {
-    #[serde(default)]
-    pub version: Option<twmap::Version>,
+    pub version: Option<Version>,
     #[serde(default)]
     pub access: Option<MapAccess>,
     #[serde(flatten)]

server/src/server.rs

@@ -14,6 +14,7 @@ use crate::{
     checks::PartialCheck,
     cli::Cli,
     error::Error,
+    map_cfg::MapAccess,
     protocol::*,
     room::{Peer, Room},
     twmap_map_checks::InternalMapChecking,
@@ -296,6 +297,7 @@ impl Server {
     pub fn get_maps(&self) -> Vec<MapDetail> {
         self.rooms()
             .iter()
+            .filter(|(k, v)| v.config.access == MapAccess::Public)
             .map(|(k, v)| MapDetail {
                 name: k.to_owned(),
                 users: v.peer_count(),
@@ -340,7 +342,7 @@ impl Server {
             }
             CreationMethod::Blank { w, h } => {
                 if let Some(version) = creation.version {
-                    if version != twmap::Version::DDNet06 {
+                    if version != Version::DDNet06 {
                         return Err(Error::UnsupportedMapType);
                     }
                 }
@@ -378,7 +380,7 @@ impl Server {
             std::fs::create_dir(new_room.automapper_path())
                 .map_err(|e| Error::ServerError(e.to_string().into()))?;
 
-            new_room.config.access = creation.access.unwrap_or(crate::map_cfg::MapAccess::Public);
+            new_room.config.access = creation.access.unwrap_or(MapAccess::Public);
             new_room
                 .save_config()
                 .map_err(|e| Error::ServerError(e.into()))?;

server/src/util.rs

@@ -1,7 +1,5 @@
-use std::{fmt::Display, path::Path, sync::OnceLock};
-
-use regex::Regex;
 use serde::Serializer;
+use std::{fmt::Display, path::Path};
 
 use crate::{
     protocol::AutomapperKind,
@@ -17,40 +15,40 @@ where
     serializer.collect_str(value)
 }
 
-pub(crate) mod serialize_partial_index {
-    use serde::{de, Deserialize, Deserializer, Serializer};
-
-    pub(crate) fn serialize<S: Serializer>(
-        opt_index: &Option<Option<u16>>,
-        serializer: S,
-    ) -> Result<S::Ok, S::Error> {
-        match opt_index {
-            None => serializer.serialize_unit(),
-            Some(None) => serializer.serialize_none(),
-            Some(Some(v)) => serializer.serialize_some(&v.to_string()),
-        }
-    }
-
-    pub(crate) fn deserialize<'de, D: Deserializer<'de>>(
-        deserializer: D,
-    ) -> Result<Option<Option<u16>>, D::Error> {
-        let opt_name: Option<String> = Deserialize::deserialize(deserializer)?;
-        let opt_index = match opt_name {
-            Some(opt_name) => opt_name
-                .split('_')
-                .next()
-                .ok_or(de::Error::invalid_value(
-                    de::Unexpected::Str(&opt_name),
-                    &"a mapdir-compatible resource index",
-                ))?
-                .parse::<u16>()
-                .map(|v| Some(Some(v)))
-                .map_err(de::Error::custom)?,
-            None => Some(None),
-        };
-        Ok(opt_index)
-    }
-}
+// pub(crate) mod serialize_partial_index {
+//     use serde::{de, Deserialize, Deserializer, Serializer};
+
+//     pub(crate) fn serialize<S: Serializer>(
+//         opt_index: &Option<Option<u16>>,
+//         serializer: S,
+//     ) -> Result<S::Ok, S::Error> {
+//         match opt_index {
+//             None => serializer.serialize_unit(),
+//             Some(None) => serializer.serialize_none(),
+//             Some(Some(v)) => serializer.serialize_some(&v.to_string()),
+//         }
+//     }
+
+//     pub(crate) fn deserialize<'de, D: Deserializer<'de>>(
+//         deserializer: D,
+//     ) -> Result<Option<Option<u16>>, D::Error> {
+//         let opt_name: Option<String> = Deserialize::deserialize(deserializer)?;
+//         let opt_index = match opt_name {
+//             Some(opt_name) => opt_name
+//                 .split('_')
+//                 .next()
+//                 .ok_or(de::Error::invalid_value(
+//                     de::Unexpected::Str(&opt_name),
+//                     &"a mapdir-compatible resource index",
+//                 ))?
+//                 .parse::<u16>()
+//                 .map(|v| Some(Some(v)))
+//                 .map_err(de::Error::custom)?,
+//             None => Some(None),
+//         };
+//         Ok(opt_index)
+//     }
+// }
 
 pub(crate) mod macros {
     macro_rules! apply_partial {