Merge pull request #223 from book000/feat/disable-sent2join-option

feat: メッセージがVCテキストチャンネルに送信された場合に自動参加する機能の無効化オプションを追加
jaoafa · Jul 10, 2023 · 4a3a49f · 4a3a49f
2 parents 9cc81bc + 5296082
commit 4a3a49f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/jaoafa/jdavcspeaker/Event/Event_SpeakVCText.java b/src/main/java/com/jaoafa/jdavcspeaker/Event/Event_SpeakVCText.java
@@ -1,6 +1,7 @@
 package com.jaoafa.jdavcspeaker.Event;
 
 import com.jaoafa.jdavcspeaker.Lib.*;
+import com.jaoafa.jdavcspeaker.Main;
 import com.jaoafa.jdavcspeaker.MessageProcessor.BaseProcessor;
 import com.jaoafa.jdavcspeaker.MessageProcessor.ProcessorType;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -53,9 +54,10 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
             guild.getSelfMember().getVoiceState().getChannel() == null) {
             // 自身がどこにも入っていない場合
 
-            if (member.getVoiceState() != null &&
+            if (!Main.getArgs().isDisableAutoJoinByMessage &&
+                member.getVoiceState() != null &&
                 member.getVoiceState().getChannel() != null) {
-                // メッセージ送信者がどこかのVCに入っている場合
+                // メッセージ送信者がどこかのVCに入っている場合（機能が有効な場合に限る）
 
                 guild.getAudioManager().openAudioConnection(member.getVoiceState().getChannel()); // 参加
                 if (MultipleServer.getVCChannel(guild) != null) {

diff --git a/src/main/java/com/jaoafa/jdavcspeaker/Lib/VCSpeakerArgs.java b/src/main/java/com/jaoafa/jdavcspeaker/Lib/VCSpeakerArgs.java
@@ -23,9 +23,13 @@ public class VCSpeakerArgs {
     public boolean isOnlyRemoveCmd;
 
     @Option(name = "--disable-auto-join",
-            usage = "VCへの自動参加を無効化")
+            usage = "ユーザのVC参加によるVCへの自動参加を無効化")
     public boolean isDisableAutoJoin;
 
+    @Option(name = "--disable-auto-join-by-message",
+            usage = "メッセージ送信によるVCへの自動参加を無効化")
+    public boolean isDisableAutoJoinByMessage;
+
     @Option(name = "--disable-auto-move",
             usage = "VC間の自動移動を無効化")
     public boolean isDisableAutoMove;