From d7640f1c205e857844c303504360f827248f56da Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Sat, 31 Aug 2013 13:30:24 +0000
Subject: [PATCH] include channel in logs

---
 config.json.sample       | 1 +
 modules/log/log.js       | 2 ++
 modules/log/strings.json | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config.json.sample b/config.json.sample
index 37d1253..496dbe6 100644
--- a/config.json.sample
+++ b/config.json.sample
@@ -20,6 +20,7 @@
     "debugMode": false,
     "debugLevel": 1,
     "redisPort": 6379,
+    "timezone": "Europe/London",
     "repoRoot": "https://github.com/reality/depressionbot/",
     "version": "Depressionbot IRC bot 0.5-dev - Lovingly crafted by The DepressionBot Foundation (a charity arm of the Official Aberystwyth Open Source International Development League)."
 }
diff --git a/modules/log/log.js b/modules/log/log.js
index 2d503db..f8103cc 100644
--- a/modules/log/log.js
+++ b/modules/log/log.js
@@ -13,6 +13,7 @@ var log = function(dbot) {
             dbot.say(server, logChannel, dbot.t('log_message', {
                 'time': new Date().toUTCString(),
                 'command': message,
+                "channel"; 'nochan',
                 'user': user
             }));
         },
@@ -28,6 +29,7 @@ var log = function(dbot) {
             if(logChannel && !_.include(this.ignoredCommands, event.message.split(' ')[0])) {
                 dbot.say(event.server, logChannel, dbot.t('log_message', {
                     'time': new Date().toUTCString(),
+                    'channel': event.channel.name,
                     'command': event.message,
                     'user': event.user
                 }));
diff --git a/modules/log/strings.json b/modules/log/strings.json
index 1b050e8..cb70d42 100644
--- a/modules/log/strings.json
+++ b/modules/log/strings.json
@@ -1,7 +1,7 @@
 {
     "log_message": {
-        "en": "[{time}] {user}: {command}",
-	"fr": "[{time}] {user}: {command}",
-	"it": "[{time}] {user}: {command}"
+        "en": "[{time}] {user} ({channel}): {command}",
+	"fr": "[{time}] {user} ({channel}): {command}",
+	"it": "[{time}] {user} ({channel}): {command}"
     }
 }