diff --git a/pom.xml b/pom.xml
index e076808..ebac5c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
loper
InnaIrcBot
- 0.9.1-SNAPSHOT
+ 0.9.2-SNAPSHOT
jar
InnaIrcBot
diff --git a/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java b/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java
index 3456735..952fc70 100644
--- a/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java
+++ b/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java
@@ -288,7 +288,7 @@ public class PrivateMsgCommander { // TODO: add black list: add users afte
private void unban(String chanel, String user){
cmode(chanel, "-b", simplifyNick(user)+"*!*@*");
if (user.contains("@")){
- cmode(chanel, "-b", "*!*@"+user.replaceAll("^.+@",""));
+ cmode(chanel, "-b", user);
}
}
private void kickban(String chanel, String user, String reason){
diff --git a/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java b/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
index 53046b2..1da8c28 100644
--- a/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
+++ b/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
@@ -66,9 +66,8 @@ public class JoinFloodHandler implements EventHandler {
return fistJoinTime;
}
private void kickBanUser(String user){
- StreamProvider.writeToStream(server,
- "PRIVMSG "+ channel +" :"+user+": join flood ("+ joinMaxNumber +" connections in "+timeFrameInSeconds+" seconds).\n"+
- "MODE "+ channel +" +b "+user+"!*@*"); // TODO: consider other ban methods
+ StreamProvider.writeToStream(server,"PRIVMSG "+ channel +" :"+user+": join flood ("+ joinMaxNumber +" connections in "+timeFrameInSeconds+" seconds).\n");
+ StreamProvider.writeToStream(server,"MODE "+ channel +" +b "+user+"!*@*"); // TODO: consider other ban methods
}
private String simplifyNick(String nick){ return nick.replaceAll("!.*$",""); }
diff --git a/src/main/java/InnaIrcBot/GlobalData.java b/src/main/java/InnaIrcBot/GlobalData.java
index 4256108..5f462b2 100644
--- a/src/main/java/InnaIrcBot/GlobalData.java
+++ b/src/main/java/InnaIrcBot/GlobalData.java
@@ -1,7 +1,7 @@
package InnaIrcBot;
public class GlobalData {
- private static final String version = "InnaIrcBot v0.9.1 \"Литке\"";
+ private static final String version = "InnaIrcBot v0.9.2 \"Литке\"";
public static synchronized String getAppVersion(){
return String.format("%s, %s %s %s", version,
System.getProperty("os.name"),
diff --git a/src/main/java/InnaIrcBot/linkstitles/LinksTitleHandler.java b/src/main/java/InnaIrcBot/linkstitles/LinksTitleHandler.java
index bcb5f31..2849225 100644
--- a/src/main/java/InnaIrcBot/linkstitles/LinksTitleHandler.java
+++ b/src/main/java/InnaIrcBot/linkstitles/LinksTitleHandler.java
@@ -70,11 +70,20 @@ class LinksTitleHandler implements Runnable{
);
StringBuilder stringBuffer = new StringBuilder();
+ //stringBuffer.setLength();
String line;
+ int semaphore = 0;
while ((line = reader.readLine()) != null) {
- stringBuffer.append(line);
- if (line.contains("")) {
- break;
+ if (semaphore == 1) {
+ stringBuffer.append(line);
+ if (line.contains("")) {
+ break;
+ }
+ continue;
+ }
+ if (line.contains("
")) {
+ semaphore = 1;
+ stringBuffer.append(line);
}
}
reader.close();