[ServerConfig] UCS config block (#165)

* [ServerConfig] UCS config block * [Release] 3.9.0
Akkadius · Jan 7, 2024 · 3923f79 · 3923f79
1 parent fb70e59
commit 3923f79
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [3.9.0] 1/6/2024
+
+* **Server Config** Update server admin configuration editor to use new config schema. Mailserver and chatserver have been consolidated to `server.ucs` see https://github.com/EQEmu/Server/pull/3768
+
 ## [3.8.8] 1/6/2024
 
 * **Server Installer** Use legacy analytics pipeline to record install counts

diff --git a/frontend/src/views/admin/configuration/ServerConfig.vue b/frontend/src/views/admin/configuration/ServerConfig.vue
@@ -362,33 +362,23 @@
       </eq-tab>
 
       <eq-tab class="fade-in" name="UCS">
-        <div class="form-row">
-          <div class="form-group col-md-6">
-            <label class="form-label">Chatserver Host</label>
-            <input
-              type="text" class="form-control" placeholder="0.0.0.0"
-              v-model="config.server.chatserver.host"
-            />
-          </div>
 
-          <div class="form-group col-md-6">
-            <label class="form-label">Chatserver Port</label>
-            <input type="text" class="form-control" v-model="config.server.chatserver.port"/>
-          </div>
+        <div class="mb-3">
+          Universal Chat Service (UCS) is a service that allows you to connect to the in game chat server. It also runs mail services.
         </div>
 
         <div class="form-row">
           <div class="form-group col-md-6">
-            <label class="form-label">Mailserver Host</label>
+            <label class="form-label">Host</label>
             <input
               type="text" class="form-control" placeholder="0.0.0.0"
-              v-model="config.server.mailserver.host"
+              v-model="config.server.ucs.host"
             />
           </div>
 
           <div class="form-group col-md-6">
-            <label class="form-label">Mailserver Port</label>
-            <input type="text" class="form-control" v-model="config.server.mailserver.port"/>
+            <label class="form-label">Port</label>
+            <input type="text" class="form-control" v-model="config.server.ucs.port"/>
           </div>
         </div>
       </eq-tab>
@@ -635,6 +625,13 @@ export default {
       }
     }
 
+    if (!this.config.server.ucs) {
+      this.config.server.ucs = {
+        host: "",
+        port: "",
+      }
+    }
+
     const loginServerConfigModel = {
       'account': '',
       'password': '',
@@ -693,6 +690,14 @@ export default {
     },
 
     submitServerConfig: async function () {
+      if (!this.config.server.content_database) {
+        delete this.config.server.content_database
+      }
+
+      if (this.config.server.content_database && Object.keys(this.config.server.content_database).length === 0) {
+        delete this.config.server.content_database
+      }
+
       try {
         const r = await SpireApi.v1().post('admin/serverconfig', this.config)
         if (r.status === 200) {

diff --git a/internal/eqemuserverconfig/config.go b/internal/eqemuserverconfig/config.go
@@ -62,14 +62,21 @@ type EQEmuConfigJson struct {
 			} `json:"ports"`
 		} `json:"zones,omitempty"`
 		Qsdatabase *DatabaseConfig `json:"qsdatabase,omitempty"`
-		Chatserver struct {
+		// deprecated
+		Chatserver *struct {
 			Port string `json:"port"`
 			Host string `json:"host"`
 		} `json:"chatserver,omitempty"`
-		Mailserver struct {
+		// deprecated
+		Mailserver *struct {
 			Host string `json:"host"`
 			Port string `json:"port"`
 		} `json:"mailserver,omitempty"`
+		// replaces chatserver and mailserver
+		Ucs *struct {
+			Host string `json:"host"`
+			Port string `json:"port"`
+		} `json:"ucs,omitempty"`
 		World struct {
 			AutoDatabaseUpdates *bool `json:"auto_database_updates,omitempty"`
 			API                 struct {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spire",
-  "version": "3.8.8",
+  "version": "3.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/Akkadius/spire.git"