Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 04:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fuck git

Browse Source
This commit is contained in:
Julian Lam
2013-08-23 14:55:25 -04:00
parent 4d11fba20a
commit 9bc12f28b4
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/postTools.js
View File

@@ -41,7 +41,8 @@ var RDB = require('./redis.js'),
} }
function hasEnoughRep(next) { function hasEnoughRep(next) {
user.getUserField(uid, 'reputation', function(reputation) { user.getUserField(uid, 'reputation', function(err, reputation) {
if (err) return next(null, false);
next(null, reputation >= meta.config['privileges:manage_content']); next(null, reputation >= meta.config['privileges:manage_content']);
}); });
} }

7
src/routes/user.js
View File

@@ -79,8 +79,7 @@ var user = require('./../user.js'),
if(!req.user) if(!req.user)
return res.redirect('/403'); return res.redirect('/403');
user.getUserField(req.user.uid, 'userslug', function(userslug) { user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
if(req.params.userslug && userslug === req.params.userslug) { if(req.params.userslug && userslug === req.params.userslug) {
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/'+req.params.userslug+'/edit','accountedit') + templates['footer']); res.send(header + app.create_route('users/'+req.params.userslug+'/edit','accountedit') + templates['footer']);
@@ -96,7 +95,7 @@ var user = require('./../user.js'),
if(!req.user) if(!req.user)
return res.redirect('/403'); return res.redirect('/403');
user.getUserField(req.user.uid, 'userslug', function(userslug) { user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
if(req.params.userslug && userslug === req.params.userslug) { if(req.params.userslug && userslug === req.params.userslug) {
app.build_header({ req: req, res: res }, function(err, header) { app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route('users/'+req.params.userslug+'/settings','accountsettings') + templates['footer']); res.send(header + app.create_route('users/'+req.params.userslug+'/settings','accountsettings') + templates['footer']);
@@ -127,7 +126,7 @@ var user = require('./../user.js'),
return; return;
} }
user.getUserField(req.user.uid, 'uploadedpicture', function(oldpicture) { user.getUserField(req.user.uid, 'uploadedpicture', function(err, oldpicture) {
if(!oldpicture) { if(!oldpicture) {
uploadUserPicture(req.user.uid, path.extname(req.files.userPhoto.name), req.files.userPhoto.path, res); uploadUserPicture(req.user.uid, path.extname(req.files.userPhoto.name), req.files.userPhoto.path, res);
return; return;

3
src/threadTools.js
View File

@@ -31,7 +31,8 @@ var RDB = require('./redis.js'),
} }
function hasEnoughRep(next) { function hasEnoughRep(next) {
user.getUserField(uid, 'reputation', function(reputation) { user.getUserField(uid, 'reputation', function(err, reputation) {
if (err) return next(null, false);
next(null, reputation >= meta.config['privileges:manage_topic']); next(null, reputation >= meta.config['privileges:manage_topic']);
}); });
} }

7
src/topics.js
View File

@@ -33,8 +33,7 @@ marked.setOptions({
Topics.getTopicDataWithUsername = function(tid, callback) { Topics.getTopicDataWithUsername = function(tid, callback) {
Topics.getTopicData(tid, function(topic) { Topics.getTopicData(tid, function(topic) {
user.getUserField(topic.uid, 'username', function(username) { user.getUserField(topic.uid, 'username', function(err, username) {
topic.username = username; topic.username = username;
callback(topic); callback(topic);
}); });
@@ -572,8 +571,8 @@ marked.setOptions({
return; return;
} }
user.getUserField(uid, 'lastposttime', function(lastposttime) { user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
if (err) lastposttime = 0;
if(Date.now() - lastposttime < meta.config.postDelay) { if(Date.now() - lastposttime < meta.config.postDelay) {
callback(new Error('too-many-posts'), null); callback(new Error('too-many-posts'), null);
return; return;

2
src/webserver.js
View File

@@ -161,7 +161,7 @@ var express = require('express'),
app.get('/' + route, function(req, res) { app.get('/' + route, function(req, res) {
if ((route === 'login' || route ==='register') && (req.user && req.user.uid > 0)) { if ((route === 'login' || route ==='register') && (req.user && req.user.uid > 0)) {
user.getUserField(req.user.uid, 'userslug', function(userslug) { user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
res.redirect('/users/'+userslug); res.redirect('/users/'+userslug);
}); });
return; return;

8
src/websockets.js
View File

@@ -54,7 +54,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.join('uid_' + uid); socket.join('uid_' + uid);
io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid)); io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid));
user.getUserField(uid, 'username', function(username) { user.getUserField(uid, 'username', function(err, username) {
socket.emit('event:connect', {status: 1, username:username}); socket.emit('event:connect', {status: 1, username:username});
}); });
} }
@@ -275,12 +275,12 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
} }
if(type === 'gravatar') { if(type === 'gravatar') {
user.getUserField(uid, 'gravatarpicture', function(gravatar) { user.getUserField(uid, 'gravatarpicture', function(err, gravatar) {
user.setUserField(uid, 'picture', gravatar); user.setUserField(uid, 'picture', gravatar);
updateHeader(); updateHeader();
}); });
} else if(type === 'uploaded') { } else if(type === 'uploaded') {
user.getUserField(uid, 'uploadedpicture', function(uploadedpicture) { user.getUserField(uid, 'uploadedpicture', function(err, uploadedpicture) {
user.setUserField(uid, 'picture', uploadedpicture); user.setUserField(uid, 'picture', uploadedpicture);
updateHeader(); updateHeader();
}); });
@@ -514,7 +514,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
var msg = utils.strip_tags(data.message), var msg = utils.strip_tags(data.message),
numSockets = userSockets[touid].length; numSockets = userSockets[touid].length;
user.getUserField(uid, 'username', function(username) { user.getUserField(uid, 'username', function(err, username) {
var finalMessage = username + ' says : ' + msg; var finalMessage = username + ' says : ' + msg;
for(var x=0;x<numSockets;x++) { for(var x=0;x<numSockets;x++) {