Merge branch 'main' into feat/arm64-support

jaoafa · Aug 12, 2023 · 53ed798 · 53ed798
2 parents 1e65bcf + 27619b8
commit 53ed798
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/jaoafa/jdavcspeaker/Command/Cmd_Vcname.java b/src/main/java/com/jaoafa/jdavcspeaker/Command/Cmd_Vcname.java
@@ -45,7 +45,7 @@ public void hooker(JDA jda, Guild guild,
 
 
     void save(Member member, SlashCommandInteractionEvent event) {
-        if (!member.getId().equals("492088741167366144") && !member.hasPermission(Permission.ADMINISTRATOR)) {
+        if (!member.hasPermission(Permission.MANAGE_SERVER)) {
             event.replyEmbeds(new EmbedBuilder()
                 .setTitle(":no_pedestrians: 実行する権限がありません！")
                 .setColor(LibEmbedColor.error)
@@ -90,7 +90,7 @@ void save(Member member, SlashCommandInteractionEvent event) {
     }
 
     void saveall(Guild guild, Member member, SlashCommandInteractionEvent event) {
-        if (!member.getId().equals("492088741167366144") && !member.hasPermission(Permission.ADMINISTRATOR)) {
+        if (!member.hasPermission(Permission.MANAGE_SERVER)) {
             event.replyEmbeds(new EmbedBuilder()
                 .setTitle(":no_pedestrians: 実行する権限がありません！")
                 .setColor(LibEmbedColor.error)

diff --git a/src/main/java/com/jaoafa/jdavcspeaker/Command/Cmd_Vcspeaker.java b/src/main/java/com/jaoafa/jdavcspeaker/Command/Cmd_Vcspeaker.java
@@ -29,7 +29,7 @@ public class Cmd_Vcspeaker implements CmdSubstrate {
     final EmbedBuilder NO_PERMISSION =
         new EmbedBuilder()
             .setDescription("""
-                あなたは管理者権限を所持していないため、
+                あなたはサーバ管理権限を所持していないため、
                 このサーバでVCSpeakerの設定をすることはできません。
                 """)
             .setColor(LibEmbedColor.error);
@@ -72,7 +72,7 @@ public void hooker(JDA jda, Guild guild,
     }
 
     void addServer(Guild guild, GuildMessageChannel channel, Member member, SlashCommandInteractionEvent event) {
-        if (!member.hasPermission(Permission.ADMINISTRATOR)) {
+        if (!member.hasPermission(Permission.MANAGE_SERVER)) {
             event.replyEmbeds(NO_PERMISSION.build()).queue();
             return;
         }
@@ -110,7 +110,7 @@ void addServer(Guild guild, GuildMessageChannel channel, Member member, SlashCom
     }
 
     void removeServer(Guild guild, Member member, SlashCommandInteractionEvent event) {
-        if (!member.hasPermission(Permission.ADMINISTRATOR)) {
+        if (!member.hasPermission(Permission.MANAGE_SERVER)) {
             event.replyEmbeds(NO_PERMISSION.build()).queue();
             return;
         }
@@ -133,7 +133,7 @@ void removeServer(Guild guild, Member member, SlashCommandInteractionEvent event
     }
 
     void setNotifyChannel(Guild guild, Member member, SlashCommandInteractionEvent event) {
-        if (!member.hasPermission(Permission.ADMINISTRATOR)) {
+        if (!member.hasPermission(Permission.MANAGE_SERVER)) {
             event.replyEmbeds(NO_PERMISSION.build()).queue();
             return;
         }
@@ -170,7 +170,7 @@ void setNotifyChannel(Guild guild, Member member, SlashCommandInteractionEvent e
     }
 
     void showDebugQueue(Member member, SlashCommandInteractionEvent event) {
-        if (!member.hasPermission(Permission.ADMINISTRATOR)) {
+        if (!member.hasPermission(Permission.MANAGE_SERVER)) {
             event.replyEmbeds(NO_PERMISSION.build()).queue();
             return;
         }