From fe126ab60dc105650697ffdae916e5ba76cd3039 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Sat, 13 Mar 2021 07:12:02 +0900 Subject: [PATCH] Muni Muni --- DiscordDivaBot/munimuni.jar | Bin 9710851 -> 9711168 bytes DiscordDivaBot/src/sig/DivaBot.java | 25 +++++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/DiscordDivaBot/munimuni.jar b/DiscordDivaBot/munimuni.jar index 494db7ee3ae52e055b07d70384d7d0e6dfcea74e..08fffd1ad80929f3da90f3aa41bb4f1b499cf16b 100644 GIT binary patch delta 3277 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 delta 2962 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 j7HC|eWrqD{5-)Sxvv@=tB^yEKP(V~U emotes = bot.getEmotes(); List muniEmotes = new ArrayList(); for (Emote e : emotes) { @@ -62,6 +64,7 @@ public class DivaBot extends ListenerAdapter{ muniEmotes.add(e); } } + Random r = new Random(); return muniEmotes.get((int)(Math.random()*muniEmotes.size())); } @@ -79,7 +82,21 @@ public class DivaBot extends ListenerAdapter{ &&(channel.getName().equalsIgnoreCase("bot-tests")|| channel.getIdLong()==772923108997857291l/*D4DJcord tiering channel*/|| channel.getName().equalsIgnoreCase(author.getName())) - &&(message.toLowerCase().contains("muni")|| - message.toLowerCase().contains("むに")); + &&(ContainsMoreThanJustEmote(message) && (message.toLowerCase().contains("muni")|| + message.toLowerCase().contains("むに")|| + message.toLowerCase().contains("무니"))); + } + + private boolean ContainsMoreThanJustEmote(String message) { + int colonCount=0; + for (int i=0;i=2&&message.charAt(i)!=':') { + return true; + } + if (message.charAt(i)==':') { + colonCount++; + } + } + return colonCount!=2; } }