Skip to content

Commit

Permalink
Upgrade to KUtils 0.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeJMattson committed Feb 10, 2020
1 parent 86e9be7 commit 9436e49
Show file tree
Hide file tree
Showing 25 changed files with 54 additions and 44 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<!-- Version Numbers -->
<kotlin.version>1.3.61</kotlin.version>
<kutils.version>0.13.1</kutils.version>
<kutils.version>0.14.0</kutils.version>
<github.version>1.106</github.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package me.jakejmattson.embedbot.arguments

import me.aberrantfox.kjdautils.api.dsl.command.CommandEvent
import me.aberrantfox.kjdautils.internal.command.*
import me.jakejmattson.embedbot.dataclasses.Cluster
import me.jakejmattson.embedbot.extensions.getClusterByName
import me.jakejmattson.embedbot.locale.messages
import me.aberrantfox.kjdautils.api.dsl.command.CommandEvent
import me.aberrantfox.kjdautils.internal.command.*

open class ClusterArg(override val name: String = "Cluster") : ArgumentType<Cluster>() {
companion object : ClusterArg()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package me.jakejmattson.embedbot.arguments

import me.aberrantfox.kjdautils.api.dsl.command.CommandEvent
import me.aberrantfox.kjdautils.internal.command.*
import me.jakejmattson.embedbot.dataclasses.Embed
import me.jakejmattson.embedbot.extensions.getEmbedByName
import me.jakejmattson.embedbot.locale.messages
import me.aberrantfox.kjdautils.api.dsl.command.CommandEvent
import me.aberrantfox.kjdautils.internal.command.*

open class EmbedArg(override val name: String = "Embed") : ArgumentType<Embed>() {
companion object : EmbedArg()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package me.jakejmattson.embedbot.arguments

import me.aberrantfox.kjdautils.api.dsl.command.CommandEvent
import me.aberrantfox.kjdautils.internal.command.*
import me.jakejmattson.embedbot.extensions.getLoadedEmbed
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.command.CommandEvent
import me.aberrantfox.kjdautils.internal.command.*

open class FieldArg(override val name: String = "Field Data", private val delimiter: String = "|") : ArgumentType<Field>() {
companion object : FieldArg()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package me.jakejmattson.embedbot.arguments

import me.jakejmattson.embedbot.extensions.getLoadedEmbed
import me.jakejmattson.embedbot.locale.messages
import me.aberrantfox.kjdautils.api.dsl.command.CommandEvent
import me.aberrantfox.kjdautils.internal.command.*
import me.jakejmattson.embedbot.extensions.getLoadedEmbed
import me.jakejmattson.embedbot.locale.messages

open class FieldIndexArg(override val name: String = "Field Index") : ArgumentType<Int>() {
companion object : FieldIndexArg()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.jakejmattson.embedbot.commands

import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.internal.arguments.SentenceArg
import me.aberrantfox.kjdautils.internal.command.CommandStruct
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.jakejmattson.embedbot.commands

import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.internal.arguments.WordArg
import me.aberrantfox.kjdautils.internal.di.PersistenceService
import me.jakejmattson.embedbot.dataclasses.Configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.jakejmattson.embedbot.commands

import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.api.dsl.toEmbedBuilder
import me.aberrantfox.kjdautils.internal.arguments.*
import me.jakejmattson.embedbot.arguments.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package me.jakejmattson.embedbot.commands

import me.jakejmattson.embedbot.dataclasses.*
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.EmbedService
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.api.dsl.toEmbedBuilder
import me.aberrantfox.kjdautils.extensions.stdlib.trimToID
import me.aberrantfox.kjdautils.internal.arguments.*
import me.aberrantfox.kjdautils.internal.command.tryRetrieveSnowflake
import me.jakejmattson.embedbot.dataclasses.*
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.EmbedService
import net.dv8tion.jda.api.entities.*

@CommandSet("Copy")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package me.jakejmattson.embedbot.commands

import com.google.gson.JsonSyntaxException
import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.internal.arguments.*
import me.jakejmattson.embedbot.arguments.EmbedArg
import me.jakejmattson.embedbot.dataclasses.CopyLocation
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.internal.arguments.*
import net.dv8tion.jda.api.entities.TextChannel

@CommandSet("Core")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package me.jakejmattson.embedbot.commands

import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.internal.arguments.*
import me.jakejmattson.embedbot.arguments.EmbedArg
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.internal.arguments.*
import java.time.LocalDateTime

@CommandSet("Edit")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package me.jakejmattson.embedbot.commands

import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.internal.arguments.*
import me.jakejmattson.embedbot.arguments.*
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.internal.arguments.*

@CommandSet("Field")
fun fieldCommands() = commands {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package me.jakejmattson.embedbot.commands

import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.internal.arguments.RoleArg
import me.aberrantfox.kjdautils.internal.di.PersistenceService
import me.jakejmattson.embedbot.dataclasses.*
import me.jakejmattson.embedbot.extensions.requiredPermissionLevel
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.internal.arguments.RoleArg
import me.aberrantfox.kjdautils.internal.di.PersistenceService

@CommandSet("GuildConfiguration")
fun guildConfigurationCommands(configuration: Configuration,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package me.jakejmattson.embedbot.commands

import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.jakejmattson.embedbot.arguments.EmbedArg
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.command.*
import java.awt.Color

@CommandSet("Information")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package me.jakejmattson.embedbot.commands

import me.jakejmattson.embedbot.locale.messages
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.api.annotation.CommandSet
import me.aberrantfox.kjdautils.api.dsl.command.commands
import me.aberrantfox.kjdautils.extensions.stdlib.toMinimalTimeString
import me.jakejmattson.embedbot.locale.messages
import java.awt.Color
import java.util.Date

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package me.jakejmattson.embedbot.dataclasses

import me.aberrantfox.kjdautils.internal.command.tryRetrieveSnowflake
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.internal.command.tryRetrieveSnowflake
import net.dv8tion.jda.api.*
import net.dv8tion.jda.api.entities.*
import java.awt.Color
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package me.jakejmattson.embedbot.extensions

import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.command.*
import me.aberrantfox.kjdautils.internal.command.ArgumentResult
import me.jakejmattson.embedbot.services.*
import java.util.WeakHashMap

sealed class Result {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package me.jakejmattson.embedbot.preconditions

import me.aberrantfox.kjdautils.api.annotation.Precondition
import me.aberrantfox.kjdautils.internal.command.*
import me.jakejmattson.embedbot.extensions.*
import me.jakejmattson.embedbot.locale.messages
import me.aberrantfox.kjdautils.api.dsl.*
import me.aberrantfox.kjdautils.internal.command.*

@Precondition
fun produceHasLoadedEmbedPrecondition() = precondition {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package me.jakejmattson.embedbot.preconditions

import me.aberrantfox.kjdautils.api.annotation.Precondition
import me.aberrantfox.kjdautils.extensions.jda.toMember
import me.aberrantfox.kjdautils.internal.command.*
import me.jakejmattson.embedbot.extensions.requiredPermissionLevel
import me.jakejmattson.embedbot.locale.messages
import me.jakejmattson.embedbot.services.*
import me.aberrantfox.kjdautils.api.dsl.*
import me.aberrantfox.kjdautils.extensions.jda.toMember
import me.aberrantfox.kjdautils.internal.command.*

@Precondition
fun produceHasPermissionPrecondition(permissionsService: PermissionsService) = precondition {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package me.jakejmattson.embedbot.services

import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken
import me.aberrantfox.kjdautils.api.annotation.Service
import me.jakejmattson.embedbot.dataclasses.*
import me.jakejmattson.embedbot.extensions.*
import me.aberrantfox.kjdautils.api.annotation.Service
import net.dv8tion.jda.api.EmbedBuilder
import net.dv8tion.jda.api.entities.*
import java.io.File
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package me.jakejmattson.embedbot.services

import me.aberrantfox.kjdautils.api.annotation.Service
import me.jakejmattson.embedbot.commands.getFileSystemLocation
import me.jakejmattson.embedbot.dataclasses.*
import me.aberrantfox.kjdautils.api.annotation.Service
import org.kohsuke.github.GitHubBuilder
import java.io.*
import java.net.URL
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.jakejmattson.embedbot.services

import me.jakejmattson.embedbot.dataclasses.Configuration
import me.aberrantfox.kjdautils.api.annotation.Service
import me.jakejmattson.embedbot.dataclasses.Configuration
import net.dv8tion.jda.api.entities.Member

enum class Permission {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package me.jakejmattson.embedbot.services

import me.jakejmattson.embedbot.dataclasses.Configuration
import me.aberrantfox.kjdautils.api.annotation.Service
import me.aberrantfox.kjdautils.discord.Discord
import me.jakejmattson.embedbot.dataclasses.Configuration

@Service
class PrefixService(private val configuration: Configuration, private val discord: Discord) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package me.jakejmattson.embedbot.services

import com.google.gson.Gson
import me.jakejmattson.embedbot.dataclasses.Configuration
import me.jakejmattson.embedbot.extensions.requiredPermissionLevel
import me.jakejmattson.embedbot.locale.messages
import me.aberrantfox.kjdautils.api.annotation.Service
import me.aberrantfox.kjdautils.api.dsl.command.Command
import me.aberrantfox.kjdautils.api.dsl.embed
import me.aberrantfox.kjdautils.discord.Discord
import me.aberrantfox.kjdautils.extensions.jda.*
import me.jakejmattson.embedbot.dataclasses.Configuration
import me.jakejmattson.embedbot.extensions.requiredPermissionLevel
import me.jakejmattson.embedbot.locale.messages
import net.dv8tion.jda.api.entities.*
import java.awt.Color

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package me.jakejmattson.embedbot.services

import me.jakejmattson.embedbot.dataclasses.*
import me.jakejmattson.embedbot.locale.messages
import me.aberrantfox.kjdautils.api.annotation.Service
import me.aberrantfox.kjdautils.discord.Discord
import me.jakejmattson.embedbot.dataclasses.*
import me.jakejmattson.embedbot.locale.messages
import net.dv8tion.jda.api.entities.MessageEmbed

const val CHAR_LIMIT = MessageEmbed.EMBED_MAX_LENGTH_BOT
Expand Down

0 comments on commit 9436e49

Please sign in to comment.