More linting fixes

duncte123 · duncte123 · commit 1dcb298c8097 · 2026-02-16T12:53:25.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/bot/Dockerfile b/bot/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:21 AS builder
+FROM azul/zulu-openjdk-alpine:25 AS builder
 
 WORKDIR /skybot
 
@@ -11,7 +11,7 @@ ENV GIT_HASH=$git_sha
 COPY . .
 RUN ./gradlew --no-daemon :bot:build
 
-FROM azul/zulu-openjdk-alpine:21-jre
+FROM azul/zulu-openjdk-alpine:25-jre
 
 # add libstdc++ for playing back mp3's with lavaplayer
 # also add some fonts
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
@@ -35,9 +35,9 @@ plugins {
     id("com.github.breadmoirai.github-release")
 }
 
-val pmdVersion = "7.0.0-rc4"
+val pmdVersion = "7.21.0"
 
-val numberVersion = "3.109.4"
+val numberVersion = "3.110.0"
 
 project.group = "me.duncte123.skybot"
 project.version = "${numberVersion}_${getGitHash()}"
diff --git a/bot/linters/pmd.xml b/bot/linters/pmd.xml
@@ -46,6 +46,7 @@
         <exclude name="CommentDefaultAccessModifier"/>
         <exclude name="UselessParentheses"/>
         <exclude name="LinguisticNaming"/>
+        <exclude name="UseExplicitTypes"/>
     </rule>
 
     <rule ref="category/java/codestyle.xml/LongVariable">
@@ -66,8 +67,9 @@
         <exclude name="ExcessiveImports"/>
         <exclude name="TooManyMethods"/>
         <exclude name="NcssCount"/>
-        <exclude name="ExcessiveMethodLength"/>
+<!--        <exclude name="ExcessiveMethodLength"/>-->
         <exclude name="MutableStaticState"/>
+        <exclude name="AvoidDeeplyNestedIfStmts"/>
     </rule>
 
     <rule ref="category/java/design.xml/NPathComplexity">
@@ -110,6 +112,7 @@
     </rule>-->
 
     <rule ref="category/java/errorprone.xml">
+        <exclude name="AvoidCatchingGenericException"/>
         <exclude name="AvoidCatchingThrowable"/>
         <exclude name="AssignmentToNonFinalStatic"/>
         <exclude name="CallSuperFirst"/>
@@ -128,6 +131,7 @@
 
     <rule ref="category/java/multithreading.xml">
         <exclude name="DoNotUseThreads"/>
+        <exclude name="AvoidSynchronizedStatement"/>
     </rule>
 
     <rule ref="category/java/performance.xml">
diff --git a/bot/src/main/java/me/duncte123/skybot/CommandManager.java b/bot/src/main/java/me/duncte123/skybot/CommandManager.java
@@ -24,11 +24,12 @@
 import me.duncte123.botcommons.messaging.MessageConfig;
 import me.duncte123.skybot.commands.admin.BlackListCommand;
 import me.duncte123.skybot.commands.admin.VcAutoRoleCommand;
-import me.duncte123.skybot.commands.animals.*;
+import me.duncte123.skybot.commands.animals.SealCommand;
 import me.duncte123.skybot.commands.essentials.*;
 import me.duncte123.skybot.commands.essentials.eval.EvalCommand;
 import me.duncte123.skybot.commands.funCmds.*;
-import me.duncte123.skybot.commands.funcmds.*;
+import me.duncte123.skybot.commands.funcmds.ExplosmCommand;
+import me.duncte123.skybot.commands.funcmds.LoadingBarCommand;
 import me.duncte123.skybot.commands.guild.GuildInfoCommand;
 import me.duncte123.skybot.commands.guild.GuildJoinsCommand;
 import me.duncte123.skybot.commands.guild.mod.*;
@@ -37,15 +38,12 @@
 import me.duncte123.skybot.commands.guild.owner.LockEmoteCommand;
 import me.duncte123.skybot.commands.guild.owner.UnlockEmoteCommand;
 import me.duncte123.skybot.commands.guild.owner.settings.*;
