Skip to content

Commit

Permalink
Fully migrate database to subprojects
Browse files Browse the repository at this point in the history
  • Loading branch information
shuuyu committed Oct 14, 2024
1 parent b5f0179 commit 39132f5
Show file tree
Hide file tree
Showing 53 changed files with 156 additions and 600 deletions.
6 changes: 3 additions & 3 deletions bot/src/main/kotlin/live/shuuyu/nabi/NabiCore.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import live.shuuyu.discordinteraktions.common.commands.MessageCommandDeclaration
import live.shuuyu.discordinteraktions.common.commands.SlashCommandDeclaration
import live.shuuyu.discordinteraktions.platforms.kord.installDiscordInteraKTions
import live.shuuyu.nabi.cache.NabiCacheManager
import live.shuuyu.nabi.database.NabiDatabaseCore
import live.shuuyu.nabi.database.NabiDatabaseManager
import live.shuuyu.nabi.events.EventContext
import live.shuuyu.nabi.events.EventResult
import live.shuuyu.nabi.events.impl.*
Expand All @@ -34,7 +34,7 @@ class NabiCore(
val gatewayManager: NabiGatewayManager,
val config: NabiConfig,
val cache: NabiCacheManager,
val database: NabiDatabaseCore,
val database: NabiDatabaseManager,
val metrics: NabiMetricsManager
) {
companion object {
Expand Down Expand Up @@ -90,7 +90,7 @@ class NabiCore(
// Initialize all of our microservices before the bot starts to prevent issues from arrising
preInitialization()
database.initialize()
database.createMissingSchemaAndColumns()
database.createMissingTablesAndColums()
manager.registerGlobalApplicationCommands()
manager.registerGuildApplicationCommands(config.discord.defaultGuildId)
cache.initialize(kord)
Expand Down
15 changes: 8 additions & 7 deletions bot/src/main/kotlin/live/shuuyu/nabi/NabiLauncher.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import dev.kord.gateway.DefaultGateway
import live.shuuyu.common.utils.ParserUtils
import live.shuuyu.nabi.cache.NabiCacheConfig
import live.shuuyu.nabi.cache.NabiCacheManager
import live.shuuyu.nabi.database.NabiDatabaseCore
import live.shuuyu.nabi.database.NabiDatabaseConfig
import live.shuuyu.nabi.database.NabiDatabaseManager
import live.shuuyu.nabi.metrics.NabiMetricsConfig
import live.shuuyu.nabi.metrics.NabiMetricsManager
import live.shuuyu.nabi.utils.config.DatabaseConfig
import live.shuuyu.nabi.utils.config.NabiConfig
import live.shuuyu.nabi.utils.config.NabiDiscordConfig
import java.io.File
Expand All @@ -28,10 +28,11 @@ object NabiLauncher {
result.discord.publicKey,
result.discord.port
),
DatabaseConfig(
result.database.address,
result.database.username,
result.database.password
NabiDatabaseConfig(
result.database.jdbcUrl,
result.database.jdbcUsername,
result.database.jdbcPassword,
result.database.port
),
NabiCacheConfig(
result.cache.addresses,
Expand All @@ -49,7 +50,7 @@ object NabiLauncher {

val gatewayManager = NabiGatewayManager(config.discord.shards, gateways)
val cacheManager = NabiCacheManager(config.cache)
val databaseManager = NabiDatabaseCore(config.database)
val databaseManager = NabiDatabaseManager(config.database)
val metricsManager = NabiMetricsManager(config.metrics)

val nabi = NabiCore(gatewayManager, config, cacheManager, databaseManager, metricsManager)
Expand Down
70 changes: 0 additions & 70 deletions bot/src/main/kotlin/live/shuuyu/nabi/database/NabiDatabaseCore.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions bot/src/main/kotlin/live/shuuyu/nabi/database/config/WarnConfig.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 39132f5

Please sign in to comment.