Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-02 13:50:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into flagging-refactor

Browse Source
This commit is contained in:
Julian Lam
2016-12-14 14:45:25 -05:00
parent e6768ab572 e17b37edb6
commit 5e109bb4a8
9 changed files with 103 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -26,4 +26,5 @@ node_js:
- "4"
branches:
only:
- master
- master
- develop

14
src/plugins/install.js
View File

@@ -89,8 +89,7 @@ module.exports = function (Plugins) {
next();
},
function (next) {
var command = installed ? ('npm uninstall ' + id) : ('npm install ' + id + '@' + (version || 'latest'));
runNpmCommand(command, next);
runNpmCommand(type, id, version || 'latest', next);
},
function (next) {
Plugins.get(id, next);
@@ -102,12 +101,13 @@ module.exports = function (Plugins) {
], callback);
}
function runNpmCommand(command, callback) {
require('child_process').exec(command, function (err, stdout) {
function runNpmCommand(command, pkgName, version, callback) {
require('child_process').execFile('npm', [command, pkgName + (command === 'install' ? '@' + version : '')], function (err, stdout) {
if (err) {
return callback(err);
}
winston.verbose('[plugins] ' + stdout);
winston.verbose('[plugins/' + command + '] ' + stdout);
callback();
});
}
@@ -119,9 +119,7 @@ module.exports = function (Plugins) {
function upgrade(id, version, callback) {
async.waterfall([
function (next) {
runNpmCommand('npm install ' + id + '@' + (version || 'latest'), next);
},
async.apply(runNpmCommand, 'install', id, version || 'latest'),
function (next) {
Plugins.isActive(id, next);
},

2
src/routes/index.js
View File

@@ -149,7 +149,7 @@ module.exports = function (app, middleware, hotswapIds) {
app.use(relativePath, express.static(path.join(__dirname, '../../', 'public'), {
maxAge: app.enabled('cache') ? 5184000000 : 0
}));
app.use('/vendor/jquery/timeago/locales', middleware.processTimeagoLocales);
app.use(relativePath + '/vendor/jquery/timeago/locales', middleware.processTimeagoLocales);
app.use(controllers.handle404);
app.use(controllers.handleURIErrors);
app.use(controllers.handleErrors);

8
src/socket.io/admin/user.js
View File

@@ -8,6 +8,7 @@ var groups = require('../../groups');
var user = require('../../user');
var events = require('../../events');
var meta = require('../../meta');
var plugins = require('../../plugins');
var User = {};
@@ -169,6 +170,13 @@ function deleteUsers(socket, uids, method, callback) {
uid: socket.uid,
targetUid: uid,
ip: socket.ip
}, next);
},
function (next) {
plugins.fireHook('action:user.delete', {
callerUid: socket.uid,
uid: uid,
ip: socket.ip
});
next();
}

85
src/socket.io/user/ban.js
View File

@@ -5,50 +5,65 @@ var user = require('../../user');
var websockets = require('../index');
var events = require('../../events');
var plugins = require('../../plugins');
module.exports = function (SocketUser) {
SocketUser.banUsers = function (socket, data, callback) {
// Backwards compatibility
if (Array.isArray(data)) {
data = {
uids: data,
until: 0,
reason: ''
};
if (!data || !Array.isArray(data.uids)) {
return callback(new Error('[[error:invalid-data]]'));
}
toggleBan(socket.uid, data.uids, function (uid, next) {
banUser(uid, data.until || 0, data.reason || '', next);
}, function (err) {
if (err) {
return callback(err);
}
async.each(data.uids, function (uid, next) {
events.log({
type: 'user-ban',
uid: socket.uid,
targetUid: uid,
ip: socket.ip
}, next);
}, callback);
});
async.waterfall([
function (next) {
banUser(uid, data.until || 0, data.reason || '', next);
},
function (next) {
events.log({
type: 'user-ban',
uid: socket.uid,
targetUid: uid,
ip: socket.ip
}, next);
},
function (next) {
plugins.fireHook('action:user.banned', {
callerUid: socket.uid,
ip: socket.ip,
uid: uid,
until: data.until > 0 ? data.until : undefined
});
next();
}
], next);
}, callback);
};
SocketUser.unbanUsers = function (socket, uids, callback) {
toggleBan(socket.uid, uids, user.unban, function (err) {
if (err) {
return callback(err);
}
async.each(uids, function (uid, next) {
events.log({
type: 'user-unban',
uid: socket.uid,
targetUid: uid,
ip: socket.ip
}, next);
}, callback);
});
toggleBan(socket.uid, uids, function (uid, next) {
async.waterfall([
function (next) {
user.unban(uid, next);
},
function (next) {
events.log({
type: 'user-unban',
uid: socket.uid,
targetUid: uid,
ip: socket.ip
}, next);
},
function (next) {
plugins.fireHook('action:user.unbanned', {
callerUid: socket.uid,
ip: socket.ip,
uid: uid
});
next();
}
], next);
}, callback);
};
function toggleBan(uid, uids, method, callback) {

14
src/socket.io/user/picture.js
View File

@@ -3,6 +3,7 @@
var async = require('async');
var winston = require('winston');
var path = require('path');
var nconf = require('nconf');
var user = require('../../user');
var plugins = require('../../plugins');
@@ -84,11 +85,14 @@ module.exports = function (SocketUser) {
},
function (userData, next) {
if (userData.uploadedpicture && !userData.uploadedpicture.startsWith('http')) {
require('fs').unlink(path.join(__dirname, '../../../public', userData.uploadedpicture), function (err) {
if (err) {
winston.error(err);
}
});
var pathToFile = path.join(nconf.get('base_dir'), 'public', userData.uploadedpicture);
if (pathToFile.startsWith(path.join(nconf.get('base_dir'), nconf.get('upload_path')))) {
require('fs').unlink(pathToFile, function (err) {
if (err) {
winston.error(err);
}
});
}
}
user.setUserFields(data.uid, {

14
src/user/bans.js
View File

@@ -42,15 +42,7 @@ module.exports = function (User) {
}
async.series(tasks, function (err) {
if (err) {
return callback(err);
}
plugins.fireHook('action:user.banned', {
uid: uid,
until: until > 0 ? until : undefined
});
callback();
callback(err);
});
};
@@ -61,10 +53,6 @@ module.exports = function (User) {
},
function (next) {
db.sortedSetsRemove(['users:banned', 'users:banned:expire'], uid, next);
},
function (next) {
plugins.fireHook('action:user.unbanned', {uid: uid});
next();
}
], callback);
};

2
src/user/create.js
View File

@@ -88,7 +88,7 @@ module.exports = function (User) {
},
function (next) {
var sets = ['users:joindate', 'users:online'];
if (parseInt(userData.uid) !== 1) {
if (parseInt(userData.uid, 10) !== 1) {
sets.push('users:notvalidated');
}
db.sortedSetsAdd(sets, timestamp, userData.uid, next);

46
src/user/profile.js
View File

@@ -14,7 +14,7 @@ module.exports = function (User) {
User.updateProfile = function (uid, data, callback) {
var fields = ['username', 'email', 'fullname', 'website', 'location',
'groupTitle', 'birthday', 'signature', 'aboutme', 'picture', 'uploadedpicture'];
'groupTitle', 'birthday', 'signature', 'aboutme'];
async.waterfall([
function (next) {
@@ -147,32 +147,34 @@ module.exports = function (User) {
}
function updateEmail(uid, newEmail, callback) {
User.getUserFields(uid, ['email', 'picture', 'uploadedpicture'], function (err, userData) {
if (err) {
return callback(err);
}
async.waterfall([
function (next) {
User.getUserField(uid, 'email', next);
},
function (oldEmail, next) {
oldEmail = oldEmail || '';
userData.email = userData.email || '';
if (userData.email === newEmail) {
return callback();
}
async.series([
async.apply(db.sortedSetRemove, 'email:uid', userData.email.toLowerCase()),
async.apply(db.sortedSetRemove, 'email:sorted', userData.email.toLowerCase() + ':' + uid)
], function (err) {
if (err) {
return callback(err);
if (oldEmail === newEmail) {
return callback();
}
async.series([
async.apply(db.sortedSetRemove, 'email:uid', oldEmail.toLowerCase()),
async.apply(db.sortedSetRemove, 'email:sorted', oldEmail.toLowerCase() + ':' + uid)
], function (err) {
next(err);
});
},
function (next) {
async.parallel([
function (next) {
db.sortedSetAdd('email:uid', uid, newEmail.toLowerCase(), next);
},
async.apply(db.sortedSetAdd, 'user:' + uid + ':emails', Date.now(), newEmail + ':' + Date.now()),
function (next) {
db.sortedSetAdd('email:sorted', 0, newEmail.toLowerCase() + ':' + uid, next);
},
function (next) {
db.sortedSetAdd('user:' + uid + ':emails', Date.now(), newEmail + ':' + Date.now(), next);
},
function (next) {
User.setUserField(uid, 'email', newEmail, next);
},
@@ -185,9 +187,11 @@ module.exports = function (User) {
function (next) {
db.sortedSetAdd('users:notvalidated', Date.now(), uid, next);
}
], callback);
});
});
], function (err) {
next(err);
});
}
], callback);
}
function updateUsername(uid, newUsername, callback) {