From 7e2c486fe483c2baad8f6c5893bc8b290979b8b2 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Mon, 15 Mar 2021 05:21:56 +0900 Subject: [PATCH] Dead --- DiscordDivaBot/saki.jar | Bin 9712677 -> 9713663 bytes DiscordDivaBot/src/sig/Check.java | 25 ++++++++++++++++++++ DiscordDivaBot/src/sig/DivaBot.java | 35 +++++++++++++++++++++------- 3 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 DiscordDivaBot/src/sig/Check.java diff --git a/DiscordDivaBot/saki.jar b/DiscordDivaBot/saki.jar index 344853e3a4a66ebac6014bcdf42c2c0389b3632e..386db32c5c25d99657db56709f4bdf29af11d235 100644 GIT binary patch delta 5837 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 x2&^zKTqMA}mhHjc*L4^Y_oX5dev=10000) { + dead=true; + bot.getTextChannelById(744692511703826462l).sendMessage("<:sakiDead1:799650259487293440><:sakiDead2:799650259746947083>") + .queue(); + } + } + +} \ No newline at end of file diff --git a/DiscordDivaBot/src/sig/DivaBot.java b/DiscordDivaBot/src/sig/DivaBot.java index f849a79..96a6fab 100644 --- a/DiscordDivaBot/src/sig/DivaBot.java +++ b/DiscordDivaBot/src/sig/DivaBot.java @@ -1,9 +1,13 @@ package sig; import java.util.ArrayList; + + import java.util.HashMap; import java.util.List; import java.util.Random; +import java.util.Timer; +import java.util.TimerTask; import javax.security.auth.login.LoginException; @@ -29,6 +33,8 @@ public class DivaBot extends ListenerAdapter{ public String[] keywordsList= new String[]{ "Apple","Apricot","Avocado","Banana","Bilberry","Blackberry","Blueberry","Currant","Cherry","Cherimoya","Clementine","Date","Damson","Fruit","Durian","Eggplant","Elderberry","Feijoa","Gooseberry","Grape","Grapefruit","Guava","Huckleberry","Jackfruit","Jambul","Kiwi","Kumquat","Legume","Lemon","Lime","Lychee","Mango","Mangostine","Melon","Cantaloupe","Cantalope","Honeydew","Watermelon","Rock","Nectarine","Orange","Peach","Pear","Williams","Bartlett","Pitaya","Physalis","Plum","prune","Pineapple","Pomegranate","Pomegranite","Raisin","Raspberry","blackcap","Rambutan","Redcurrant","Salal","Satsuma","Star","Strawberry","Tangerine","Tomato","Ugli","Watermelon","Ziziphus","mauritiana","Red","Orange","Yellow","Green","Blue","Purple","Pink","Brown","Gray","Grey","Black","White","Color","Dragon","Wyvern","Quetzalcoatl","Hydra","Cockatrice","Wyrm","Drake" }; + static Timer t; + static Check sakiCheck; public static void main(String[] args) throws LoginException, InterruptedException { String[] fileContents = FileUtils.readFromFile("clientToken.txt"); @@ -38,6 +44,9 @@ public class DivaBot extends ListenerAdapter{ bot.addEventListener(new DivaBot()); bot.awaitReady(); DivaBot.bot=bot; + t = new Timer(true); + sakiCheck = new Check(bot); + t.scheduleAtFixedRate(sakiCheck, 10000, 10000); } //https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/hooks/ListenerAdapter.html @@ -50,7 +59,7 @@ public class DivaBot extends ListenerAdapter{ //System.out.println(ev.getAuthor().getIdLong()); - if (ApprovedChannel(ev.getChannel(),ev.getAuthor())/*&&ev.getMessage().getContentDisplay().toLowerCase().contains("muni")*/) { + /*if (ApprovedChannel(ev.getChannel(),ev.getAuthor())) { if (lastMessageCount>0&&ev.getMessage().getContentDisplay().toLowerCase().equalsIgnoreCase(lastMessage)) { lastMessageCount++; } else { @@ -61,18 +70,28 @@ public class DivaBot extends ListenerAdapter{ ev.getChannel().sendMessage(ev.getMessage()) .queue(); } + }*/ + + if (ev.getChannel().getIdLong()==772923108997857291l) { + if (sakiCheck.dead) { + //React to next message. + sakiCheck.dead=false; + React(ev); + } else { + sakiCheck.lastChannelMessage=System.currentTimeMillis(); + } } if (ValidMessage(ev.getAuthor(),ev.getChannel(),ev.getMessage().getContentDisplay())) { - /*ev.getChannel().sendMessage(ev.getAuthor().getName()+" typed '"+ev.getMessage().getContentDisplay()+"'!") - .queue();*/ - //System.out.println(bot.getEmotes()); - ev.getChannel().addReactionById(ev.getMessageIdLong(), ChooseRandomMuniEmote(ev.getMessage().getContentDisplay().hashCode()+ - ev.getAuthor().getIdLong())) - .queue(); - //messageHistory.put(ev.getMessageIdLong(),ev.getMessage()); + React(ev); } } + + private void React(MessageReceivedEvent ev) { + ev.getChannel().addReactionById(ev.getMessageIdLong(), ChooseRandomMuniEmote(ev.getMessage().getContentDisplay().hashCode()+ + ev.getAuthor().getIdLong())) + .queue(); + } private Emote ChooseRandomMuniEmote(long seed) { List emotes = bot.getEmotes();