From 2d7cadea0254ca6a526e6e849244e9303f6c9c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= Date: Tue, 20 Dec 2022 03:17:32 +0100 Subject: [PATCH] Optimize imports --- pom.xml | 6 +++++- .../beatrice/hidekobot/commands/base/ClearChat.java | 1 - .../hidekobot/commands/base/UrbanDictionary.java | 1 - .../hidekobot/commands/message/AvatarCommand.java | 1 - .../commands/message/LoveCalculatorCommand.java | 2 -- .../hidekobot/commands/message/MagicBallCommand.java | 1 + .../hidekobot/commands/message/SayCommand.java | 2 -- .../commands/message/UrbanDictionaryCommand.java | 12 +++--------- .../hidekobot/commands/slash/AvatarCommand.java | 2 -- .../hidekobot/commands/slash/MagicBallCommand.java | 1 - .../hidekobot/commands/slash/SayCommand.java | 1 - .../commands/slash/UrbanDictionaryCommand.java | 3 --- .../listeners/ButtonInteractionListener.java | 1 - 13 files changed, 9 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 6e15a75..87d4335 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,11 @@ commons-text 1.10.0 - + + com.vdurmont + emoji-java + 5.1.1 + diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java b/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java index 828787b..d83fef0 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java @@ -3,7 +3,6 @@ package wtf.beatrice.hidekobot.commands.base; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageHistory; -import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.Channel; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/base/UrbanDictionary.java b/src/main/java/wtf/beatrice/hidekobot/commands/base/UrbanDictionary.java index e933537..a1cfd92 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/base/UrbanDictionary.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/base/UrbanDictionary.java @@ -12,7 +12,6 @@ import net.dv8tion.jda.api.interactions.components.buttons.Button; import org.apache.commons.lang3.SerializationException; import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.text.WordUtils; -import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import wtf.beatrice.hidekobot.Cache; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java index bbf0208..a5245ed 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java @@ -1,7 +1,6 @@ package wtf.beatrice.hidekobot.commands.message; import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.IMentionable; import net.dv8tion.jda.api.entities.Mentions; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java index 3808810..ae3d93b 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java @@ -9,12 +9,10 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.jetbrains.annotations.Nullable; import wtf.beatrice.hidekobot.Cache; import wtf.beatrice.hidekobot.HidekoBot; -import wtf.beatrice.hidekobot.commands.base.Say; import wtf.beatrice.hidekobot.objects.commands.MessageCommand; import wtf.beatrice.hidekobot.util.RandomUtil; import java.util.Arrays; -import java.util.Collections; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java index 8b70cf0..e2de3ea 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java @@ -5,6 +5,7 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.jetbrains.annotations.Nullable; import wtf.beatrice.hidekobot.commands.base.MagicBall; import wtf.beatrice.hidekobot.objects.commands.MessageCommand; + import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java index 27e3751..631bdef 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java @@ -1,10 +1,8 @@ package wtf.beatrice.hidekobot.commands.message; import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.jetbrains.annotations.Nullable; -import wtf.beatrice.hidekobot.commands.base.ClearChat; import wtf.beatrice.hidekobot.commands.base.Say; import wtf.beatrice.hidekobot.objects.commands.MessageCommand; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java index 59b7550..df73528 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java @@ -2,24 +2,18 @@ package wtf.beatrice.hidekobot.commands.message; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.MessageEmbed; -import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import net.dv8tion.jda.api.interactions.components.ActionRow; -import net.dv8tion.jda.api.interactions.components.ItemComponent; import net.dv8tion.jda.api.interactions.components.buttons.Button; -import org.apache.commons.text.StringEscapeUtils; import org.jetbrains.annotations.Nullable; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import wtf.beatrice.hidekobot.Cache; import wtf.beatrice.hidekobot.commands.base.UrbanDictionary; -import wtf.beatrice.hidekobot.datasources.DatabaseSource; import wtf.beatrice.hidekobot.objects.commands.MessageCommand; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.LinkedList; +import java.util.List; public class UrbanDictionaryCommand implements MessageCommand { diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java index 7281212..5cb06d7 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java @@ -1,6 +1,5 @@ package wtf.beatrice.hidekobot.commands.slash; -import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; @@ -9,7 +8,6 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.CommandData; import net.dv8tion.jda.api.interactions.commands.build.Commands; import org.jetbrains.annotations.NotNull; -import wtf.beatrice.hidekobot.Cache; import wtf.beatrice.hidekobot.commands.base.Avatar; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java index b6526b6..b2d7a8d 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java @@ -1,7 +1,6 @@ package wtf.beatrice.hidekobot.commands.slash; import net.dv8tion.jda.api.entities.MessageEmbed; -import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java index 6e5b9cb..f72da75 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java @@ -1,6 +1,5 @@ package wtf.beatrice.hidekobot.commands.slash; -import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java index 41dc954..00d29b4 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java @@ -1,6 +1,5 @@ package wtf.beatrice.hidekobot.commands.slash; -import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; @@ -8,13 +7,11 @@ import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.CommandData; import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.interactions.components.ActionRow; -import net.dv8tion.jda.api.interactions.components.LayoutComponent; import net.dv8tion.jda.api.interactions.components.buttons.Button; import org.jetbrains.annotations.NotNull; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; -import wtf.beatrice.hidekobot.Cache; import wtf.beatrice.hidekobot.commands.base.UrbanDictionary; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; diff --git a/src/main/java/wtf/beatrice/hidekobot/listeners/ButtonInteractionListener.java b/src/main/java/wtf/beatrice/hidekobot/listeners/ButtonInteractionListener.java index dc73b7f..dca38bd 100644 --- a/src/main/java/wtf/beatrice/hidekobot/listeners/ButtonInteractionListener.java +++ b/src/main/java/wtf/beatrice/hidekobot/listeners/ButtonInteractionListener.java @@ -5,7 +5,6 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter; import wtf.beatrice.hidekobot.commands.base.ClearChat; import wtf.beatrice.hidekobot.commands.base.CoinFlip; import wtf.beatrice.hidekobot.commands.base.UrbanDictionary; -import wtf.beatrice.hidekobot.commands.message.UrbanDictionaryCommand; public class ButtonInteractionListener extends ListenerAdapter {