Merge pull request #187 from book000/fix/city-request-notworking

fix(MeetingVote): 自治体申請系でjaotanが申請と認識しない不具合を修正
jaoafa · Jan 26, 2022 · ec568ed · ec568ed
2 parents 85d19de + 008f2e4
commit ec568ed
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/com/jaoafa/javajaotan2/event/Event_MeetingVote.java b/src/main/java/com/jaoafa/javajaotan2/event/Event_MeetingVote.java
@@ -118,13 +118,9 @@ public void onReady(@Nonnull ReadyEvent event) {
     public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
         if (Main.getConfig().getGuildId() != event.getGuild().getIdLong()) return;
         if (event.getChannel().getIdLong() != Channels.meeting_vote.getChannelId()) return;
-        if (event.getAuthor().isBot()) return;
-        if (event.getMember() == null) return;
-        if (!event.isFromType(ChannelType.TEXT)) {
-            return;
-        }
+        if (!event.isFromType(ChannelType.TEXT)) return;
 
-        Member member = event.getMember();
+        User author = event.getAuthor();
         TextChannel channel = event.getTextChannel();
         Message message = event.getMessage();
         String content = message.getContentRaw();
@@ -153,7 +149,7 @@ public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
         // 新規開始メッセージ
         EmbedBuilder embed = new EmbedBuilder()
             .setTitle(":new: 新しい投票")
-            .setDescription("%s からの新しい審議投票です。".formatted(member.getAsMention()))
+            .setDescription("%s からの新しい審議投票です。".formatted(author.getAsMention()))
             .addField("賛成の場合", "**投票メッセージに対して**:thumbsup:リアクションを付けてください。", false)
             .addField("反対の場合", "**投票メッセージに対して**:thumbsdown:リアクションを付けてください。\n" +
                 "反対の場合は <#597423467796758529> に意見理由を必ず書いてください。", false)