moved settings into settings:

Author: CodeShellDev

config/defaults.yml

@@ -3,36 +3,37 @@ server:
 
 logLevel: INFO
 
-messageAliases:
-  [
-    { alias: msg, score: 100 },
-    { alias: content, score: 99 },
-    { alias: description, score: 98 },
-    { alias: text, score: 20 },
-    { alias: summary, score: 15 },
-    { alias: details, score: 14 },
+settings:
+  messageAliases:
+    [
+      { alias: msg, score: 100 },
+      { alias: content, score: 99 },
+      { alias: description, score: 98 },
+      { alias: text, score: 20 },
+      { alias: summary, score: 15 },
+      { alias: details, score: 14 },
 
-    { alias: data.message, score: 10 },
-    { alias: data.content, score: 9 },
-    { alias: data.description, score: 8 },
-    { alias: data.text, score: 7 },
-    { alias: data.summary, score: 6 },
-    { alias: data.details, score: 5 },
+      { alias: data.message, score: 10 },
+      { alias: data.content, score: 9 },
+      { alias: data.description, score: 8 },
+      { alias: data.text, score: 7 },
+      { alias: data.summary, score: 6 },
+      { alias: data.details, score: 5 },
 
-    { alias: body, score: 2 },
-    { alias: data, score: 1 },
-  ]
+      { alias: body, score: 2 },
+      { alias: data, score: 1 },
+    ]
 
-variables:
-  recipients: ${RECIPIENTS}
-  number: ${NUMBER}
+  variables:
+    recipients: ${RECIPIENTS}
+    number: ${NUMBER}
 
-blockedEndpoints:
-  - /v1/about
-  - /v1/configuration
-  - /v1/devices
-  - /v1/register
-  - /v1/unregister
-  - /v1/qrcodelink
-  - /v1/accounts
-  - /v1/contacts
+  blockedEndpoints:
+    - /v1/about
+    - /v1/configuration
+    - /v1/devices
+    - /v1/register
+    - /v1/unregister
+    - /v1/qrcodelink
+    - /v1/accounts
+    - /v1/contacts

examples/config.yml

@@ -7,13 +7,14 @@ api:
 
 logLevel: INFO
 
-variables:
-  number: "000"
-  recipients: ["001", "group.id", "user.id"]
+settings:
+  variables:
+    number: "000"
+    recipients: ["001", "group.id", "user.id"]
 
-messageAliases: [{ alias: "msg", score: 100 }]
+  messageAliases: [{ alias: "msg", score: 100 }]
 
-blockedEndpoints:
-  - /v1/about
-allowedEndpoints:
-  - /v2/send
+  blockedEndpoints:
+    - /v1/about
+  allowedEndpoints:
+    - /v2/send

utils/config/loader.go

@@ -55,18 +55,11 @@ func InitEnv() {
 
 	ENV.API_URL = config.String("api.url")
 
-	defaultSettings := ENV.SETTINGS["*"]
-
-	config.Unmarshal("messagealiases", &defaultSettings.MESSAGE_ALIASES)
-
 	transformChildren(config, "variables", func(key string, value any) (string, any) {
 		return strings.ToUpper(key), value
 	})
 
-	config.Unmarshal("variables", &defaultSettings.VARIABLES)
-
-	defaultSettings.BLOCKED_ENDPOINTS = config.Strings("blockedendpoints")
-	defaultSettings.ALLOWED_ENDPOINTS = config.Strings("allowedendpoints")
+	config.Unmarshal("settings", &ENV.SETTINGS)
 }
 
 func Load() {
@@ -83,7 +76,6 @@ func Load() {
 	config = mergeLayers()
 
 	normalizeKeys(config)
-
 	templateConfig(config)
 
 	InitTokens()