3
0
mirror of https://github.com/reality/dbot.git synced 2024-12-24 11:42:36 +01:00

Merge branch 'master' into master

This commit is contained in:
Scritches 2018-05-15 20:12:40 -04:00 committed by GitHub
commit c26be5410f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -19,7 +19,8 @@ var kill_namespam = function(dbot) {
// Here we listen for atropos
if(event.channel == this.config.cliconn_channel) {
if(event.message.match('▶')) {
var matchedPattern = _.find(this.config.cliconn_patterns, function(p) { return event.message.match(p); })
var matchedPattern = _.find(this.config.cliconn_patterns,
function(p) { try { return event.message.match(p); } catch(e) {}; }); // ok.jpg
if(matchedPattern) {
var nick = event.message.split(' ')[2];
dbot.api.nickserv.getUserHost(event.server, nick, function(host) {

2
run.js
View File

@ -332,7 +332,7 @@ DBot.prototype.reloadModules = function() {
}.bind(this));
this.save();
this.save(function() {});
};
new DBot();