diff --git a/Jenkinsfile b/Jenkinsfile
index b7da7e7..c67396e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@ pipeline {
agent {
docker {
image 'maven:3-alpine'
- args '-v /root/.m2:/root/.m2 -v /home/docker/innaircbot/files/artifact:/rel'
+ args '-v /home/docker/jenkins/files/m2:/root/.m2 -v /home/docker/innaircbot/files/artifact:/rel'
}
}
@@ -19,6 +19,7 @@ pipeline {
}
stage('Deploy') {
steps {
+ // TODO: consider switch to docker registry
sh 'cp ./target/InnaIrcBot-*-jar-with-dependencies.jar /rel/InnaIrcBot.jar'
// sh 'docker restart innaircbot'
}
diff --git a/pom.xml b/pom.xml
index 6614cd2..bffd922 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
loper
InnaIrcBot
- 0.1-SNAPSHOT
+ 0.2-SNAPSHOT
jar
InnaIrcBot
diff --git a/src/main/java/InnaIrcBot/BotStart.java b/src/main/java/InnaIrcBot/BotStart.java
index 36e9858..df23c9c 100644
--- a/src/main/java/InnaIrcBot/BotStart.java
+++ b/src/main/java/InnaIrcBot/BotStart.java
@@ -1,7 +1,6 @@
/**
* InnaIrcBot
* @author Dmitry Isaenko
- * @version 0.1 "Батлкрузер"
* Russia, 2018.
* */
package InnaIrcBot;
diff --git a/src/main/java/InnaIrcBot/Commanders/ChanelCommander.java b/src/main/java/InnaIrcBot/Commanders/ChanelCommander.java
index 37aab9f..c92566a 100644
--- a/src/main/java/InnaIrcBot/Commanders/ChanelCommander.java
+++ b/src/main/java/InnaIrcBot/Commanders/ChanelCommander.java
@@ -151,13 +151,13 @@ public class ChanelCommander implements Runnable {
executiveStr.append(": ");
}
- for (int i = 1; i= 3 && directive[0] != null && !directive[0].startsWith("#") && directive[1] != null && directive[2] != null){
- //System.out.println(Arrays.toString(directive)); // TODO:debug
+ // System.out.println(Arrays.toString(directive)); // TODO:debug
switch (directive[0].toLowerCase()){
case "join":
joinMap.put(directive[1], Arrays.copyOfRange(directive, 2, directive.length));
diff --git a/src/main/java/InnaIrcBot/Config/StorageFile.java b/src/main/java/InnaIrcBot/Config/StorageFile.java
index fd5389d..8f74842 100644
--- a/src/main/java/InnaIrcBot/Config/StorageFile.java
+++ b/src/main/java/InnaIrcBot/Config/StorageFile.java
@@ -3,6 +3,7 @@ package InnaIrcBot.Config;
public class StorageFile {
private final String serverName;
private final int serverPort;
+ private final String serverPass;
private final String[] channels;
private final String userNick;
private final String userIdent;
@@ -18,6 +19,7 @@ public class StorageFile {
public String getServerName() { return serverName; }
public int getServerPort() { return serverPort; }
+ public String getServerPass() { return serverPass; }
public String[] getChannels() { return channels; }
public String getUserNick() { return userNick; }
public String getUserIdent() { return userIdent; }
@@ -33,6 +35,7 @@ public class StorageFile {
public StorageFile(String serverName,
int serverPort,
+ String serverPass,
String[] channels,
String userNick,
String userIdent,
@@ -47,6 +50,7 @@ public class StorageFile {
String chanelConfigurationsPath){
this.serverName = serverName;
this.serverPort = serverPort;
+ this.serverPass = serverPass;
this.channels = channels;
this.userIdent = userIdent;
this.userNick = userNick;
diff --git a/src/main/java/InnaIrcBot/Config/StorageReader.java b/src/main/java/InnaIrcBot/Config/StorageReader.java
index 6f89afb..e2b8b48 100644
--- a/src/main/java/InnaIrcBot/Config/StorageReader.java
+++ b/src/main/java/InnaIrcBot/Config/StorageReader.java
@@ -65,6 +65,7 @@ public class StorageReader {
StorageFile storageFileObject = new StorageFile("srv",
6667,
+ "",
new String[] {"#lpr",
"#main"},
"user_nick",
diff --git a/src/main/java/InnaIrcBot/GlobalData.java b/src/main/java/InnaIrcBot/GlobalData.java
index 076074a..984c4c0 100644
--- a/src/main/java/InnaIrcBot/GlobalData.java
+++ b/src/main/java/InnaIrcBot/GlobalData.java
@@ -1,7 +1,7 @@
package InnaIrcBot;
public class GlobalData {
- public static final String version = "InnaIrcBot v0.1 \"Батлкрузер\"";
+ public static final String version = "InnaIrcBot v0.2 \"Маньчжурия\"";
public static synchronized String getAppVersion(){
return version;
}
diff --git a/src/main/java/InnaIrcBot/ProvidersConsumers/DataProvider.java b/src/main/java/InnaIrcBot/ProvidersConsumers/DataProvider.java
index 49a0b9c..63cd3d8 100644
--- a/src/main/java/InnaIrcBot/ProvidersConsumers/DataProvider.java
+++ b/src/main/java/InnaIrcBot/ProvidersConsumers/DataProvider.java
@@ -173,6 +173,8 @@ public class DataProvider implements Runnable {
StreamProvider.writeToStream(serverName,"NICK "+this.userNick);
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());
@@ -186,6 +188,7 @@ public class DataProvider implements Runnable {
// 432 ERR_ERRONEUSNICKNAME covered
// 433 ERR_NICKNAMEINUSE covered
// 436 ERR_NICKCOLLISION
+ // 464 ERR_PASSWDMISMATCH (password for server/znc/bnc)
while ((rawMessage = genericStreamReader.readLine()) != null){
System.out.println(rawMessage);
if (rawMessage.startsWith("PING :")) {
@@ -223,6 +226,9 @@ public class DataProvider implements Runnable {
System.out.println("Configuration issue: Nickname contains unacceptable characters (432 ERR_ERRONEUSNICKNAME).");
return false;
}
+ else if (rawMessage.contains(" 464 ")) {
+ StreamProvider.writeToStream(serverName,"PASS "+configFile.getServerPass());
+ }
}
} catch (IOException e){
System.out.println("Internal issue: DataProvider->initConnection() caused I/O exception.");
diff --git a/src/main/java/Temporary/StorageFileTest.java b/src/main/java/Temporary/StorageFileTest.java
index a047f0c..abe085d 100644
--- a/src/main/java/Temporary/StorageFileTest.java
+++ b/src/main/java/Temporary/StorageFileTest.java
@@ -7,6 +7,7 @@ public class StorageFileTest {
StorageFile config = new StorageFile(
"",
0,
+ "",
null,
"",
"",