-import me.duncte123.skybot.commands.image.*;
-import me.duncte123.skybot.commands.image.filter.*;
 import me.duncte123.skybot.commands.mod.*;
 import me.duncte123.skybot.commands.music.*;
 import me.duncte123.skybot.commands.uncategorized.*;
 import me.duncte123.skybot.commands.utils.EmoteCommand;
 import me.duncte123.skybot.commands.utils.EnlargeCommand;
 import me.duncte123.skybot.commands.utils.RoleInfoCommand;
-import me.duncte123.skybot.commands.weeb.*;
 import me.duncte123.skybot.entities.jda.DunctebotGuild;
 import me.duncte123.skybot.objects.SlashSupport;
 import me.duncte123.skybot.objects.command.*;
@@ -80,8 +78,8 @@
 import java.util.stream.Collectors;
 
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
-import static me.duncte123.skybot.utils.ThreadUtils.runOnVirtual;
 import static me.duncte123.skybot.utils.AirUtils.setJDAContext;
+import static me.duncte123.skybot.utils.ThreadUtils.runOnVirtual;
 import static net.dv8tion.jda.api.requests.ErrorResponse.MISSING_ACCESS;
 import static net.dv8tion.jda.api.requests.ErrorResponse.UNKNOWN_CHANNEL;
 
