diff --git a/src/main/java/de/presti/ree6/commands/CommandManager.java b/src/main/java/de/presti/ree6/commands/CommandManager.java index a05a54e12..05e0871f7 100644 --- a/src/main/java/de/presti/ree6/commands/CommandManager.java +++ b/src/main/java/de/presti/ree6/commands/CommandManager.java @@ -52,7 +52,7 @@ public CommandManager() throws CommandInitializerException, InstantiationExcepti Set> classes = reflections.getSubTypesOf(ICommand.class); for (Class aClass : classes) { - Main.getInstance().getAnalyticsLogger().info("Loading Command " + aClass.getSimpleName()); + Main.getInstance().getAnalyticsLogger().info("Loading Command {}", aClass.getSimpleName()); addCommand(aClass.getDeclaredConstructor().newInstance()); } } diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java b/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java index c938f8afd..e8b8b5eef 100644 --- a/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java +++ b/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java @@ -82,7 +82,7 @@ public String[] getAlias() { } /** - * Unmutes a Member. + * Unmute a Member. * @param executor The Executor. * @param member The Member to unmute. * @param commandEvent The CommandEvent. @@ -93,9 +93,8 @@ public void unmuteMember(Member executor, Member member, CommandEvent commandEve member.removeTimeout().onErrorFlatMap(throwable -> { Main.getInstance().getCommandManager().sendMessage("Could not unmute " + member.getUser().getAsTag() + "!", 5, commandEvent.getChannel(), commandEvent.getInteractionHook()); return null; - }).queue(unused -> { - Main.getInstance().getCommandManager().sendMessage("User " + member.getAsMention() + " was unmuted!", 5, commandEvent.getChannel(), commandEvent.getInteractionHook()); - }); + }).queue(unused -> + Main.getInstance().getCommandManager().sendMessage("User " + member.getAsMention() + " was unmuted!", 5, commandEvent.getChannel(), commandEvent.getInteractionHook())); Main.getInstance().getCommandManager().sendMessage("User " + member.getAsMention() + " has been unmuted!", 5, commandEvent.getChannel(), commandEvent.getInteractionHook()); } else { if (!executor.canInteract(member)) { diff --git a/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageMember.java b/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageMember.java index 3ef0f23e4..60a93a2e7 100644 --- a/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageMember.java +++ b/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageMember.java @@ -77,7 +77,7 @@ public LogMessageMember(long webhookId, String webhookAuthCode, WebhookMessage w * @param addedRoles the Added {@link Role} of the {@link Member}. */ public LogMessageMember(long webhookId, String webhookAuthCode, WebhookMessage webhookMessage, Guild guild, LogTyp logTyp, Member member, - ArrayList removedRoles, ArrayList addedRoles) { + List removedRoles, List addedRoles) { super(webhookId, webhookAuthCode, webhookMessage, guild, logTyp); this.member = member; this.removedRoles = removedRoles; diff --git a/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageVoice.java b/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageVoice.java index 512b58a26..47a008320 100644 --- a/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageVoice.java +++ b/src/main/java/de/presti/ree6/logger/events/implentation/LogMessageVoice.java @@ -74,17 +74,6 @@ public Member getMember() { return member; } - /** - * Change the associated Member of the Log. - * - * @deprecated Will be removed. - * @param member the new {@link Member}. - */ - @Deprecated(since = "1.7.7", forRemoval = true) - public void setMember(Member member) { - this.member = member; - } - /** * Get the previous {@link AudioChannel} of the {@link Member} * @@ -94,17 +83,6 @@ public AudioChannel getPreviousVoiceChannel() { return previousVoiceChannel; } - /** - * Change the previous {@link AudioChannel} of the {@link Member} - * - * @deprecated Will be removed. - * @param previousVoiceChannel the new previous {@link AudioChannel}. - */ - @Deprecated(since = "1.7.7", forRemoval = true) - public void setPreviousVoiceChannel(AudioChannel previousVoiceChannel) { - this.previousVoiceChannel = previousVoiceChannel; - } - /** * Get the current {@link AudioChannel} of the {@link Member} * @@ -113,15 +91,4 @@ public void setPreviousVoiceChannel(AudioChannel previousVoiceChannel) { public AudioChannel getCurrentVoiceChannel() { return currentVoiceChannel; } - - /** - * Change the current {@link AudioChannel} of the {@link Member} - * - * @deprecated Will be removed. - * @param currentVoiceChannel the new current {@link AudioChannel}. - */ - @Deprecated(since = "1.7.7", forRemoval = true) - public void setCurrentVoiceChannel(AudioChannel currentVoiceChannel) { - this.currentVoiceChannel = currentVoiceChannel; - } } diff --git a/src/main/java/de/presti/ree6/logger/invite/InviteContainer.java b/src/main/java/de/presti/ree6/logger/invite/InviteContainer.java index a296251d8..ea6a79db0 100644 --- a/src/main/java/de/presti/ree6/logger/invite/InviteContainer.java +++ b/src/main/java/de/presti/ree6/logger/invite/InviteContainer.java @@ -6,9 +6,19 @@ public class InviteContainer { /** - * information about the Invite. + * The ID of the Guild. */ - String creatorId, guildId, code; + String guildId; + + /** + * The ID of the creator. + */ + String creatorId; + + /** + * The Code of the Invite. + */ + String code; /** * The use count from our Database. diff --git a/src/main/java/de/presti/ree6/utils/apis/GoogleVisionAPI.java b/src/main/java/de/presti/ree6/utils/apis/GoogleVisionAPI.java index 658baaca1..fd9a02929 100644 --- a/src/main/java/de/presti/ree6/utils/apis/GoogleVisionAPI.java +++ b/src/main/java/de/presti/ree6/utils/apis/GoogleVisionAPI.java @@ -48,7 +48,7 @@ public static String[] retrieveTextFromImage(byte[] imageBytes) { for (AnnotateImageResponse res : responses) { if (res.hasError()) { - Main.getInstance().getAnalyticsLogger().error("Could not retrieve text from image: " + res.getError().getMessage()); + Main.getInstance().getAnalyticsLogger().error("Could not retrieve text from image: {}", res.getError().getMessage()); return new String[0]; } @@ -85,7 +85,7 @@ public static String[] retrieveTextFromImage(String fileUrl) { for (AnnotateImageResponse res : responses) { if (res.hasError()) { - Main.getInstance().getAnalyticsLogger().error("Could not retrieve text from image: " + res.getError().getMessage()); + Main.getInstance().getAnalyticsLogger().error("Could not retrieve text from image: {}", res.getError().getMessage()); return new String[0]; } diff --git a/src/main/java/de/presti/ree6/utils/data/Config.java b/src/main/java/de/presti/ree6/utils/data/Config.java index e91d33242..d6f6df2a2 100644 --- a/src/main/java/de/presti/ree6/utils/data/Config.java +++ b/src/main/java/de/presti/ree6/utils/data/Config.java @@ -1,5 +1,6 @@ package de.presti.ree6.utils.data; +import de.presti.ree6.main.Main; import org.simpleyaml.configuration.file.YamlFile; import java.io.File; @@ -54,12 +55,14 @@ public void init() { try { yamlFile.save(getFile()); - } catch (Exception ignored) { + } catch (Exception exception) { + Main.getInstance().getLogger().error("Could not save config file!", exception); } } else { try { yamlFile.load(); - } catch (Exception ignored) { + } catch (Exception exception) { + Main.getInstance().getLogger().error("Could not load config!",exception); } } } diff --git a/src/main/java/de/presti/ree6/utils/others/AutoRoleHandler.java b/src/main/java/de/presti/ree6/utils/others/AutoRoleHandler.java index 69790a93a..b86db8cdd 100644 --- a/src/main/java/de/presti/ree6/utils/others/AutoRoleHandler.java +++ b/src/main/java/de/presti/ree6/utils/others/AutoRoleHandler.java @@ -12,6 +12,15 @@ */ public class AutoRoleHandler { + /** + * Constructor should not be called, since it is a utility class that doesn't need an instance. + * + * @throws IllegalStateException it is a utility class. + */ + private AutoRoleHandler() { + throw new IllegalStateException("Utility class"); + } + /** * Check if a Member should get a rule, when joining the Guild, and if Ree6 has enough permissions. *