diff --git a/config.json b/config.json
index 7f1501e..7695ee5 100644
--- a/config.json
+++ b/config.json
@@ -7,15 +7,6 @@
"channels" : ["#voidforum"],
"botName" : "jircbot-test",
"masterNick" : "bvn13"
- },
- {
- "enabled" : true,
- "server" : "irc.mozilla.org",
- "port" : 6667,
- "channels" : ["#borsch"],
- "botName" : "jircbot-test",
- "botPassword" : "password",
- "masterNick" : "bvn13"
}
]
}
\ No newline at end of file
diff --git a/jircbot.iml b/jircbot.iml
index 4701c24..d045fdf 100644
--- a/jircbot.iml
+++ b/jircbot.iml
@@ -29,67 +29,69 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -103,9 +105,8 @@
-
-
-
+
+
diff --git a/jircbot.service b/jircbot.service
index bf06c73..bf758ca 100644
--- a/jircbot.service
+++ b/jircbot.service
@@ -5,7 +5,7 @@ After=network.target
[Service]
User=bvn13
WorkingDirectory=/srv/jircbot
-ExecStart=/usr/bin/java -jar /srv/jircbot/jircbot-1.2.3.jar
+ExecStart=/usr/bin/java -jar /srv/jircbot/jircbot-2.0.0.jar
SuccessExitStatus=143
[Install]
diff --git a/pom.xml b/pom.xml
index 1f19a9e..e95261b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,20 +6,27 @@
ru.bvn13
jircbot
- 1.2.3
+ ${bot.version}
jar
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.0.0.RELEASE
+
+
+
+ 2.0.0
+
1.8
2.1
- 1.5.9.RELEASE
- 4.3.13.RELEASE
- 1.4.196
- 5.0.12.Final
- 3.21.0.1
+ 2.0.0.RELEASE
+ 5.0.4.RELEASE
+ 5.2.14.Final
UTF-8
UTF-8
@@ -53,7 +60,6 @@
org.springframework.boot
spring-boot-starter
- ${spring.framework.version}
org.springframework.boot
@@ -66,12 +72,10 @@
org.springframework.boot
spring-boot-starter-web
- ${spring.framework.version}
org.springframework.boot
spring-boot-starter-thymeleaf
- ${spring.framework.version}
@@ -80,7 +84,6 @@
org.springframework.boot
spring-boot-starter-data-jpa
- ${spring.framework.version}
com.zaxxer
@@ -95,7 +98,6 @@
org.springframework
spring-orm
- ${spring.orm.version}
@@ -217,16 +219,19 @@
+
+
+
org.springframework.boot
spring-boot-maven-plugin
- 1.5.6.RELEASE
ru.bvn13.jircbot.MainApp
+ true
diff --git a/src/main/java/ru/bvn13/jircbot/JpaConfig.java b/src/main/java/ru/bvn13/jircbot/JpaConfig.java
deleted file mode 100644
index 6b16d2a..0000000
--- a/src/main/java/ru/bvn13/jircbot/JpaConfig.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package ru.bvn13.jircbot;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-import java.util.Properties;
-
-/**
- * Created by bvn13 on 30.01.2018.
- */
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories(basePackageClasses = MainApp.class)
-public class JpaConfig {
-
- @Value("${spring.dataSource.driverClassName}")
- private String driver;
- @Value("${spring.dataSource.url}")
- private String url;
- @Value("${spring.dataSource.username}")
- private String username;
- @Value("${spring.dataSource.password}")
- private String password;
- @Value("${spring.hibernate.dialect}")
- private String dialect;
- @Value("${spring.hibernate.hbm2ddl.auto}")
- private String hbm2ddlAuto;
- @Value("${spring.hibernate.show_sql}")
- private Boolean showSql;
-
- @Value("${spring.hibernate.use_sql_comments}")
- private Boolean useSqlComments;
- @Value("${spring.hibernate.format_sql}")
- private Boolean formatSql;
-
-
- @Bean
- public DataSource dataSource() {
- HikariConfig config = new HikariConfig();
- config.setDriverClassName(driver);
- config.setJdbcUrl(url);
- config.setUsername(username);
- config.setPassword(password);
-
- config.addDataSourceProperty("useUnicode", "true");
- config.addDataSourceProperty("characterEncoding", "utf8");
- config.addDataSourceProperty("cachePrepStmts", "true");
- config.addDataSourceProperty("prepStmtCacheSize", "250");
- config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
- config.addDataSourceProperty("useServerPrepStmts", "true");
-
- return new HikariDataSource(config);
- }
-
-
- @Bean
- public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
- LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
- entityManagerFactoryBean.setDataSource(dataSource());
- entityManagerFactoryBean.setPackagesToScan("ru.bvn13.jircbot");
- entityManagerFactoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
-
- Properties jpaProperties = new Properties();
- jpaProperties.put(org.hibernate.cfg.Environment.DIALECT, dialect);
- jpaProperties.put(org.hibernate.cfg.Environment.HBM2DDL_AUTO, hbm2ddlAuto);
- jpaProperties.put(org.hibernate.cfg.Environment.SHOW_SQL, showSql);
- //jpaProperties.put(org.hibernate.cfg.Environment.USE_SQL_COMMENTS, useSqlComments);
- jpaProperties.put(org.hibernate.cfg.Environment.FORMAT_SQL, formatSql);
- entityManagerFactoryBean.setJpaProperties(jpaProperties);
-
- return entityManagerFactoryBean;
- }
-
- @Bean(name = "transactionManager")
- public PlatformTransactionManager annotationDrivenTransactionManager() {
- return new JpaTransactionManager();
- }
-
-}
diff --git a/src/main/java/ru/bvn13/jircbot/MainApp.java b/src/main/java/ru/bvn13/jircbot/MainApp.java
index 754eb76..b8fd5fe 100644
--- a/src/main/java/ru/bvn13/jircbot/MainApp.java
+++ b/src/main/java/ru/bvn13/jircbot/MainApp.java
@@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
@EnableAutoConfiguration//(exclude={DataSourceAutoConfiguration.class})
@ComponentScan("ru.bvn13.jircbot")
-public class MainApp implements CommandLineRunner {
+public class MainApp {
private static final Logger logger = LoggerFactory.getLogger(MainApp.class);
@@ -26,8 +26,4 @@ public class MainApp implements CommandLineRunner {
logger.info("==============> STARTING <==============");
}
- @Override
- public void run(String... strings) throws Exception {
-
- }
}
diff --git a/src/main/java/ru/bvn13/jircbot/bot/JircBot.java b/src/main/java/ru/bvn13/jircbot/bot/JircBot.java
index 86e9ad3..44681e2 100644
--- a/src/main/java/ru/bvn13/jircbot/bot/JircBot.java
+++ b/src/main/java/ru/bvn13/jircbot/bot/JircBot.java
@@ -1,6 +1,7 @@
package ru.bvn13.jircbot.bot;
+import lombok.Getter;
import org.pircbotx.Configuration;
import org.pircbotx.MultiBotManager;
import org.pircbotx.PircBotX;
@@ -11,6 +12,7 @@ import org.pircbotx.hooks.ListenerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import ru.bvn13.jircbot.services.YandexSearchService;
import ru.bvn13.jircbot.config.JircBotConfiguration;
@@ -36,6 +38,11 @@ public class JircBot extends ListenerAdapter {
private static Logger logger = LoggerFactory.getLogger(JircBot.class);
+ @Value("${bot.version}")
+ private String version;
+ public String getVersion() {
+ return version == null ? "" : version;
+ }
private JircBotConfiguration config;
@@ -54,7 +61,7 @@ public class JircBot extends ListenerAdapter {
private ScheduledExecutorService executorService;
- MultiBotManager manager = new MultiBotManager();
+ private MultiBotManager manager = new MultiBotManager();
@Autowired
private PingPongListener pingPongListener;
@@ -92,6 +99,7 @@ public class JircBot extends ListenerAdapter {
@PostConstruct
public void postConstruct() {
+ logger.warn("VERSION: "+version);
this.executorService = Executors.newScheduledThreadPool(10);
this.executorService.schedule(new Runnable() {
@Override
@@ -103,19 +111,22 @@ public class JircBot extends ListenerAdapter {
this.executorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
+ //logger.warn("check");
checkBots();
}
- }, 30*1000, 5, TimeUnit.SECONDS);
+ }, 30, 5, TimeUnit.SECONDS);
}
@PreDestroy
public void preDestroy() {
+ logger.warn("Bot is shutting down...");
this.executorService.shutdown();
+ this.manager.stop("Bot is shutting down...");
}
private void initBots() {
- logger.info(">>>>>>>>>>>>>>>>>>>> BOT INIT <<<<<<<<<<<<<<<<<<<<");
+ logger.info(">>>>>>>>>>>>>>>>>>>> BOT INIT : "+getVersion()+" <<<<<<<<<<<<<<<<<<<<");
//Setup this bot
Configuration.Builder templateConfig = new Configuration.Builder()
@@ -129,6 +140,7 @@ public class JircBot extends ListenerAdapter {
servers.add(new Configuration.ServerEntry(c.getServer(), c.getPort()));
Configuration.Builder confBuilder = templateConfig
+ .setRealName("JIrcBot v"+getVersion()+" | github.com/bvn13/JIrcBot")
.setName(c.getBotName())
.addListener(adminListener)
.addListener(pingPongListener)
@@ -177,14 +189,15 @@ public class JircBot extends ListenerAdapter {
}
private void checkBots() {
+
this.manager.getBots().forEach(bot -> {
if (bot.getState().equals(PircBotX.State.DISCONNECTED)) {
try {
bot.startBot();
} catch (IOException e) {
- logger.error("Could not start bot at "+bot.getUserBot().getServer(), e);
+ logger.error("Could not start bot at "+bot.getServerHostname(), e);
} catch (IrcException e) {
- logger.error("IrcException while starting bot at "+bot.getUserBot().getServer(), e);
+ logger.error("IrcException while starting bot at "+bot.getServerHostname(), e);
}
}
});
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/AdminListener.java b/src/main/java/ru/bvn13/jircbot/listeners/AdminListener.java
index cc0fec7..eb610b1 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/AdminListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/AdminListener.java
@@ -37,9 +37,9 @@ public class AdminListener extends ImprovedListenerAdapter {
if (event.getUser().getNick().equals(event.getBot().getNick())) {
event.getBot().sendRaw().rawLineNow("MODE " + event.getBot().getUserBot().getNick() + " +B");
try {
- channelSettingsService.createChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), event.getChannel().getName());
+ channelSettingsService.createChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), event.getChannel().getName());
} catch (Exception e) {
- logger.error("Could not create channel settings for channel "+event.getChannel().getName(), e);
+ logger.error("Could not create channel settings for channel "+event.getChannel().getName()+" at "+event.getBot().getServerHostname(), e);
}
}
}
@@ -77,16 +77,18 @@ public class AdminListener extends ImprovedListenerAdapter {
return;
}
+ String args[] = null;
switch (commands[0].toLowerCase()) {
case "join" :
event.getBot().sendIRC().joinChannel(commands[1]); event.respondPrivateMessage("done"); break;
case "leave" :
event.getBot().sendRaw().rawLine("PART "+commands[1]); event.respondPrivateMessage("done"); break;
case "cmd" :
- event.getBot().sendRaw().rawLine(command); event.respondPrivateMessage("done"); break;
+ args = commands[1].split(" ", 3);
+ event.getBot().sendRaw().rawLine(args[2]); event.respondPrivateMessage("done"); break;
case "set" :
try {
- String args[] = commands[1].split(" ", 4); // set, server, channel, mode/hello-message
+ args = commands[1].split(" ", 4); // set, server, channel, mode/hello-message
changeSettings(JircBot.extractServer(args[1]), args[2], args[0], args[3]);
event.respondPrivateMessage("done");
} catch (Exception e) {
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java b/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java
index e8f9bf8..79a343a 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java
@@ -27,7 +27,7 @@ public class AutoRejoinListener extends ImprovedListenerAdapter {
@Override
public void onKick(KickEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), event.getChannel().getName()).getAutoRejoinEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), event.getChannel().getName()).getAutoRejoinEnabled()) {
return;
}
@@ -42,7 +42,7 @@ public class AutoRejoinListener extends ImprovedListenerAdapter {
@Override
public void onJoin(JoinEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), event.getChannel().getName()).getAutoRejoinEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), event.getChannel().getName()).getAutoRejoinEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java b/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java
index 25cd3f0..a379484 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java
@@ -33,7 +33,7 @@ public class BashOrgListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getBashOrgEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getBashOrgEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java b/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java
index f02b2f4..0a2ef46 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java
@@ -34,7 +34,7 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getDeferredMessagesEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getDeferredMessagesEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java b/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java
index 01c41dd..6b9d95b 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java
@@ -35,7 +35,7 @@ public class GoogleSearchListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), this.getChannelName(event)).getGoogleSearchEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), this.getChannelName(event)).getGoogleSearchEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java b/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java
index 7007ae7..41a2696 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java
@@ -37,7 +37,7 @@ public class GrammarCorrectorListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), this.getChannelName(event)).getGrammarCorrectionEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), this.getChannelName(event)).getGrammarCorrectionEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/HelloOnJoinListener.java b/src/main/java/ru/bvn13/jircbot/listeners/HelloOnJoinListener.java
index bccd144..e6f3ac0 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/HelloOnJoinListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/HelloOnJoinListener.java
@@ -22,7 +22,7 @@ public class HelloOnJoinListener extends ImprovedListenerAdapter {
@Override
public void onJoin(final JoinEvent event) throws Exception {
- ChannelSettings channelSettings = channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event));
+ ChannelSettings channelSettings = channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event));
if (!channelSettings.getHelloOnJoinEnabled()) {
return;
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java b/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java
index d316949..e710b3b 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java
@@ -41,7 +41,7 @@ public class LinkPreviewListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getLinkPreviewEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getLinkPreviewEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/LoggerListener.java b/src/main/java/ru/bvn13/jircbot/listeners/LoggerListener.java
index 4401f4e..800be89 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/LoggerListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/LoggerListener.java
@@ -33,7 +33,7 @@ public class LoggerListener extends ImprovedListenerAdapter {
public boolean isEnabled(Event event) throws Exception {
- return channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getLoggingEnabled();
+ return channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getLoggingEnabled();
}
public boolean isEnabled(String serverName, String channelName) throws Exception {
@@ -72,7 +72,7 @@ public class LoggerListener extends ImprovedListenerAdapter {
for (String channelName : onlineUsers.keySet()) {
Set users = onlineUsers.get(channelName);
if (users.contains(event.getUser().getNick().toLowerCase())) {
- if (isEnabled(JircBot.extractServer(event.getBot().getUserBot().getServer()), channelName)) {
+ if (isEnabled(JircBot.extractServer(event.getBot().getServerHostname()), channelName)) {
log(event.getBot().getServerHostname(), channelName, "User " + event.getUser().getNick() + " quit (" + event.getReason() + ")");
users.remove(event.getUser().getNick().toLowerCase());
}
@@ -102,7 +102,7 @@ public class LoggerListener extends ImprovedListenerAdapter {
for (String channelName : onlineUsers.keySet()) {
Set users = onlineUsers.get(channelName);
if (users.contains(event.getUser().getNick().toLowerCase())) {
- if (isEnabled(JircBot.extractServer(event.getBot().getUserBot().getServer()), channelName)) {
+ if (isEnabled(JircBot.extractServer(event.getBot().getServerHostname()), channelName)) {
log(event.getBot().getServerHostname(), channelName,"User "+event.getOldNick()+" is now known as "+event.getNewNick());
users.remove(event.getUser().getNick().toLowerCase());
}
@@ -130,7 +130,7 @@ public class LoggerListener extends ImprovedListenerAdapter {
@Override
public void onOutput(OutputEvent event) throws Exception {
- if (!isEnabled(JircBot.extractServer(event.getBot().getUserBot().getServer()), event.getLineParsed().get(1))) return;
+ if (!isEnabled(JircBot.extractServer(event.getBot().getServerHostname()), event.getLineParsed().get(1))) return;
switch (event.getLineParsed().get(0)) {
case "PRIVMSG" :
case "NOTICE" :
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/RegexCheckerListener.java b/src/main/java/ru/bvn13/jircbot/listeners/RegexCheckerListener.java
index 374ace8..eaf3344 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/RegexCheckerListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/RegexCheckerListener.java
@@ -30,7 +30,7 @@ public class RegexCheckerListener extends ImprovedListenerAdapter {
//TODO: rework with FSM
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getRegexCheckerEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getRegexCheckerEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/advices/AdviceListener.java b/src/main/java/ru/bvn13/jircbot/listeners/advices/AdviceListener.java
index f0dc5a4..439e73e 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/advices/AdviceListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/advices/AdviceListener.java
@@ -34,7 +34,7 @@ public class AdviceListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getAdvicesEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getAdvicesEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java b/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java
index 1e9670d..bd5776a 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java
@@ -23,7 +23,7 @@ public class CalculatorListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getCalculatorEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getCalculatorEnabled()) {
return;
}
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/quiz/QuizListener.java b/src/main/java/ru/bvn13/jircbot/listeners/quiz/QuizListener.java
index 13d135e..774fe4e 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/quiz/QuizListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/quiz/QuizListener.java
@@ -27,7 +27,7 @@ public class QuizListener extends ImprovedListenerAdapter {
@Override
public void onGenericMessage(final GenericMessageEvent event) throws Exception {
- if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getUserBot().getServer()), getChannelName(event)).getQuizEnabled()) {
+ if (!channelSettingsService.getChannelSettings(JircBot.extractServer(event.getBot().getServerHostname()), getChannelName(event)).getQuizEnabled()) {
return;
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 0000000..85ee0d4
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1,32 @@
+
+name=jircbot
+bot.version=@bot.version@
+
+config=config.json
+
+spring.profiles.active=production
+
+server.port=8002
+
+# for PostgreSQL
+spring.datasource.driverClassName=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://localhost:5432/jircbot
+spring.datasource.username=jircbot
+spring.datasource.password=jircbotpass
+# for MySQL
+#spring.datasource.driverClassName=com.mysql.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://localhost:3306/jircbot
+#spring.datasource.username=jircbot
+#spring.datasource.password=jircbotpass
+
+# for PostgreSQL
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+# for MySQL
+#spring.jpa.properties.hibernate.dialect=org.hibernate.spatial.dialect.mysql.MySQLSpatialDialect
+
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=false
+spring.jpa.properties.hibernate.use_sql_comments=true
+spring.jpa.properties.hibernate.format_sql=true
+
+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
deleted file mode 100644
index 84eb800..0000000
--- a/src/main/resources/application.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-name: jircbot
-
-config: config.json
-
-server:
- port: 8002
-
-spring:
- # for PostgreSQL
- dataSource:
- driverClassName: org.postgresql.Driver
- url: jdbc:postgresql://localhost:5432/jircbot
- username: jircbot
- password: jircbotpass
- # for MySQL
-# dataSource:
-# driverClassName: com.mysql.jdbc.Driver
-# url: jdbc:mysql://localhost:3306/jircbot
-# username: jircbot
-# password: jircbotpass
-
- hibernate:
- # for PostgreSQL
- dialect: org.hibernate.dialect.PostgreSQLDialect
- # for MySQL
-# dialect: org.hibernate.spatial.dialect.mysql.MySQLSpatialDialect
- hbm2ddl.auto: update
- show_sql: false
- use_sql_comments: true
- format_sql: true
-
-
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 8fb25bb..90cca06 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -16,12 +16,10 @@
-
+
-
-
-
-
+
+
diff --git a/src/main/resources/sql/update_to_2.0.0.sql b/src/main/resources/sql/update_to_2.0.0.sql
new file mode 100644
index 0000000..316e732
--- /dev/null
+++ b/src/main/resources/sql/update_to_2.0.0.sql
@@ -0,0 +1,34 @@
+ALTER TABLE public.channel_settings DROP CONSTRAINT uniq_channel_settings_server_host_channel_name;
+
+ALTER TABLE public.channel_settings RENAME dtcreated TO dt_created;
+ALTER TABLE public.channel_settings RENAME dtupdated TO dt_updated;
+ALTER TABLE public.channel_settings RENAME advicesenabled TO advices_enabled;
+ALTER TABLE public.channel_settings RENAME autorejoinenabled TO auto_rejoin_enabled;
+ALTER TABLE public.channel_settings RENAME bashorgenabled TO bash_org_enabled;
+ALTER TABLE public.channel_settings RENAME calculatorenabled TO calculator_enabled;
+ALTER TABLE public.channel_settings RENAME channelname TO channel_name;
+ALTER TABLE public.channel_settings RENAME deferredmessagesenabled TO deferred_messages_enabled;
+ALTER TABLE public.channel_settings RENAME helloonjoinenabled TO hello_on_join_enabled;
+ALTER TABLE public.channel_settings RENAME linkpreviewenabled TO link_preview_enabled;
+ALTER TABLE public.channel_settings RENAME quizenabled TO quiz_enabled;
+ALTER TABLE public.channel_settings RENAME regexcheckerenabled TO regex_checker_enabled;
+ALTER TABLE public.channel_settings RENAME grammarcorrectionenabled TO grammar_correction_enabled;
+ALTER TABLE public.channel_settings RENAME googlesearchenabled TO google_search_enabled;
+ALTER TABLE public.channel_settings RENAME loggingenabled TO logging_enabled;
+ALTER TABLE public.channel_settings RENAME onjoinmessage TO on_join_message;
+ALTER TABLE public.channel_settings RENAME serverhost TO server_host;
+
+
+ALTER TABLE public.deferred_messages RENAME dtcreated TO dt_created;
+ALTER TABLE public.deferred_messages RENAME dtupdated TO dt_updated;
+ALTER TABLE public.deferred_messages RENAME channelname TO channel_name;
+
+
+ALTER TABLE public.irc_messages RENAME dtcreated TO dt_created;
+ALTER TABLE public.irc_messages RENAME dtupdated TO dt_updated;
+ALTER TABLE public.irc_messages RENAME channelname TO channel_name;
+ALTER TABLE public.irc_messages RENAME serverhost TO server_host;
+
+
+ALTER TABLE public.grammar_correction RENAME dtcreated TO dt_created;
+ALTER TABLE public.grammar_correction RENAME dtupdated TO dt_updated;