From 5892bd83aac718b41a5a8497ce889911dd1f8508 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Fri, 12 Apr 2013 18:20:39 +0000
Subject: [PATCH] ~qmerge command [Close #347]

---
 modules/quotes/commands.js  | 37 ++++++++++++++++++++++++++++++++++++-
 modules/quotes/strings.json |  3 +++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/modules/quotes/commands.js b/modules/quotes/commands.js
index e96b358..ef90295 100644
--- a/modules/quotes/commands.js
+++ b/modules/quotes/commands.js
@@ -255,7 +255,7 @@ var commands = function(dbot) {
                             'count': category.quotes.length
                         }));
                     } else {
-                        event.reply(dbot.t('category_not_found', { 'category': name }));
+                        event.reply(dbot.t('category_not_found', { 'category': key }));
                     }
                 });
             } else {
@@ -298,6 +298,40 @@ var commands = function(dbot) {
             }.bind(this));
         },
 
+        // Merge a quote category insto another
+        '~qmerge': function(event) {
+            var primaryName = event.input[1],
+                secondName = event.input[2],
+                primary = false,
+                secondary = false;
+
+            this.db.search('quote_category', { 'name': primaryName }, function(result) { 
+                primary = result;
+            }, function(err) {
+                if(primary) {
+                    this.db.search('quote_category', { 'name': secondName }, function(result) { 
+                        secondary = result;
+                    }, function(err) {
+                        if(secondary) {
+                            primary.quotes = _.union(primary.quotes, secondary.quotes);
+                            this.db.save('quote_category', primary.id, primary, function(err) {
+                                this.db.del('quote_category', secondary.id, function(err) {
+                                    event.reply(dbot.t('categories_merged', {
+                                        'from': secondName, 
+                                        'into': primaryName
+                                    }));
+                                });
+                            }.bind(this));
+                        } else {
+                            event.reply(dbot.t('category_not_found', { 'category': secondName }));
+                        }
+                    }.bind(this));
+                } else {
+                    event.reply(dbot.t('category_not_found', { 'category': primaryName }));
+                }
+            }.bind(this));
+        },
+
         // Link to quote web page
         '~link': function(event) {
             var key = event.input[1].toLowerCase(),
@@ -333,6 +367,7 @@ var commands = function(dbot) {
     commands['~rmlast'].regex = [/^~rmlast ([\d\w\s-]*)/, 2];
     commands['~qadd'].regex = [/^~qadd ([\d\w-]+[\d\w\s-]*)[ ]?=[ ]?(.+)$/, 3];
     commands['~qrename'].regex = [/^~qrename ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
+    commands['~qmerge'].regex = [/^~qmerge ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
     commands['~link'].regex = [/^~link ([\d\w\s-]*)/, 2];
 
     commands['~rmconfirm'].access = 'moderator';
diff --git a/modules/quotes/strings.json b/modules/quotes/strings.json
index 50e9a71..c1aac84 100644
--- a/modules/quotes/strings.json
+++ b/modules/quotes/strings.json
@@ -135,5 +135,8 @@
     },
     "newcat_exists": {
         "en": "Category ~{newcat} already exists. Delete that first or use ~qmerge."
+    },
+    "categories_merged": {
+        "en": "Category ~{from} and its quotes merged into ~{into}."
     }
 }