From 992be315603da22acc657a3759476e8dbecd97e9 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Tue, 11 Apr 2017 20:06:21 -0500 Subject: [PATCH] Fixed concurrentModificationException, trying to download emotes while sending out messages. --- sigIRCv2.jar | Bin 324197 -> 324371 bytes src/sig/sigIRC.java | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sigIRCv2.jar b/sigIRCv2.jar index 5bb2c6232d40dc8ed81a06d774979bb26e5db0a2..da0c89b7e45d873fa2c468ed4fcfd7375d27730f 100644 GIT binary patch delta 10800 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 delta 10289 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 Z*0clAaTdI5e{J&z02@YoF#!Hl_&-9p2p|9e diff --git a/src/sig/sigIRC.java b/src/sig/sigIRC.java index 8393dee..3184c5d 100644 --- a/src/sig/sigIRC.java +++ b/src/sig/sigIRC.java @@ -72,6 +72,7 @@ public class sigIRC{ static String usernameFont="Gill Sans"; static String touhoumotherConsoleFont="Agency FB Bold"; static boolean touhoumothermodule_enabled=true; + static boolean downloadsComplete=false; public static void main(String[] args) { @@ -100,7 +101,7 @@ public class sigIRC{ String[] filedata = FileUtils.readFromFile(BASEDIR+"sigIRC/oauthToken.txt"); - String oauth = filedata[0]; + final String oauth = filedata[0]; WriteBreakToLogFile(); programClock.start(); @@ -114,6 +115,7 @@ public class sigIRC{ InitializeModules(); performTwitchEmoteUpdate(); + downloadsComplete=true; } }); InitializeIRCConnection(server, nickname, channel, oauth); @@ -160,7 +162,7 @@ public class sigIRC{ customsounds.add(new CustomSound("samusaran458", "Samus Appears - Metroid Prime [OST]-G8frLXCHtqM.wav")); } - public static void InitializeIRCConnection(String server, String nickname, String channel, String oauth) { + public static void InitializeIRCConnection(final String server,final String nickname,final String channel,final String oauth) { Socket socket; try { socket = new Socket(server, 6667); @@ -184,7 +186,7 @@ public class sigIRC{ } catch (IOException e) { e.printStackTrace(); } - InitializeIRCConnection(server,nickname,channel,oauth); + InitializeIRCConnection(server,nickname,channel,oauth); } public static void WriteBreakToLogFile() { @@ -272,15 +274,19 @@ public class sigIRC{ } private static String FilterMessage(String line) { + final String hostcutoff_str = "sigonitori :"; System.out.println("Original Message: "+line); String username = line.substring(1, line.indexOf("!")); String cutstring = channel+" :"; String message = line.substring(line.indexOf(cutstring)+cutstring.length(), line.length()); + if (username.equalsIgnoreCase("jtv")) { + message = line.substring(line.indexOf(hostcutoff_str)+hostcutoff_str.length(), line.length()); + } return username+": "+ message; } private static boolean MessageIsAllowed(String line) { - if (line.contains("PRIVMSG")) { + if (line.contains("PRIVMSG") && downloadsComplete) { return true; } else { return false;