From a46db9616cdefcde6f3ed98fc81a3d16ba950dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Mon, 21 Aug 2017 16:48:18 -0400
Subject: [PATCH] fix message delete and add test

---
 src/messaging/delete.js |  2 +-
 test/messaging.js       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/messaging/delete.js b/src/messaging/delete.js
index 89235790fa..e3058c0ba9 100644
--- a/src/messaging/delete.js
+++ b/src/messaging/delete.js
@@ -16,7 +16,7 @@ module.exports = function (Messaging) {
 				var keys = uids.map(function (uid) {
 					return 'uid:' + uid + ':chat:room:' + roomId + ':mids';
 				});
-				db.sortedSetsRemove(keys, roomId, next);
+				db.sortedSetsRemove(keys, mid, next);
 			},
 			function (next) {
 				db.delete('message:' + mid, next);
diff --git a/test/messaging.js b/test/messaging.js
index 42ab69f7d6..c2d7ee1b67 100644
--- a/test/messaging.js
+++ b/test/messaging.js
@@ -299,13 +299,13 @@ describe('Messaging Library', function () {
 		});
 
 		it('should fail to get messages from room with invalid data', function (done) {
-			socketModules.chats.getMessages({ uid: null }, null, function (err, messages) {
+			socketModules.chats.getMessages({ uid: null }, null, function (err) {
 				assert.equal(err.message, '[[error:invalid-data]]');
-				socketModules.chats.getMessages({ uid: fooUid }, null, function (err, messages) {
+				socketModules.chats.getMessages({ uid: fooUid }, null, function (err) {
 					assert.equal(err.message, '[[error:invalid-data]]');
-					socketModules.chats.getMessages({ uid: fooUid }, { uid: null }, function (err, messages) {
+					socketModules.chats.getMessages({ uid: fooUid }, { uid: null }, function (err) {
 						assert.equal(err.message, '[[error:invalid-data]]');
-						socketModules.chats.getMessages({ uid: fooUid }, { uid: 1, roomId: null }, function (err, messages) {
+						socketModules.chats.getMessages({ uid: fooUid }, { uid: 1, roomId: null }, function (err) {
 							assert.equal(err.message, '[[error:invalid-data]]');
 							done();
 						});
@@ -438,7 +438,7 @@ describe('Messaging Library', function () {
 		});
 
 		it('should escape teaser', function (done) {
-			socketModules.chats.send({ uid: fooUid }, { roomId: roomId, message: '<svg/onload=alert(document.location);' }, function (err, messageData) {
+			socketModules.chats.send({ uid: fooUid }, { roomId: roomId, message: '<svg/onload=alert(document.location);' }, function (err) {
 				assert.ifError(err);
 				socketModules.chats.getRecentChats({ uid: fooUid }, { after: 0, uid: fooUid }, function (err, data) {
 					assert.ifError(err);
@@ -536,7 +536,11 @@ describe('Messaging Library', function () {
 				db.exists('message:' + mid, function (err, exists) {
 					assert.ifError(err);
 					assert(!exists);
-					done();
+					db.isSortedSetMember('uid:' + fooUid + ':chat:room:' + roomId + ':mids', mid, function (err, isMember) {
+						assert.ifError(err);
+						assert(!isMember);
+						done();
+					});
 				});
 			});
 		});
@@ -614,7 +618,7 @@ describe('Messaging Library', function () {
 		it('should return 404 if user is not in room', function (done) {
 			helpers.loginUser('baz', 'quuxquux', function (err, jar) {
 				assert.ifError(err);
-				request(nconf.get('url') + '/api/user/baz/chats/' + roomId, { json: true, jar: jar }, function (err, response, body) {
+				request(nconf.get('url') + '/api/user/baz/chats/' + roomId, { json: true, jar: jar }, function (err, response) {
 					assert.ifError(err);
 					assert.equal(response.statusCode, 404);
 					done();