From 4a8e5d0cc05181b90455b55015721f31b8baa445 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 21 Mar 2013 03:41:27 -0400 Subject: [PATCH] fix error on ~link when web is misconfigured/not loaded --- modules/quotes/commands.js | 21 +++++++++++++-------- modules/quotes/strings.json | 3 +++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/quotes/commands.js b/modules/quotes/commands.js index 34166aa..336f89d 100644 --- a/modules/quotes/commands.js +++ b/modules/quotes/commands.js @@ -194,14 +194,19 @@ var commands = function(dbot) { '~link': function(event) { var key = event.input[1].toLowerCase(); if(_.has(quotes, key)) { - event.reply(dbot.t('quote_link', { - 'category': key, - 'url': dbot.t('url', { - 'host': dbot.config.web.webHost, - 'port': dbot.config.web.webPort, - 'path': 'quotes/' + encodeURIComponent(key) - }) - })); + if(_.has(dbot.config, 'web') && _.has(dbot.config.web, 'webHost') && + _.has(dbot.config.web, 'webPort')) { + event.reply(dbot.t('quote_link', { + 'category': key, + 'url': dbot.t('url', { + 'host': dbot.config.web.webHost, + 'port': dbot.config.web.webPort, + 'path': 'quotes/' + encodeURIComponent(key) + }) + })); + } else { + event.reply(dbot.t('web_not_configured')); + } } else { event.reply(dbot.t('category_not_found', { 'category': key })); } diff --git a/modules/quotes/strings.json b/modules/quotes/strings.json index 5c3d3d3..2622f68 100644 --- a/modules/quotes/strings.json +++ b/modules/quotes/strings.json @@ -126,5 +126,8 @@ "rm_cache_limit": { "en": "Attention: Too many quotes removed, rmCache must be cleared or reinstated manually with ~rmconfirm or ~rmdeny.", "na'vi": "Oel zerok 'upxareti apxay set, sweylu txo nga 'aivku upxareti ìlä ~rmconfirm fu ~rmdeny." + }, + "web_not_configured": { + "en": "Cannot link to category. Web module is either not loaded or misconfigured." } }