@@ -269,7 +267,7 @@ public CommandManager(Variables variables) {
         this.addCommand(new StatsCommand());
         this.addCommand(new StopCommand());
         this.addCommand(new SuggestCommand());
-        this.addCommand(new TagCommand(variables));
+//        this.addCommand(new TagCommand(variables));
         this.addCommand(new TempBanCommand());
         this.addCommand(new TempMuteCommand());
 //        this.addCommand(new TestFilterCommand());
@@ -317,7 +315,7 @@ public Collection<ICommand<CommandContext>> getCommands() {
     public List<ICommand<CommandContext>> getCommands(CommandCategory category) {
         return this.commands.values()
             .stream()
-            .filter((c) -> c.getCategory().equals(category))
+            .filter((c) -> c.getCategory() == category)
             .collect(Collectors.toList());
     }
 
diff --git a/bot/src/main/java/me/duncte123/skybot/EventManager.java b/bot/src/main/java/me/duncte123/skybot/EventManager.java
@@ -80,7 +80,6 @@ public void unregister(@Nonnull Object listener) {
     }
 
 
-    @SuppressWarnings("PMD.InvalidLogMessageFormat") // /shrug
     @Override
     public void handle(@Nonnull GenericEvent event) {
         final JDA.ShardInfo shardInfo = event.getJDA().getShardInfo();
diff --git a/bot/src/main/java/me/duncte123/skybot/Settings.java b/bot/src/main/java/me/duncte123/skybot/Settings.java
@@ -18,7 +18,7 @@
 
 package me.duncte123.skybot;
 
-@SuppressWarnings({"PMD.FieldNamingConventions", "PMD.ClassNamingConventions"})
+@SuppressWarnings({"PMD.FieldNamingConventions"})
 public class Settings {
     public static String PREFIX = "db!";
     public static boolean AUTO_REBOOT_SHARDS = true; // set to false if shards are rebooted when they shouldn't be
diff --git a/bot/src/main/java/me/duncte123/skybot/Variables.java b/bot/src/main/java/me/duncte123/skybot/Variables.java
@@ -66,7 +66,6 @@ public final class Variables {
     private final WeebApi weebApi;
     private final DunctebotConfig config;
     private AbstractDatabase database;
-    @SuppressWarnings("PMD.UseConcurrentHashMap")
     private final DBMap<Long, GuildSetting> guildSettingsCache = new DBMap<>(ExpiringMap.builder()
         .expirationPolicy(ExpirationPolicy.ACCESSED)
         .expiration(12, TimeUnit.HOURS)
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/essentials/TokenCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/essentials/TokenCommand.java
@@ -80,6 +80,7 @@ public void execute(@Nonnull CommandContext ctx) {
         sendMsg(ctx, String.format("Invalid token: (%s) %s", errorType, errorMessage));
     }
 
+    @SuppressWarnings("PMD.ReplaceJavaUtilCalendar") // will do in the future
     @Nullable
     private OffsetDateTime toTimeStamp(long input) {
         try {
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/essentials/WolframAlphaCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/essentials/WolframAlphaCommand.java
@@ -40,6 +40,7 @@
 
 import static me.duncte123.skybot.utils.AirUtils.shortenUrl;
 
+@SuppressWarnings("PMD.UnusedPrivateMethod")
 public class WolframAlphaCommand extends Command {
 
     private WAEngine waEngine = null;
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/funcmds/TagCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/funcmds/TagCommand.java
@@ -26,11 +26,11 @@
 import me.duncte123.skybot.objects.command.CommandContext;
 import me.duncte123.skybot.utils.MapUtils;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.utils.FileUpload;
 
 import javax.annotation.Nonnull;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -65,7 +65,6 @@ public TagCommand(Variables variables) {
     }
 
     @Override
-    @SuppressWarnings("PMD.NPathComplexity") // this will be rewritten some day
     public void execute(@Nonnull CommandContext ctx) {
         if ("tags".equalsIgnoreCase(ctx.getInvoke())) {
             sendTagsList(ctx);
@@ -214,7 +213,7 @@ private void sendTagsList(CommandContext ctx) {
             return;
         }
 
-        final byte[] tagContent = ("[\"" + String.join("\", \"", this.tagStore.keySet()) + "\"]").getBytes();
+        final byte[] tagContent = ("[\"" + String.join("\", \"", this.tagStore.keySet()) + "\"]").getBytes(StandardCharsets.UTF_8);
 
         ctx.getChannel()
             .sendFiles(FileUpload.fromData(
@@ -267,12 +266,6 @@ private void removeTag(CommandContext ctx, String tagName) {
     }
 
     private void createTag(CommandContext ctx) {
-        if (!isTagPatron(ctx.getMember())) {
-            sendMsg(ctx, "Sorry, this is no longer possible");
-
-            return;
-        }
-
         final List<String> args = ctx.getArgs();
         final String tagName = args.get(1);
 
@@ -306,9 +299,4 @@ private void createTag(CommandContext ctx) {
             sendMsg(ctx, String.format("Tag `%s` created", tagName));
         });
     }
-
-    @Deprecated
-    private boolean isTagPatron(Member member) {
-        return false;
-    }
 }
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/guild/GuildInfoCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/guild/GuildInfoCommand.java
@@ -89,7 +89,6 @@ public void execute(@Nonnull CommandContext ctx) {
             sendGuildInfoEmbed(ctx, "");
     }
 
-    @SuppressWarnings("PMD.ConfusingTernary")
     private void sendGuildInfoEmbed(CommandContext ctx, String inviteString) {
         final Guild guild = ctx.getJDAGuild();
         final double[] ratio = GuildUtils.getBotRatio(guild);
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/guild/mod/CleanupCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/guild/mod/CleanupCommand.java
@@ -277,7 +277,7 @@ private void handleComplete(int count, CommandContext ctx) {
      *
      * @return the future with a different timeout
      */
-    @SuppressWarnings({"rawtypes", "unchecked", "PMD.AvoidAccessibilityAlteration"})
+    @SuppressWarnings({"rawtypes", "unchecked", "PMD.AvoidAccessibilityAlteration", "PMD.UnnecessaryCast"})
     private CompletableFuture<Void> hackTimeout(CompletableFuture<Void> future) {
         if (!(future instanceof RestFuture)) {
             // Ignore stuff that is not a rest future
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/guild/owner/CustomCommandCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/guild/owner/CustomCommandCommand.java
@@ -53,7 +53,6 @@ public CustomCommandCommand() {
     }
 
 
-    @SuppressWarnings("PMD.SwitchStmtsShouldHaveDefault") // SIGH, it has a default
     @Override
     public void execute(@Nonnull CommandContext ctx) {
         final List<String> args = ctx.getArgsWithQuotes();
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/guild/owner/settings/SettingsBase.java b/bot/src/main/java/me/duncte123/skybot/commands/guild/owner/settings/SettingsBase.java
@@ -31,7 +31,7 @@
 
 abstract class SettingsBase extends Command {
 
-    public SettingsBase() {
+    protected SettingsBase() {
         this.displayAliasesInHelp = true;
         // TODO: Delete this and all old settings commands in about a year
         this.category = CommandCategory.UNLISTED;
diff --git a/bot/src/main/java/me/duncte123/skybot/commands/uncategorized/ChangeLogCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/uncategorized/ChangeLogCommand.java
@@ -93,6 +93,7 @@ private void fetchLatetstGitHubCommits(CommandContext ctx) {
         });
     }
 
+    @SuppressWarnings("PMD.ReplaceJavaUtilDate") // in the future
     private long parseTimeStamp(String timestamp) {
         try {
             final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
diff --git a/bot/src/main/java/me/duncte123/skybot/listeners/GuildListener.java b/bot/src/main/java/me/duncte123/skybot/listeners/GuildListener.java
@@ -156,7 +156,6 @@ private void onGuildVoiceJoin(GuildVoiceJoinEvent event) {
         handleVcAutoRole(guild, member, channel, false);
     }*/
 
-    @SuppressWarnings("PMD.ConfusingTernary")
     private void onGuildVoiceMove(GuildVoiceUpdateEvent event) {
         final Guild guild = event.getGuild();
         final AudioChannel channelLeft = event.getChannelLeft();
diff --git a/bot/src/main/java/me/duncte123/skybot/listeners/GuildMemberListener.java b/bot/src/main/java/me/duncte123/skybot/listeners/GuildMemberListener.java
@@ -22,7 +22,6 @@
 import com.jagrosh.jagtag.Parser;
 import kotlin.Pair;
 import me.duncte123.botcommons.messaging.MessageConfig;
-import me.duncte123.skybot.Settings;
 import me.duncte123.skybot.Variables;
 import me.duncte123.skybot.database.AbstractDatabase;
 import me.duncte123.skybot.entities.jda.DunctebotGuild;
@@ -33,7 +32,6 @@
 import me.duncte123.skybot.utils.GuildSettingsUtils;
 import me.duncte123.skybot.utils.GuildUtils;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.audit.ActionType;
 import net.dv8tion.jda.api.audit.AuditLogEntry;
@@ -44,8 +42,6 @@
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
-import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent;
-import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent;
 import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdatePendingEvent;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
 import net.dv8tion.jda.api.utils.TimeFormat;
@@ -77,10 +73,6 @@ public void onEvent(@Nonnull GenericEvent event) {
             this.onGuildMemberUpdatePending(pendingUpdate);
         } else if (event instanceof GuildMemberRemoveEvent memberRemove) {
             this.onGuildMemberRemove(memberRemove);
-        } else if (event instanceof GuildMemberRoleRemoveEvent roleRemove) {
-            this.onGuildMemberRoleRemove(roleRemove);
-        } else if (event instanceof GuildMemberRoleAddEvent roleAdd) {
-            this.onGuildMemberRoleAdd(roleAdd);
         } else if (event instanceof GuildLeaveEvent guildLeave) {
             final Guild guild = guildLeave.getGuild();
             final long guildId = guild.getIdLong();
@@ -189,28 +181,14 @@ private void onGuildMemberRemove(GuildMemberRemoveEvent event) {
             final String msg = parseGuildVars(settings.getCustomLeaveMessage(), event);
 
             // If we have a message and the text channel is not null
-            if (!msg.isEmpty() && !msg.trim().isEmpty() && channel != null) {
+            if (!msg.isBlank() && channel != null) {
                 sendMsg(
                     new MessageConfig.Builder()
                         .setChannel(channel)
                         .setMessage(msg)
                 );
             }
         }
-
-        if (guildId == Settings.SUPPORT_GUILD_ID) {
-            handlePatronRemoval(user.getIdLong(), event.getJDA());
-        }
-    }
-
-    @Deprecated
-    private void onGuildMemberRoleRemove(GuildMemberRoleRemoveEvent event) {
-        //
-    }
-
-    @Deprecated
-    private void onGuildMemberRoleAdd(GuildMemberRoleAddEvent event) {
-        //
     }
 
     private void logMemberNotification(User user, Guild guild, String titlePart, String bodyPart, int colour) {
@@ -379,16 +357,6 @@ private String parseGuildVars(String rawMessage, GenericGuildEvent event) {
         return message;
     }
 
-    @Deprecated
-    private void handlePatronRemoval(long userId, JDA jda) {
-        //
-    }
-
-    @Deprecated
-    private void handleNewOneGuildPatron(long userId) {
-       //
-    }
-
     private void applyAutoRole(Guild guild, Member member, GuildSetting settings) {
         final Role role = guild.getRoleById(settings.getAutoroleRole());
 
diff --git a/bot/src/main/java/me/duncte123/skybot/listeners/InviteTrackingListener.java b/bot/src/main/java/me/duncte123/skybot/listeners/InviteTrackingListener.java
@@ -22,7 +22,6 @@
 import me.duncte123.skybot.Variables;
 import me.duncte123.skybot.entities.jda.DunctebotGuild;
 import me.duncte123.skybot.objects.discord.InviteData;
-import me.duncte123.skybot.utils.CommandUtils;
 import me.duncte123.skybot.utils.GuildSettingsUtils;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
diff --git a/bot/src/main/java/me/duncte123/skybot/listeners/MessageListener.java b/bot/src/main/java/me/duncte123/skybot/listeners/MessageListener.java
@@ -62,6 +62,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -211,7 +212,7 @@ protected void onMessageBulkDelete(final MessageBulkDeleteEvent event) {
                         .setActionConfig(
                             (action) -> action.addFiles(
                                 FileUpload.fromData(
-                                    builder.toString().getBytes(),
+                                    builder.toString().getBytes(StandardCharsets.UTF_8),
                                     "bulk_delete_%s.txt".formatted(System.currentTimeMillis())
                                 )
                             )
diff --git a/bot/src/main/java/me/duncte123/skybot/listeners/ReadyShutdownListener.java b/bot/src/main/java/me/duncte123/skybot/listeners/ReadyShutdownListener.java
diff --git a/bot/src/main/java/me/duncte123/skybot/objects/Emotes.java b/bot/src/main/java/me/duncte123/skybot/objects/Emotes.java
diff --git a/bot/src/main/java/me/duncte123/skybot/objects/config/DunctebotConfig.java b/bot/src/main/java/me/duncte123/skybot/objects/config/DunctebotConfig.java
diff --git a/bot/src/main/java/me/duncte123/skybot/objects/discord/MessageData.java b/bot/src/main/java/me/duncte123/skybot/objects/discord/MessageData.java
diff --git a/bot/src/main/java/me/duncte123/skybot/objects/jagtag/DiscordMethods.java b/bot/src/main/java/me/duncte123/skybot/objects/jagtag/DiscordMethods.java
diff --git a/bot/src/main/java/me/duncte123/skybot/objects/user/FakeUser.java b/bot/src/main/java/me/duncte123/skybot/objects/user/FakeUser.java
diff --git a/bot/src/main/kotlin/me/duncte123/skybot/entities/jda/FakeMember.kt b/bot/src/main/kotlin/me/duncte123/skybot/entities/jda/FakeMember.kt

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ plugins {`
`35`	`35`	`id("com.github.breadmoirai.github-release")`
`36`	`36`	`}`
`37`	`37`
`38`		`-val pmdVersion = "7.0.0-rc4"`
	`38`	`+val pmdVersion = "7.21.0"`
`39`	`39`
`40`		`-val numberVersion = "3.109.4"`
	`40`	`+val numberVersion = "3.110.0"`
`41`	`41`
`42`	`42`	`project.group = "me.duncte123.skybot"`
`43`	`43`	`project.version = "${numberVersion}_${getGitHash()}"`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ public void unregister(@Nonnull Object listener) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`
`83`		`- @SuppressWarnings("PMD.InvalidLogMessageFormat") // /shrug`
`84`	`83`	`@Override`
`85`	`84`	`public void handle(@Nonnull GenericEvent event) {`
`86`	`85`	`final JDA.ShardInfo shardInfo = event.getJDA().getShardInfo();`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ public void execute(@Nonnull CommandContext ctx) {`
`80`	`80`	`sendMsg(ctx, String.format("Invalid token: (%s) %s", errorType, errorMessage));`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ @SuppressWarnings("PMD.ReplaceJavaUtilCalendar") // will do in the future`
`83`	`84`	`@Nullable`
`84`	`85`	`private OffsetDateTime toTimeStamp(long input) {`
`85`	`86`	`try {`