From 677a820638f69f60b509dfc165957a66219c5c06 Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Fri, 12 Apr 2013 22:53:45 +0000
Subject: [PATCH] add web api function for getUrl instead of string in base,
 use externalAddress optional config key to define external behaviours [#264]

---
 modules/poll/commands.js    |  8 +++-----
 modules/profile/commands.js |  2 +-
 modules/quotes/commands.js  |  7 +------
 modules/web/config.json     |  3 ++-
 modules/web/web.js          | 12 +++++++++++-
 strings.json                |  3 ---
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modules/poll/commands.js b/modules/poll/commands.js
index ac36252..15db188 100644
--- a/modules/poll/commands.js
+++ b/modules/poll/commands.js
@@ -21,14 +21,12 @@ var commands = function(dbot) {
                 for(var i=0;i<options.length;i++) {
                     polls[name]['votes'][options[i]] = 0;
                 }
+
+                
                 event.reply(dbot.t('poll_created', {
                     'name': name, 
                     'description': description, 
-                    'url': dbot.t('url', {
-                        'host': dbot.config.web.webHost,
-                        'port': dbot.config.web.webPort, 
-                        'path': 'polls/' + name
-                    })
+                    'url': dbot.api.web.getUrl('/poll/' + name)     
                 })); 
             }
         },
diff --git a/modules/profile/commands.js b/modules/profile/commands.js
index a402066..ece4638 100644
--- a/modules/profile/commands.js
+++ b/modules/profile/commands.js
@@ -33,7 +33,7 @@ var commands = function(dbot){
             if(event.params[1]){
                 var primary = dbot.api.users.resolveUser(event.server, event.params[1]);
                 if(_.has(dbot.db.profiles[event.server], primary.toLowerCase())){
-                    event.reply("http://"+dbot.config.web.webHost+":"+dbot.config.web.webPort+"/profile/"+event.server+"/"+primary.toLowerCase());
+                    event.reply(dbot.api.web.getUrl("/profile/"+event.server+"/"+primary.toLowerCase());
                 }
                 else{
                     event.reply("No profile found for "+event.params[1]);
diff --git a/modules/quotes/commands.js b/modules/quotes/commands.js
index 207a30d..1b04ac4 100644
--- a/modules/quotes/commands.js
+++ b/modules/quotes/commands.js
@@ -71,7 +71,6 @@ var commands = function(dbot) {
         },
         
         // Search a given category for some text.
-        // TODO fix
         '~qsearch': function(event) {
             var haystack = event.input[1].trim().toLowerCase();
             var needle = event.input[2];
@@ -202,11 +201,7 @@ var commands = function(dbot) {
                    _.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)
-                        })
+                        'url': dbot.api.web.getUrl('quotes/' + encodeURIComponent(key))
                     }));
                 } else {
                     event.reply(dbot.t('web_not_configured'));
diff --git a/modules/web/config.json b/modules/web/config.json
index 981e0f7..7ed62f6 100644
--- a/modules/web/config.json
+++ b/modules/web/config.json
@@ -1,4 +1,5 @@
 {
     "webHost": "localhost",
-    "webPort": 8080
+    "webPort": 8080,
+    "externalPath": false
 }
diff --git a/modules/web/web.js b/modules/web/web.js
index a71dac3..452beb4 100644
--- a/modules/web/web.js
+++ b/modules/web/web.js
@@ -37,7 +37,17 @@ var webInterface = function(dbot) {
 
     this.onDestroy = function() {
         server.close();
-    }
+    };
+
+    this.api = {
+        'getUrl': function(path) {
+            if(this.config.externalPath) {
+                return this.config.externalPath + '/' + path;
+            } else {
+                return 'http://' + this.config.webHost + ':' + port + '/' + path;
+            }
+        };
+    };
 };
 
 exports.fetch = function(dbot) {
diff --git a/strings.json b/strings.json
index 1f67531..f9d5189 100644
--- a/strings.json
+++ b/strings.json
@@ -10,8 +10,5 @@
         "es": "No se pudó cargar el módulo: {moduleName}",
         "na'vi": "Oeru Oel {moduleName}it sung.",
         "cy": "Wedi methu a llwytho modiwl: {moduleName}"
-    },
-    "url": {
-        "en": "http://{host}:{port}/{path}"
     }
 }