Merge remote-tracking branch 'refs/remotes/origin/master' into develop

install/package.json

@@ -64,7 +64,7 @@
         "mousetrap": "^1.6.1",
         "mubsub": "^1.4.0",
         "nconf": "^0.9.1",
-        "nodebb-plugin-composer-default": "6.0.21",
+        "nodebb-plugin-composer-default": "6.0.22",
         "nodebb-plugin-dbsearch": "2.0.16",
         "nodebb-plugin-emoji": "^2.2.2",
         "nodebb-plugin-emoji-android": "2.0.0",

src/socket.io/posts.js

@@ -59,7 +59,7 @@ function postReply(socket, data, callback) {
 
 			next(null, postData);
 
-			websockets.in('uid_' + socket.uid).emit('event:new_post', result);
+			socket.emit('event:new_post', result);
 
 			user.updateOnlineUsers(socket.uid);
 

src/upgrades/1.4.6/delete_sessions.js

@@ -9,7 +9,13 @@ module.exports = {
 	name: 'Delete accidentally long-lived sessions',
 	timestamp: Date.UTC(2017, 3, 16),
 	method: function (callback) {
-		var configJSON = require('../../../config.json');
+		var configJSON;
+		try {
+			configJSON = require('../../../config.json') || { [process.env.database]: true };
+		} catch (err) {
+			configJSON = { [process.env.database]: true };
+		}
+
 		var isRedisSessionStore = configJSON.hasOwnProperty('redis');
 		var progress = this.progress;
 

src/upgrades/1.7.3/key_value_schema_change.js

@@ -8,7 +8,12 @@ module.exports = {
 	name: 'Change the schema of simple keys so they don\'t use value field (mongodb only)',
 	timestamp: Date.UTC(2017, 11, 18),
 	method: function (callback) {
-		var configJSON = require('../../../config.json');
+		var configJSON;
+		try {
+			configJSON = require('../../../config.json') || { [process.env.database]: true, database: process.env.database };
+		} catch (err) {
+			configJSON = { [process.env.database]: true, database: process.env.database };
+		}
 		var isMongo = configJSON.hasOwnProperty('mongo') && configJSON.database === 'mongo';
 		var progress = this.progress;
 		if (!isMongo) {

test/topics.js

@@ -1080,14 +1080,12 @@ describe('Topic\'s', function () {
 		});
 
 		it('should mark topic notifications read', function (done) {
-			var socketPosts = require('../src/socket.io/posts');
-
 			async.waterfall([
 				function (next) {
 					socketTopics.follow({ uid: adminUid }, tid, next);
 				},
 				function (next) {
-					socketPosts.reply({ uid: uid }, { content: 'some content', tid: tid }, next);
+					topics.reply({ uid: uid, timestamp: Date.now(), content: 'some content', tid: tid }, next);
 				},
 				function (data, next) {
 					setTimeout(next, 2500);