Skip to content

Commit

Permalink
Merge pull request #25 from daksh7011/develop
Browse files Browse the repository at this point in the history
Develop -> Master
  • Loading branch information
daksh7011 authored Aug 13, 2024
2 parents 156b375 + e6078ea commit 4075f1d
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/qbt-bot.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ pluginManagement {
id("com.github.jakemarsden.git-hooks") version "0.0.2"
id("com.github.johnrengelman.shadow") version "8.1.1"

id("dev.kordex.gradle.docker") version "1.2.0"
id("dev.kordex.gradle.kordex") version "1.2.0"
id("dev.kordex.gradle.docker") version "1.3.0"
id("dev.kordex.gradle.kordex") version "1.3.0"
}
}

Expand Down
14 changes: 5 additions & 9 deletions src/main/kotlin/qbtbot/App.kt
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
package qbtbot

import com.kotlindiscord.kord.extensions.DISCORD_GREEN
import com.kotlindiscord.kord.extensions.ExtensibleBot
import com.kotlindiscord.kord.extensions.commands.events.PublicSlashCommandFailedChecksEvent
import com.kotlindiscord.kord.extensions.commands.events.PublicSlashCommandFailedParsingEvent
import com.kotlindiscord.kord.extensions.commands.events.PublicSlashCommandFailedWithExceptionEvent
import com.kotlindiscord.kord.extensions.commands.events.PublicSlashCommandInvocationEvent
import com.kotlindiscord.kord.extensions.commands.events.PublicSlashCommandSucceededEvent
import com.kotlindiscord.kord.extensions.utils.env
import com.kotlindiscord.kord.extensions.utils.getKoin
import dev.kord.common.entity.PresenceStatus
import dev.kord.core.event.gateway.DisconnectEvent
import dev.kord.core.event.gateway.ReadyEvent
import dev.kord.gateway.builder.Shards
import dev.kordex.core.DISCORD_GREEN
import dev.kordex.core.ExtensibleBot
import dev.kordex.core.commands.events.*
import dev.kordex.core.utils.env
import dev.kordex.core.utils.getKoin
import qbtbot.commands.TorrentInfo
import qbtbot.util.Environment
import qbtbot.util.PresenceManager
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/qbtbot/commands/TorrentInfo.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package qbtbot.commands

import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.chatCommand
import com.kotlindiscord.kord.extensions.utils.respond
import dev.kordex.core.extensions.Extension
import dev.kordex.core.extensions.chatCommand
import dev.kordex.core.utils.respond
import io.ktor.client.call.body
import io.ktor.client.request.get
import io.ktor.http.HttpStatusCode
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/qbtbot/util/Extension.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package qbtbot.util

import com.kotlindiscord.kord.extensions.ExtensibleBot
import com.kotlindiscord.kord.extensions.utils.env
import dev.kord.common.entity.Snowflake
import dev.kord.core.Kord
import dev.kord.core.entity.Message
import dev.kord.rest.builder.message.EmbedBuilder
import dev.kordex.core.ExtensibleBot
import dev.kordex.core.utils.env
import io.ktor.client.request.forms.submitForm
import io.ktor.client.statement.HttpResponse
import io.ktor.http.parameters
Expand Down
13 changes: 6 additions & 7 deletions src/main/kotlin/qbtbot/util/Ktor.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package qbtbot.util

import com.kotlindiscord.kord.extensions.utils.env
import io.ktor.client.HttpClient
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.client.plugins.cookies.HttpCookies
import io.ktor.client.plugins.cookies.cookies
import io.ktor.http.Cookie
import io.ktor.serialization.kotlinx.json.json
import dev.kordex.core.utils.env
import io.ktor.client.*
import io.ktor.client.plugins.contentnegotiation.*
import io.ktor.client.plugins.cookies.*
import io.ktor.http.*
import io.ktor.serialization.kotlinx.json.*
import kotlinx.serialization.json.Json
import java.net.URLEncoder

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/qbtbot/util/PresenceManager.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package qbtbot.util

import com.kotlindiscord.kord.extensions.utils.scheduling.Scheduler
import dev.kord.core.Kord
import dev.kord.gateway.builder.PresenceBuilder
import dev.kordex.core.utils.scheduling.Scheduler
import kotlinx.coroutines.flow.count
import org.koin.core.component.KoinComponent
import kotlin.math.floor
Expand Down

0 comments on commit 4075f1d

Please sign in to comment.