Another smol refactor

LorittaBot · May 11, 2024 · b273276 · b273276
1 parent 9fa6650
commit b273276
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/...rfectdreams/loritta/cinnamon/discord/interactions/vanilla/social/xprank/XpRankExecutor.kt b/...rfectdreams/loritta/cinnamon/discord/interactions/vanilla/social/xprank/XpRankExecutor.kt
@@ -6,7 +6,6 @@ import dev.kord.rest.Image
 import net.perfectdreams.discordinteraktions.common.builder.message.MessageBuilder
 import net.perfectdreams.discordinteraktions.common.builder.message.actionRow
 import net.perfectdreams.discordinteraktions.common.commands.options.SlashCommandArguments
-import net.perfectdreams.loritta.morenitta.LorittaBot
 import net.perfectdreams.loritta.cinnamon.discord.interactions.InteractionContext
 import net.perfectdreams.loritta.cinnamon.discord.interactions.commands.ApplicationCommandContext
 import net.perfectdreams.loritta.cinnamon.discord.interactions.commands.CinnamonSlashCommandExecutor
@@ -17,11 +16,13 @@ import net.perfectdreams.loritta.cinnamon.discord.interactions.components.intera
 import net.perfectdreams.loritta.cinnamon.discord.interactions.components.loriEmoji
 import net.perfectdreams.loritta.cinnamon.discord.interactions.vanilla.economy.declarations.SonhosCommand
 import net.perfectdreams.loritta.cinnamon.discord.interactions.vanilla.social.declarations.XpCommand
-import net.perfectdreams.loritta.cinnamon.discord.utils.*
 import net.perfectdreams.loritta.cinnamon.discord.utils.images.ImageFormatType
 import net.perfectdreams.loritta.cinnamon.discord.utils.images.ImageUtils.toByteArray
+import net.perfectdreams.loritta.cinnamon.discord.utils.toLong
 import net.perfectdreams.loritta.cinnamon.emotes.Emotes
 import net.perfectdreams.loritta.cinnamon.pudding.tables.servers.GuildProfiles
+import net.perfectdreams.loritta.morenitta.LorittaBot
+import net.perfectdreams.loritta.morenitta.utils.ExperienceUtils
 import net.perfectdreams.loritta.morenitta.utils.RankingGenerator
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.and

diff --git a/...scord/src/main/kotlin/net/perfectdreams/loritta/cinnamon/discord/utils/ExperienceUtils.kt b/...scord/src/main/kotlin/net/perfectdreams/loritta/cinnamon/discord/utils/ExperienceUtils.kt
diff --git a/.../main/kotlin/net/perfectdreams/loritta/morenitta/interactions/vanilla/social/XpCommand.kt b/.../main/kotlin/net/perfectdreams/loritta/morenitta/interactions/vanilla/social/XpCommand.kt
@@ -1,7 +1,6 @@
 package net.perfectdreams.loritta.morenitta.interactions.vanilla.social
 
 import dev.minn.jda.ktx.messages.InlineMessage
-import dev.minn.jda.ktx.messages.MessageEdit
 import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.entities.Guild
 import net.dv8tion.jda.api.entities.Member
@@ -14,7 +13,6 @@ import net.perfectdreams.i18nhelper.core.keydata.StringI18nData
 import net.perfectdreams.loritta.cinnamon.discord.interactions.commands.styled
 import net.perfectdreams.loritta.cinnamon.discord.interactions.vanilla.economy.declarations.SonhosCommand
 import net.perfectdreams.loritta.cinnamon.discord.interactions.vanilla.social.declarations.XpCommand
-import net.perfectdreams.loritta.cinnamon.discord.utils.ExperienceUtils
 import net.perfectdreams.loritta.cinnamon.discord.utils.images.ImageFormatType
 import net.perfectdreams.loritta.cinnamon.discord.utils.images.ImageUtils.toByteArray
 import net.perfectdreams.loritta.cinnamon.emotes.Emotes
@@ -31,11 +29,8 @@ import net.perfectdreams.loritta.morenitta.interactions.UnleashedContext
 import net.perfectdreams.loritta.morenitta.interactions.commands.*
 import net.perfectdreams.loritta.morenitta.interactions.commands.options.ApplicationCommandOptions
 import net.perfectdreams.loritta.morenitta.interactions.commands.options.OptionReference
-import net.perfectdreams.loritta.morenitta.utils.Constants
-import net.perfectdreams.loritta.morenitta.utils.ImageFormat
-import net.perfectdreams.loritta.morenitta.utils.RankingGenerator
+import net.perfectdreams.loritta.morenitta.utils.*
 import net.perfectdreams.loritta.morenitta.utils.extensions.getIconUrl
-import net.perfectdreams.loritta.morenitta.utils.normalize
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.and

diff --git a/...-bot-discord/src/main/kotlin/net/perfectdreams/loritta/morenitta/utils/ExperienceUtils.kt b/...-bot-discord/src/main/kotlin/net/perfectdreams/loritta/morenitta/utils/ExperienceUtils.kt
@@ -17,6 +17,8 @@ object ExperienceUtils {
         return getLevelExperience(lvl) - currentExperience
     }
 
+    fun getCurrentLevelForXp(xp: Long) = (xp / 1000).toInt()
+
     suspend fun getExperienceCustomTokens(loritta: LorittaBot, config: ServerConfig, member: Member): Map<String, String> {
         val customTokens = mutableMapOf<String, String>()