Merge pull request #255 from SockDrawer/v2.11.3-emergency

Fix message processing
SockDrawer · Sep 12, 2015 · 61c4cf1 · 61c4cf1
2 parents 81870a8 + 5802a43
commit 61c4cf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/messages.js b/lib/messages.js
@@ -163,7 +163,7 @@ function handleMessages(messages) {
         privateFns.processPosts(postMessages, next);
     }], (_, finalMessages) => {
         finalMessages.forEach(message => {
-            const handled = internals.events.emit('topic#' + message.topic.topic_id,
+            const handled = internals.events.emit('topic#' + message.topic.id,
                 message.data, message.topic, message.post);
             if (!handled) {
                 internals.events.emit('logWarning', 'Message ' + message.message_id + ' for channel ' +

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sockbot",
-  "version": "2.11.2",
+  "version": "2.11.3",
   "releaseName": "Cheery Chiffon",
   "description": "A sockpuppet bot to use on http://what.thedailywtf.com.",
   "repository": "https://github.com/SockDrawer/SockBot",

diff --git a/test/lib/messagesTest.js b/test/lib/messagesTest.js
@@ -1369,13 +1369,13 @@ describe('messages', () => {
                     const message = {
                         post: Math.random(),
                         topic: {
-                            'topic_id': Math.random()
+                            id: Math.random()
                         },
                         data: Math.random()
                     };
                     emit.returns(true);
                     finalStep(null, [message]);
-                    emit.calledWith('topic#' + message.topic.topic_id,
+                    emit.calledWith('topic#' + message.topic.id,
                         message.data, message.topic, message.post).should.equal(true);
                 });
                 it('should emit warning for unhandled message', () => {