diff --git a/scalabot-meta/src/main/kotlin/serializer/Serializer.kt b/scalabot-meta/src/main/kotlin/serializer/Serializer.kt index 1341272..2ff6a90 100644 --- a/scalabot-meta/src/main/kotlin/serializer/Serializer.kt +++ b/scalabot-meta/src/main/kotlin/serializer/Serializer.kt @@ -9,7 +9,6 @@ import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.repository.Authentication import org.eclipse.aether.repository.Proxy import org.eclipse.aether.util.repository.AuthenticationBuilder -import org.telegram.telegrambots.meta.ApiConstants import java.lang.reflect.Type import java.net.MalformedURLException import java.net.URL @@ -222,6 +221,8 @@ object ProxyConfigSerializer : JsonSerializer, JsonDeserializer, JsonDeserializer { + private val defaultConfig = BotConfig(account = BotAccount("__Default__", "__Default__", 0)) + override fun serialize(src: BotConfig, typeOfSrc: Type, context: JsonSerializationContext): JsonElement { return JsonObject().apply { addProperty("enabled", src.enabled) @@ -247,14 +248,14 @@ object BotConfigSerializer : JsonSerializer, JsonDeserializer>() {}.type) - ?: emptySet(), - proxy = context.deserialize(json.get("proxy"), ProxyConfig::class.java) ?: ProxyConfig(), - baseApiUrl = json.get("baseApiUrl")?.asString ?: ApiConstants.BASE_URL + ?: defaultConfig.extensions, + proxy = context.deserialize(json.get("proxy"), ProxyConfig::class.java) ?: defaultConfig.proxy, + baseApiUrl = json.get("baseApiUrl")?.asString ?: defaultConfig.baseApiUrl ) } }