Fix bugs #2
This commit is contained in:
parent
4340038a91
commit
d6ccf25775
2 changed files with 27 additions and 28 deletions
|
@ -12,12 +12,11 @@ public class StreamProvider {
|
|||
|
||||
public static synchronized void writeToStream(String server, String message){
|
||||
try {
|
||||
if (message.matches("(^.+?\\s)INNA")) {
|
||||
SystemConsumer.getSystemConsumer(server).add("INNA "+message);
|
||||
return;
|
||||
}
|
||||
srvStreamMap.get(server).write(message+"\n");
|
||||
srvStreamMap.get(server).flush();
|
||||
if (message.startsWith("PRIVMSG")) {
|
||||
SystemConsumer.getSystemConsumer(server).add("INNA "+message);
|
||||
}
|
||||
} catch (IOException e){
|
||||
System.out.println("Internal issue: StreamProvider->writeToStream() caused I/O exception:\n\t"+e.getMessage());
|
||||
}
|
||||
|
|
|
@ -66,8 +66,18 @@ public class SystemConsumer implements Runnable{
|
|||
String data = systemQueue.take();
|
||||
String[] dataStrings = data.split(" :?",3);
|
||||
//TODO: handle mode change
|
||||
switch (dataStrings[1]){
|
||||
case "PRIVMSG":
|
||||
|
||||
if (dataStrings[0].equals("INNA")){
|
||||
String[] splitter;
|
||||
if (dataStrings.length > 2){ // Don't touch 'cuz it's important
|
||||
splitter = dataStrings[2].split(" ", 2);
|
||||
if (splitter.length == 2){
|
||||
handleSpecial(dataStrings[1], splitter[0], splitter[1]);
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if ("PRIVMSG".equals(dataStrings[1])) {
|
||||
if (dataStrings[2].indexOf("\u0001") < dataStrings[2].lastIndexOf("\u0001")) {
|
||||
String sender = simplifyNick(dataStrings[0]);
|
||||
String message = dataStrings[2].substring(dataStrings[2].indexOf(":") + 1);
|
||||
|
@ -75,19 +85,10 @@ public class SystemConsumer implements Runnable{
|
|||
}
|
||||
else {
|
||||
commander.receiver(dataStrings[0], dataStrings[2].replaceAll("^.+?:", "").trim());
|
||||
writerWorker.log(dataStrings[1]+" "+dataStrings[0]+" :", dataStrings[2].replaceAll("^.+?:", "").trim());
|
||||
}
|
||||
break;
|
||||
case "INNA":
|
||||
String[] splitter;
|
||||
if (dataStrings.length > 2){ // Don't touch 'cuz it's important
|
||||
splitter = dataStrings[2].split(" ", 2);
|
||||
if (splitter.length == 2){
|
||||
handleSpecial(dataStrings[0], splitter[0], splitter[1]);
|
||||
writerWorker.log(dataStrings[1] + " " + dataStrings[0] + " :", dataStrings[2].replaceAll("^.+?:", "").trim());
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
else {
|
||||
handleNumeric(dataStrings[0], dataStrings[1], dataStrings[2]);
|
||||
}
|
||||
}
|
||||
|
@ -107,8 +108,7 @@ public class SystemConsumer implements Runnable{
|
|||
IrcChannel ircChannel = channels.get(channelName);
|
||||
if (ircChannel == null)
|
||||
return;
|
||||
String ircFormatterMessage = event+" "+nick+" "+channelName+" "+message;
|
||||
|
||||
String ircFormatterMessage = nick+" "+event+" "+channelName+" "+message;
|
||||
ircChannel.getChannelQueue().add(ircFormatterMessage);
|
||||
}
|
||||
//todo: handle nickserv messages somehow
|
||||
|
|
Loading…
Reference in a new issue