feat: JDA 5.0.0-alpha.19 に対応 (#337)

* chore: Changed pom.xml dependency

* feat: rename.shの適用

https://gist.github.com/MinnDevelopment/d086322fe85485816afceb95fe4d3374

* fix: 不要なインポート削除など

.github/workflows/qodana-quality.yml

@@ -28,8 +28,6 @@ jobs:
       - name: Qodana Scan
         uses: JetBrains/qodana-action@v2022.2.1
         with:
-          linter: jetbrains/qodana-jvm-community
-          fail-threshold: 100
           upload-result: true
 
       - uses: github/codeql-action/upload-sarif@v2

pom.xml

@@ -78,7 +78,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-alpha.18</version>
+            <version>5.0.0-alpha.20</version>
             <exclusions>
                 <exclusion>
                     <groupId>club.minnced</groupId>

qodana.yaml

@@ -0,0 +1,3 @@
+version: 1.0
+linter: jetbrains/qodana-jvm-community
+failThreshold: 100

src/main/java/com/jaoafa/javajaotan2/Main.java

@@ -23,7 +23,7 @@
 import com.jaoafa.javajaotan2.tasks.Task_SyncOtherServerPerm;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
-import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.requests.GatewayIntent;

src/main/java/com/jaoafa/javajaotan2/command/Cmd_Akakese.java

@@ -16,6 +16,7 @@
 import com.jaoafa.javajaotan2.Main;
 import com.jaoafa.javajaotan2.lib.JavajaotanLibrary;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
 import net.dv8tion.jda.api.utils.FileUpload;
 

src/main/java/com/jaoafa/javajaotan2/command/Cmd_Alpha.java

@@ -14,7 +14,7 @@
 import com.jagrosh.jdautilities.command.Command;
 import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jaoafa.javajaotan2.lib.CommandArgument;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 
 import java.util.Arrays;
 import java.util.Collections;

src/main/java/com/jaoafa/javajaotan2/command/Cmd_Bassline.java

@@ -17,7 +17,7 @@
 import com.jaoafa.javajaotan2.lib.CommandArgument;
 import com.jaoafa.javajaotan2.lib.JavajaotanLibrary;
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.entities.User;
 
 import java.util.regex.Matcher;

src/main/java/com/jaoafa/javajaotan2/command/Cmd_GameRole.java

@@ -15,7 +15,12 @@
 import com.jaoafa.javajaotan2.Main;
 import com.jaoafa.javajaotan2.lib.*;
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
 import org.json.JSONArray;
 import org.json.JSONException;

src/main/java/com/jaoafa/javajaotan2/command/Cmd_GenText.java

@@ -15,7 +15,7 @@
 import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jaoafa.javajaotan2.lib.CommandArgument;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/com/jaoafa/javajaotan2/command/Cmd_WatchEmoji.java

@@ -18,7 +18,11 @@
 import com.jaoafa.javajaotan2.lib.CommandWithActions;
 import com.jaoafa.javajaotan2.lib.WatchEmojis;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/com/jaoafa/javajaotan2/event/Event_AntiEnEn.java

@@ -14,7 +14,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Mentions;
-import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -23,11 +23,11 @@
 import java.util.List;
 
 public class Event_AntiEnEn extends ListenerAdapter {
-    List<Long> targetEmojis = List.of(
+    final List<Long> targetEmojis = List.of(
         1001788329756475433L, // :enen:
         1001788332939939901L // :hin:
     );
-    long cryingRoomId = 858282427746877440L;
+    final long cryingRoomId = 858282427746877440L;
 
     public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         if (event.getAuthor().isBot()) return;

src/main/java/com/jaoafa/javajaotan2/event/Event_CheckNitroEmoji.java

@@ -14,7 +14,11 @@
 import com.jaoafa.javajaotan2.Main;
 import com.jaoafa.javajaotan2.lib.JavajaotanLibrary;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
 import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
 import net.dv8tion.jda.api.events.emoji.EmojiAddedEvent;

src/main/java/com/jaoafa/javajaotan2/event/Event_GameRole.java

@@ -15,6 +15,7 @@
 import com.jaoafa.javajaotan2.lib.GameRole;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;

src/main/java/com/jaoafa/javajaotan2/event/Event_Greeting.java

@@ -15,7 +15,11 @@
 import com.jaoafa.javajaotan2.lib.Channels;
 import com.jaoafa.javajaotan2.lib.Roles;
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

src/main/java/com/jaoafa/javajaotan2/event/Event_JoinWhichInvite.java

@@ -17,7 +17,7 @@
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Invite;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.guild.invite.GuildInviteCreateEvent;
 import net.dv8tion.jda.api.events.guild.invite.GuildInviteDeleteEvent;

src/main/java/com/jaoafa/javajaotan2/event/Event_MeetingVote.java

@@ -18,7 +18,12 @@
 import com.jaoafa.javajaotan2.lib.MySQLDBManager;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.MessageType;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.entities.emoji.EmojiUnion;

src/main/java/com/jaoafa/javajaotan2/event/Event_VCSpeechLogLink.java

@@ -13,9 +13,9 @@
 
 import com.jaoafa.javajaotan2.Main;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;

src/main/java/com/jaoafa/javajaotan2/event/Event_WarnUsers.java

@@ -13,7 +13,7 @@
 
 import com.jaoafa.javajaotan2.lib.Channels;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;

src/main/java/com/jaoafa/javajaotan2/event/Event_WatchEmojis.java

@@ -17,7 +17,11 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.audit.ActionType;
 import net.dv8tion.jda.api.audit.AuditLogEntry;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
 import net.dv8tion.jda.api.events.emoji.EmojiAddedEvent;
 import net.dv8tion.jda.api.events.emoji.EmojiRemovedEvent;

src/main/java/com/jaoafa/javajaotan2/lib/Channels.java

@@ -12,7 +12,7 @@
 package com.jaoafa.javajaotan2.lib;
 
 import com.jaoafa.javajaotan2.Main;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.jetbrains.annotations.Nullable;
 
 public enum Channels {

src/main/java/com/jaoafa/javajaotan2/lib/CommandAction.java

@@ -175,8 +175,6 @@ public String getDescription() {
      *
      * @param cmd   呼び出し元のコマンド定義（this）
      * @param event CommandEvent
-     *
-     * @return 実行できたかどうか
      */
     public static void execute(CommandWithActions cmd, CommandEvent event) {
         Message message = event.getMessage();

src/main/java/com/jaoafa/javajaotan2/lib/JavajaotanLibrary.java

@@ -12,6 +12,7 @@
 package com.jaoafa.javajaotan2.lib;
 
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
 
 import java.util.regex.Matcher;

src/main/java/com/jaoafa/javajaotan2/lib/WatchEmojis.java

@@ -15,8 +15,8 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/jaoafa/javajaotan2/tasks/Task_CheckMailVerified.java

@@ -18,7 +18,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.quartz.Job;

src/main/java/com/jaoafa/javajaotan2/tasks/Task_MemberOrganize.java

@@ -18,7 +18,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import org.json.JSONArray;
 import org.json.JSONObject;

src/main/java/com/jaoafa/javajaotan2/tasks/Task_PermSync.java

@@ -18,7 +18,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.json.JSONObject;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;

src/main/java/com/jaoafa/javajaotan2/tasks/Task_SyncOtherServerPerm.java

@@ -18,7 +18,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;