From dfbd3fbe3955298228c4ef38d1d8ea10476bd58c Mon Sep 17 00:00:00 2001 From: limited_dev Date: Mon, 8 May 2023 23:24:29 +0200 Subject: [PATCH] feat!: removed DB connection, since I decided against storing user data. chore: updated Known issues Comment: Playlists were never used on v4, so there is no need for a DB for that, so I don't need one right now Signed-off-by: limited_dev --- README.md | 5 +++ build.gradle.kts | 19 ++------- .../kotlin/de/limited_dev/botendo/data/DB.kt | 41 ------------------- .../botendo/build/BuildConstants.kt | 3 -- 4 files changed, 9 insertions(+), 59 deletions(-) delete mode 100644 src/main/kotlin/de/limited_dev/botendo/data/DB.kt diff --git a/README.md b/README.md index 8455c81..369548b 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,11 @@ A Discord music bot, written in Kotlin using the kord library. - HopeBaron for helping me a whole lot +## Known issues + +- The Repeat feature does not function +- Not all comments are listed below + ## Commands - info -- Show basic infos about the bot diff --git a/build.gradle.kts b/build.gradle.kts index 97469f7..12da46b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,9 +38,7 @@ version = System.getenv("CI_COMMIT_TAG")?.let { "$it-${System.getenv("CI_COMMIT_ val kordver = "1.5.6" val lavaver = "4.0.0" val coroutinesver = "1.1.0" -val ktor_version = "2.3.0" -val exposedver = "0.40.1" -val postgresver = "42.3.8" +//val ffmpegver = "5.1.2-1.5.8" val mavenArtifact = "Botendo" project.base.archivesName.set(mavenArtifact) @@ -91,14 +89,8 @@ dependencies { shadow("org.slf4j:slf4j-api:2.0.3") shadow("org.slf4j:slf4j-simple:2.0.3") - //Database - shadow("io.ktor:ktor-client-core:$ktor_version") - shadow("io.ktor:ktor-client-cio:$ktor_version") - shadow("org.jetbrains.exposed:exposed-core:$exposedver") - shadow("org.jetbrains.exposed:exposed-dao:$exposedver") - shadow("org.jetbrains.exposed:exposed-jdbc:$exposedver") - - shadow("org.postgresql:postgresql:$postgresver") + //ffmpeg + //shadow("org.bytedeco:ffmpeg:$ffmpegver") } @@ -110,10 +102,7 @@ val templateProps = mapOf( "ownerID" to ownerID, "kordversion" to kordver, "lavaversion" to lavaver, - "coroutinesversion" to coroutinesver, - "ktorversion" to ktor_version, - "exposedversion" to exposedver, - "postgresversion" to postgresver + "coroutinesversion" to coroutinesver ) diff --git a/src/main/kotlin/de/limited_dev/botendo/data/DB.kt b/src/main/kotlin/de/limited_dev/botendo/data/DB.kt deleted file mode 100644 index 5ebd226..0000000 --- a/src/main/kotlin/de/limited_dev/botendo/data/DB.kt +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Botendo - * Copyright (C) 2023 limited_dev - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -package de.limited_dev.botendo.data - -import de.limited_dev.botendo.util.Logger -import java.sql.Connection -import java.sql.DriverManager -import kotlin.system.exitProcess - -object DB { - private lateinit var connection: Connection - fun connect(dbDomain: String, dbName: String, dbUser: String, dbPasswd: String) { - val jdbcUrl = "jdbc:postgresql://$dbDomain/$dbName" - connection = DriverManager.getConnection(jdbcUrl, dbUser, dbPasswd) - - if (connection.isValid(0)) { - Logger.out("DB Connection Success!") - } else { - Logger.out("Could not connect to the Database!") - Logger.out("Check credentials.nils file.") - exitProcess(4) - } - } -} diff --git a/src/main/templates/de/limited_dev/botendo/build/BuildConstants.kt b/src/main/templates/de/limited_dev/botendo/build/BuildConstants.kt index f001cee..8e33917 100644 --- a/src/main/templates/de/limited_dev/botendo/build/BuildConstants.kt +++ b/src/main/templates/de/limited_dev/botendo/build/BuildConstants.kt @@ -25,7 +25,4 @@ internal object BuildConstants { const val kordVersion = "${kordversion}" const val lavaVersion = "${lavaversion}" const val coroutinesVersion = "${coroutinesversion}" - const val ktorVersion = "${ktorversion}" - const val exposedVersion = "${exposedversion}" - const val postgresVersion = "${postgresversion}" }