Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-19 22:09:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-04-26 12:17:51 -04:00
parent 7e00d6b91e 896b8553f7
commit 9ae5946e7a
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -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",

2
src/socket.io/posts.js
View File

@@ -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);

8
src/upgrades/1.4.6/delete_sessions.js
View File

@@ -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;

7
src/upgrades/1.7.3/key_value_schema_change.js
View File

@@ -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) {

4
test/topics.js
View File

@@ -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);