Georg/dbot
1
0
Fork 0
forked from GitHub/dbot
Code Issues Pull Requests Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
Luke Slater 2011-11-25 12:29:37 +00:00
commit f0e079539f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
run.js
View File

@ -10,13 +10,13 @@ var DBot = function(dModules, timers) {
this.db = JSON.parse(fs.readFileSync('db.json', 'utf-8')); this.db = JSON.parse(fs.readFileSync('db.json', 'utf-8'));
this.admin = this.config.admin || 'reality'; this.admin = this.config.admin || 'reality';
this.name = this.config.name || 'depressionbot';
this.password = this.config.password || 'lolturtles'; this.password = this.config.password || 'lolturtles';
this.name = this.config.name || 'dbox';
this.timers = timers.create(); this.timers = timers.create();
this.waitingForKarma = false; this.waitingForKarma = false;
this.instance = jsbot.createJSBot(this.name, 'elara.ivixor.net', 6667, this, this.password, this.instance = jsbot.createJSBot(this.name, 'elara.ivixor.net', 6667, this,
function() { function() {
if(this.config.hasOwnProperty('channels')) { if(this.config.hasOwnProperty('channels')) {
this.config.channels.each(function(channel) { this.config.channels.each(function(channel) {