Merge remote-tracking branch 'origin/root' into root

Kord-Extensions · Aug 20, 2023 · 74aaa1e · 74aaa1e
2 parents 54c72c4 + f71f530
commit 74aaa1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...r-mongodb/src/main/kotlin/com/kotlindiscord/kord/extensions/adapters/mongodb/Constants.kt b/...r-mongodb/src/main/kotlin/com/kotlindiscord/kord/extensions/adapters/mongodb/Constants.kt
@@ -10,18 +10,13 @@ import com.kotlindiscord.kord.extensions.adapters.mongodb.codecs.InstantCodec
 import com.kotlindiscord.kord.extensions.adapters.mongodb.codecs.SnowflakeCodec
 import com.kotlindiscord.kord.extensions.adapters.mongodb.codecs.StorageTypeCodec
 import com.kotlindiscord.kord.extensions.utils.env
-import com.mongodb.MongoClientSettings
 import org.bson.codecs.configuration.CodecRegistries
 import org.bson.codecs.configuration.CodecRegistry
 
 internal val MONGODB_URI: String = env("ADAPTER_MONGODB_URI")
 
-public val kordExCodecRegistry: CodecRegistry = CodecRegistries.fromRegistries(
-	CodecRegistries.fromCodecs(
-		InstantCodec(),
-		SnowflakeCodec(),
-		StorageTypeCodec(),
-	),
-
-	MongoClientSettings.getDefaultCodecRegistry(),
+public val kordExCodecRegistry: CodecRegistry = CodecRegistries.fromCodecs(
+	InstantCodec(),
+	SnowflakeCodec(),
+	StorageTypeCodec(),
 )
diff --git a/...mongodb/src/main/kotlin/com/kotlindiscord/kord/extensions/adapters/mongodb/db/Database.kt b/...mongodb/src/main/kotlin/com/kotlindiscord/kord/extensions/adapters/mongodb/db/Database.kt
@@ -8,18 +8,25 @@ package com.kotlindiscord.kord.extensions.adapters.mongodb.db
 
 import com.kotlindiscord.kord.extensions.adapters.mongodb.MONGODB_URI
 import com.kotlindiscord.kord.extensions.adapters.mongodb.kordExCodecRegistry
+import com.mongodb.MongoClientSettings
 import com.mongodb.MongoException
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import com.mongodb.kotlin.client.coroutine.MongoCollection
 import com.mongodb.kotlin.client.coroutine.MongoDatabase
 import mu.KotlinLogging
 import org.bson.BsonInt64
 import org.bson.Document
+import org.bson.codecs.configuration.CodecRegistries
 
 internal object Database {
 	private val logger = KotlinLogging.logger {}
 	private val client = MongoClient.create(MONGODB_URI)
 
+	private val codecRegistry = CodecRegistries.fromRegistries(
+		kordExCodecRegistry,
+		MongoClientSettings.getDefaultCodecRegistry(),
+	)
+
 	val db: MongoDatabase = client.getDatabase("kordex-data")
 
 	@Throws(MongoException::class)
@@ -36,5 +43,5 @@ internal object Database {
 	inline fun <reified T : Any> getCollection(name: String): MongoCollection<T> =
 		db
 			.getCollection<T>(name)
-			.withCodecRegistry(kordExCodecRegistry)
+			.withCodecRegistry(codecRegistry)
 }