desu/innaircbot
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

v0.2

Browse source
This commit is contained in:
Dmitry Isaenko 2019-01-02 17:11:14 +03:00
parent 91dfb5a934
commit 623889602b
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/InnaIrcBot/Connections.java
View file

@ -70,7 +70,7 @@ public class Connections {
} }
} }
if (connectionsList.isEmpty()) { if (connectionsList.isEmpty()) {
System.out.println("connectionsList.isEmpty()"); System.out.println("connectionsList is empty. Exit.");
break; break;
} }
else { else {

17
src/main/java/InnaIrcBot/ProvidersConsumers/DataProvider.java
View file

@ -173,15 +173,6 @@ public class DataProvider implements Runnable {
StreamProvider.writeToStream(serverName,"NICK "+this.userNick); StreamProvider.writeToStream(serverName,"NICK "+this.userNick);
StreamProvider.writeToStream(serverName,"USER "+configFile.getUserIdent()+" 8 * :"+configFile.getUserRealName()); // TODO: Add usermode 4 rusnet StreamProvider.writeToStream(serverName,"USER "+configFile.getUserIdent()+" 8 * :"+configFile.getUserRealName()); // TODO: Add usermode 4 rusnet
if (!configFile.getServerPass().isEmpty())
StreamProvider.writeToStream(serverName,"PASS "+configFile.getServerPass());
if (!configFile.getUserNickPass().isEmpty() && (!configFile.getUserNickAuthStyle().isEmpty() && configFile.getUserNickAuthStyle().toLowerCase().equals("freenode")))
StreamProvider.writeToStream(serverName,"PRIVMSG NickServ :IDENTIFY "+configFile.getUserNickPass());
else if (!configFile.getUserNickPass().isEmpty() && (!configFile.getUserNickAuthStyle().isEmpty() && configFile.getUserNickAuthStyle().toLowerCase().equals("rusnet")))
StreamProvider.writeToStream(serverName,"NickServ IDENTIFY "+configFile.getUserNickPass());
else if (!configFile.getUserNickPass().isEmpty())
System.out.println("Configuration issue: Unable to determinate method of user nick identification (by password): could be \"freenode\" or \"rusnet\"\nSee \"userNickAuthStyle\".");
try { try {
// 431 ERR_NONICKNAMEGIVEN how can we get this? // 431 ERR_NONICKNAMEGIVEN how can we get this?
@ -230,6 +221,14 @@ public class DataProvider implements Runnable {
StreamProvider.writeToStream(serverName,"PASS "+configFile.getServerPass()); StreamProvider.writeToStream(serverName,"PASS "+configFile.getServerPass());
} }
} }
if (!configFile.getUserNickPass().isEmpty() && (!configFile.getUserNickAuthStyle().isEmpty() && configFile.getUserNickAuthStyle().toLowerCase().equals("freenode")))
StreamProvider.writeToStream(serverName,"PRIVMSG NickServ :IDENTIFY "+configFile.getUserNickPass());
else if (!configFile.getUserNickPass().isEmpty() && (!configFile.getUserNickAuthStyle().isEmpty() && configFile.getUserNickAuthStyle().toLowerCase().equals("rusnet")))
StreamProvider.writeToStream(serverName,"NickServ IDENTIFY "+configFile.getUserNickPass());
else if (!configFile.getUserNickPass().isEmpty())
System.out.println("Configuration issue: Unable to determinate method of user nick identification (by password): could be \"freenode\" or \"rusnet\"\nSee \"userNickAuthStyle\".");
} catch (IOException e){ } catch (IOException e){
System.out.println("Internal issue: DataProvider->initConnection() caused I/O exception."); System.out.println("Internal issue: DataProvider->initConnection() caused I/O exception.");
return false; return false;