From feb9517a9fe6db2e19d3e1c0c42e5d571d7bf34d Mon Sep 17 00:00:00 2001
From: Luke Slater <reality@mes.localdomain>
Date: Wed, 28 Sep 2011 14:03:26 +0100
Subject: [PATCH] move realiPuns to quoteArrs

---
 modules/puns.js    | 2 +-
 modules/quotes.js  | 2 +-
 modules/reality.js | 2 +-
 run.js             | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/puns.js b/modules/puns.js
index 49b2762..1cc2661 100644
--- a/modules/puns.js
+++ b/modules/puns.js
@@ -4,7 +4,7 @@ var puns = function(dbot) {
     return {
         'listener': function(data) {
             if(data.user == 'reality') {
-                dbot.instance.say(data.channel, dbot.db.realiPuns.random());
+                dbot.instance.say(data.channel, dbot.db.quoteArrs['realityonce'].random());
             } else if(dbot.db.quoteArrs.hasOwnProperty(data.user.toLowerCase())) {
                 dbot.say(data.channel, data.user + ': ' + dbot.db.quoteArrs[data.user.toLowerCase()].random());
             } else if(dbot.instance.inChannel(data.channel)) {
diff --git a/modules/quotes.js b/modules/quotes.js
index 6c6d8b5..c7f0730 100644
--- a/modules/quotes.js
+++ b/modules/quotes.js
@@ -90,7 +90,7 @@ var quotes = function(dbot) {
         },
         
         '~reality': function(data, params) {
-            dbot.say(data.channel, dbot.db.realiPuns.random());
+            dbot.say(data.channel, dbot.db.quoteArrs['realityonce'].random());
         },
 
         '~d': function(data, params) {
diff --git a/modules/reality.js b/modules/reality.js
index 3a6a160..efff097 100644
--- a/modules/reality.js
+++ b/modules/reality.js
@@ -11,7 +11,7 @@ var reality = function(dbot) {
             }
 
             if(once) {
-                dbot.db.realiPuns.push('reality ' + once[1] + '.');
+                dbot.db.quoteArrs['realityonce'].push('reality ' + once[1] + '.');
                 dbot.instance.say(data.channel, '\'reality ' + once[1] + '.\' saved.');
                 dbot.save();
             }
diff --git a/run.js b/run.js
index 920075a..775a74d 100644
--- a/run.js
+++ b/run.js
@@ -13,10 +13,8 @@ var DBot = function(dModules, timers) {
     this.timers = timers.create();
 
     this.instance = jsbot.createJSBot(this.name, 'elara.ivixor.net', 6667, this, function() {
-        this.instance.join('#plur');
         this.instance.join('#42');
         this.instance.join('#itonlygetsworse');
-        this.instance.join('#fail');
     }.bind(this));
 
     this.moduleNames = dModules;