sigonasr2/sigIRCv2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed concurrentModificationException, trying to download emotes while

Browse Source 
sending out messages.
This commit is contained in:
sigonasr2 2017-04-11 20:06:21 -05:00
parent dc1c3e1e71
commit 992be31560
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sigIRCv2.jar
View File

Binary file not shown.

14
src/sig/sigIRC.java
View File

@ -72,6 +72,7 @@ public class sigIRC{
static String usernameFont="Gill Sans"; static String usernameFont="Gill Sans";
static String touhoumotherConsoleFont="Agency FB Bold"; static String touhoumotherConsoleFont="Agency FB Bold";
static boolean touhoumothermodule_enabled=true; static boolean touhoumothermodule_enabled=true;
static boolean downloadsComplete=false;
public static void main(String[] args) { public static void main(String[] args) {
@ -100,7 +101,7 @@ public class sigIRC{
String[] filedata = FileUtils.readFromFile(BASEDIR+"sigIRC/oauthToken.txt"); String[] filedata = FileUtils.readFromFile(BASEDIR+"sigIRC/oauthToken.txt");
String oauth = filedata[0]; final String oauth = filedata[0];
WriteBreakToLogFile(); WriteBreakToLogFile();
programClock.start(); programClock.start();
@ -114,6 +115,7 @@ public class sigIRC{
InitializeModules(); InitializeModules();
performTwitchEmoteUpdate(); performTwitchEmoteUpdate();
downloadsComplete=true;
} }
}); });
InitializeIRCConnection(server, nickname, channel, oauth); InitializeIRCConnection(server, nickname, channel, oauth);
@ -160,7 +162,7 @@ public class sigIRC{
customsounds.add(new CustomSound("samusaran458", "Samus Appears - Metroid Prime [OST]-G8frLXCHtqM.wav")); 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; Socket socket;
try { try {
socket = new Socket(server, 6667); socket = new Socket(server, 6667);
@ -184,7 +186,7 @@ public class sigIRC{
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
InitializeIRCConnection(server,nickname,channel,oauth); InitializeIRCConnection(server,nickname,channel,oauth);
} }
public static void WriteBreakToLogFile() { public static void WriteBreakToLogFile() {
@ -272,15 +274,19 @@ public class sigIRC{
} }
private static String FilterMessage(String line) { private static String FilterMessage(String line) {
final String hostcutoff_str = "sigonitori :";
System.out.println("Original Message: "+line); System.out.println("Original Message: "+line);
String username = line.substring(1, line.indexOf("!")); String username = line.substring(1, line.indexOf("!"));
String cutstring = channel+" :"; String cutstring = channel+" :";
String message = line.substring(line.indexOf(cutstring)+cutstring.length(), line.length()); 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; return username+": "+ message;
} }
private static boolean MessageIsAllowed(String line) { private static boolean MessageIsAllowed(String line) {
if (line.contains("PRIVMSG")) { if (line.contains("PRIVMSG") && downloadsComplete) {
return true; return true;
} else { } else {
return false; return false;