Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 17:55:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-some-code-lint' of https://github.com/HeeL/NodeBB into HeeL-fix-some-code-lint

Browse Source
This commit is contained in:
Julian Lam
2016-10-13 14:43:28 -04:00
parent eb16eb318e 4a3c31b2dc
commit ead4de6c6f
388 changed files with 6787 additions and 6790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/socket.io/posts/bookmarks.js
View File

@@ -3,13 +3,13 @@
var helpers = require('./helpers');
module.exports = function(SocketPosts) {
module.exports = function (SocketPosts) {
SocketPosts.bookmark = function(socket, data, callback) {
SocketPosts.bookmark = function (socket, data, callback) {
helpers.postCommand(socket, 'bookmark', 'bookmarked', '', data, callback);
};
SocketPosts.unbookmark = function(socket, data, callback) {
SocketPosts.unbookmark = function (socket, data, callback) {
helpers.postCommand(socket, 'unbookmark', 'bookmarked', '', data, callback);
};

12
src/socket.io/posts/edit.js
View File

@@ -10,9 +10,9 @@ var events = require('../../events');
var meta = require('../../meta');
var websockets = require('../index');
module.exports = function(SocketPosts) {
module.exports = function (SocketPosts) {
SocketPosts.edit = function(socket, data, callback) {
SocketPosts.edit = function (socket, data, callback) {
if (!socket.uid) {
return callback(new Error('[[error:not-logged-in]]'));
} else if (!data || !data.pid || !data.content) {
@@ -33,7 +33,7 @@ module.exports = function(SocketPosts) {
data.uid = socket.uid;
data.req = websockets.reqFromSocket(socket);
posts.edit(data, function(err, result) {
posts.edit(data, function (err, result) {
if (err) {
return callback(err);
}
@@ -59,16 +59,16 @@ module.exports = function(SocketPosts) {
async.parallel({
admins: async.apply(groups.getMembers, 'administrators', 0, -1),
moderators: async.apply(groups.getMembers, 'cid:' + result.topic.cid + ':privileges:mods', 0, -1)
}, function(err, results) {
}, function (err, results) {
if (err) {
return winston.error(err);
}
var uids = results.admins.concat(results.moderators).filter(function(uid, index, array) {
var uids = results.admins.concat(results.moderators).filter(function (uid, index, array) {
return uid && array.indexOf(uid) === index;
});
uids.forEach(function(uid) {
uids.forEach(function (uid) {
websockets.in('uid_' + uid).emit('event:post_edited', result);
});
});

24
src/socket.io/posts/flag.js
View File

@@ -12,9 +12,9 @@ var notifications = require('../../notifications');
var plugins = require('../../plugins');
var meta = require('../../meta');
module.exports = function(SocketPosts) {
module.exports = function (SocketPosts) {
SocketPosts.flag = function(socket, data, callback) {
SocketPosts.flag = function (socket, data, callback) {
if (!socket.uid) {
return callback(new Error('[[error:not-logged-in]]'));
}
@@ -42,10 +42,10 @@ module.exports = function(SocketPosts) {
post.topic = topicData;
async.parallel({
isAdminOrMod: function(next) {
isAdminOrMod: function (next) {
privileges.categories.isAdminOrMod(post.topic.cid, socket.uid, next);
},
userData: function(next) {
userData: function (next) {
user.getUserFields(socket.uid, ['username', 'reputation', 'banned'], next);
}
}, next);
@@ -66,16 +66,16 @@ module.exports = function(SocketPosts) {
},
function (next) {
async.parallel({
post: function(next) {
post: function (next) {
posts.parsePost(post, next);
},
admins: function(next) {
admins: function (next) {
groups.getMembers('administrators', 0, -1, next);
},
globalMods: function (next) {
groups.getMembers('Global Moderators', 0, -1, next);
},
moderators: function(next) {
moderators: function (next) {
groups.getMembers('cid:' + post.topic.cid + ':privileges:mods', 0, -1, next);
}
}, next);
@@ -93,7 +93,7 @@ module.exports = function(SocketPosts) {
from: socket.uid,
mergeId: 'notifications:user_flagged_post_in|' + data.pid,
topicTitle: post.topic.title
}, function(err, notification) {
}, function (err, notification) {
if (err || !notification) {
return next(err);
}
@@ -105,7 +105,7 @@ module.exports = function(SocketPosts) {
], callback);
};
SocketPosts.dismissFlag = function(socket, pid, callback) {
SocketPosts.dismissFlag = function (socket, pid, callback) {
if (!pid || !socket.uid) {
return callback('[[error:invalid-data]]');
}
@@ -122,7 +122,7 @@ module.exports = function(SocketPosts) {
], callback);
};
SocketPosts.dismissAllFlags = function(socket, data, callback) {
SocketPosts.dismissAllFlags = function (socket, data, callback) {
async.waterfall([
function (next) {
user.isAdminOrGlobalMod(socket.uid, next);
@@ -136,7 +136,7 @@ module.exports = function(SocketPosts) {
], callback);
};
SocketPosts.updateFlag = function(socket, data, callback) {
SocketPosts.updateFlag = function (socket, data, callback) {
if (!data || !(data.pid && data.data)) {
return callback('[[error:invalid-data]]');
}
@@ -158,7 +158,7 @@ module.exports = function(SocketPosts) {
}
// Translate form data into object
payload = data.data.reduce(function(memo, cur) {
payload = data.data.reduce(function (memo, cur) {
memo[cur.name] = cur.value;
return memo;
}, payload);

12
src/socket.io/posts/helpers.js
View File

@@ -9,7 +9,7 @@ var socketHelpers = require('../helpers');
var helpers = module.exports;
helpers.postCommand = function(socket, command, eventName, notification, data, callback) {
helpers.postCommand = function (socket, command, eventName, notification, data, callback) {
if (!socket.uid) {
return callback(new Error('[[error:not-logged-in]]'));
}
@@ -17,13 +17,13 @@ helpers.postCommand = function(socket, command, eventName, notification, data, c
return callback(new Error('[[error:invalid-data]]'));
}
async.parallel({
exists: function(next) {
exists: function (next) {
posts.exists(data.pid, next);
},
deleted: function(next) {
deleted: function (next) {
posts.getPostField(data.pid, 'deleted', next);
}
}, function(err, results) {
}, function (err, results) {
if (err || !results.exists) {
return callback(err || new Error('[[error:invalid-pid]]'));
}
@@ -40,7 +40,7 @@ helpers.postCommand = function(socket, command, eventName, notification, data, c
filter:post.bookmark
filter:post.unbookmark
*/
plugins.fireHook('filter:post.' + command, {data: data, uid: socket.uid}, function(err, filteredData) {
plugins.fireHook('filter:post.' + command, {data: data, uid: socket.uid}, function (err, filteredData) {
if (err) {
return callback(err);
}
@@ -51,7 +51,7 @@ helpers.postCommand = function(socket, command, eventName, notification, data, c
};
function executeCommand(socket, command, eventName, notification, data, callback) {
posts[command](data.pid, socket.uid, function(err, result) {
posts[command](data.pid, socket.uid, function (err, result) {
if (err) {
return callback(err);
}

4
src/socket.io/posts/move.js
View File

@@ -5,9 +5,9 @@ var privileges = require('../../privileges');
var topics = require('../../topics');
var socketHelpers = require('../helpers');
module.exports = function(SocketPosts) {
module.exports = function (SocketPosts) {
SocketPosts.movePost = function(socket, data, callback) {
SocketPosts.movePost = function (socket, data, callback) {
if (!socket.uid) {
return callback(new Error('[[error:not-logged-in]]'));
}

58
src/socket.io/posts/tools.js
View File

@@ -13,36 +13,36 @@ var privileges = require('../../privileges');
var plugins = require('../../plugins');
var social = require('../../social');
module.exports = function(SocketPosts) {
module.exports = function (SocketPosts) {
SocketPosts.loadPostTools = function(socket, data, callback) {
SocketPosts.loadPostTools = function (socket, data, callback) {
if (!data) {
return callback(new Error('[[error:invalid-data]]'));
}
async.parallel({
posts: function(next) {
posts: function (next) {
posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid'], next);
},
isAdminOrMod: function(next) {
isAdminOrMod: function (next) {
privileges.categories.isAdminOrMod(data.cid, socket.uid, next);
},
canEdit: function(next) {
canEdit: function (next) {
privileges.posts.canEdit(data.pid, socket.uid, next);
},
canDelete: function(next) {
canDelete: function (next) {
privileges.posts.canDelete(data.pid, socket.uid, next);
},
bookmarked: function(next) {
bookmarked: function (next) {
posts.hasBookmarked(data.pid, socket.uid, next);
},
tools: function(next) {
tools: function (next) {
plugins.fireHook('filter:post.tools', {pid: data.pid, uid: socket.uid, tools: []}, next);
},
postSharing: function(next) {
postSharing: function (next) {
social.getActivePostSharing(next);
}
}, function(err, results) {
}, function (err, results) {
if (err) {
return callback(err);
}
@@ -59,27 +59,27 @@ module.exports = function(SocketPosts) {
});
};
SocketPosts.delete = function(socket, data, callback) {
SocketPosts.delete = function (socket, data, callback) {
if (!data || !data.pid) {
return callback(new Error('[[error:invalid-data]]'));
}
var postData;
async.waterfall([
function(next) {
function (next) {
posts.tools.delete(socket.uid, data.pid, next);
},
function(_postData, next) {
function (_postData, next) {
postData = _postData;
isMainAndLastPost(data.pid, next);
},
function(results, next) {
function (results, next) {
if (results.isMain && results.isLast) {
deleteTopicOf(data.pid, socket, next);
} else {
next();
}
},
function(next) {
function (next) {
websockets.in('topic_' + data.tid).emit('event:post_deleted', postData);
events.log({
@@ -94,12 +94,12 @@ module.exports = function(SocketPosts) {
], callback);
};
SocketPosts.restore = function(socket, data, callback) {
SocketPosts.restore = function (socket, data, callback) {
if (!data || !data.pid) {
return callback(new Error('[[error:invalid-data]]'));
}
posts.tools.restore(socket.uid, data.pid, function(err, postData) {
posts.tools.restore(socket.uid, data.pid, function (err, postData) {
if (err) {
return callback(err);
}
@@ -117,34 +117,34 @@ module.exports = function(SocketPosts) {
});
};
SocketPosts.deletePosts = function(socket, data, callback) {
SocketPosts.deletePosts = function (socket, data, callback) {
if (!data || !Array.isArray(data.pids)) {
return callback(new Error('[[error:invalid-data]]'));
}
async.each(data.pids, function(pid, next) {
async.each(data.pids, function (pid, next) {
SocketPosts.delete(socket, {pid: pid, tid: data.tid}, next);
}, callback);
};
SocketPosts.purgePosts = function(socket, data, callback) {
SocketPosts.purgePosts = function (socket, data, callback) {
if (!data || !Array.isArray(data.pids)) {
return callback(new Error('[[error:invalid-data]]'));
}
async.each(data.pids, function(pid, next) {
async.each(data.pids, function (pid, next) {
SocketPosts.purge(socket, {pid: pid, tid: data.tid}, next);
}, callback);
};
SocketPosts.purge = function(socket, data, callback) {
SocketPosts.purge = function (socket, data, callback) {
function purgePost() {
posts.tools.purge(socket.uid, data.pid, function(err) {
posts.tools.purge(socket.uid, data.pid, function (err) {
if (err) {
return callback(err);
}
websockets.in('topic_' + data.tid).emit('event:post_purged', data.pid);
topics.getTopicField(data.tid, 'title', function(err, title) {
topics.getTopicField(data.tid, 'title', function (err, title) {
if (err) {
return winston.error(err);
}
@@ -165,7 +165,7 @@ module.exports = function(SocketPosts) {
return callback(new Error('[[error:invalid-data]]'));
}
isMainAndLastPost(data.pid, function(err, results) {
isMainAndLastPost(data.pid, function (err, results) {
if (err) {
return callback(err);
}
@@ -183,7 +183,7 @@ module.exports = function(SocketPosts) {
};
function deleteTopicOf(pid, socket, callback) {
posts.getTopicFields(pid, ['tid', 'cid'], function(err, topic) {
posts.getTopicFields(pid, ['tid', 'cid'], function (err, topic) {
if (err) {
return callback(err);
}
@@ -193,11 +193,11 @@ module.exports = function(SocketPosts) {
function isMainAndLastPost(pid, callback) {
async.parallel({
isMain: function(next) {
isMain: function (next) {
posts.isMain(pid, next);
},
isLast: function(next) {
posts.getTopicFields(pid, ['postcount'], function(err, topic) {
isLast: function (next) {
posts.getTopicFields(pid, ['postcount'], function (err, topic) {
next(err, topic ? parseInt(topic.postcount, 10) === 1 : false);
});
}

30
src/socket.io/posts/votes.js
View File

@@ -8,9 +8,9 @@ var posts = require('../../posts');
var privileges = require('../../privileges');
var helpers = require('./helpers');
module.exports = function(SocketPosts) {
module.exports = function (SocketPosts) {
SocketPosts.getVoters = function(socket, data, callback) {
SocketPosts.getVoters = function (socket, data, callback) {
if (!data || !data.pid || !data.cid) {
return callback(new Error('[[error:invalid-data]]'));
}
@@ -25,26 +25,26 @@ module.exports = function(SocketPosts) {
}
async.parallel({
upvoteUids: function(next) {
upvoteUids: function (next) {
db.getSetMembers('pid:' + data.pid + ':upvote', next);
},
downvoteUids: function(next) {
downvoteUids: function (next) {
db.getSetMembers('pid:' + data.pid + ':downvote', next);
}
}, next);
},
function (results, next) {
async.parallel({
upvoters: function(next) {
upvoters: function (next) {
user.getUsersFields(results.upvoteUids, ['username', 'userslug', 'picture'], next);
},
upvoteCount: function(next) {
upvoteCount: function (next) {
next(null, results.upvoteUids.length);
},
downvoters: function(next) {
downvoters: function (next) {
user.getUsersFields(results.downvoteUids, ['username', 'userslug', 'picture'], next);
},
downvoteCount: function(next) {
downvoteCount: function (next) {
next(null, results.downvoteUids.length);
}
}, next);
@@ -52,23 +52,23 @@ module.exports = function(SocketPosts) {
], callback);
};
SocketPosts.getUpvoters = function(socket, pids, callback) {
SocketPosts.getUpvoters = function (socket, pids, callback) {
if (!Array.isArray(pids)) {
return callback(new Error('[[error:invalid-data]]'));
}
posts.getUpvotedUidsByPids(pids, function(err, data) {
posts.getUpvotedUidsByPids(pids, function (err, data) {
if (err || !Array.isArray(data) || !data.length) {
return callback(err, []);
}
async.map(data, function(uids, next) {
async.map(data, function (uids, next) {
var otherCount = 0;
if (uids.length > 6) {
otherCount = uids.length - 5;
uids = uids.slice(0, 5);
}
user.getUsernamesByUids(uids, function(err, usernames) {
user.getUsernamesByUids(uids, function (err, usernames) {
next(err, {
otherCount: otherCount,
usernames: usernames
@@ -78,15 +78,15 @@ module.exports = function(SocketPosts) {
});
};
SocketPosts.upvote = function(socket, data, callback) {
SocketPosts.upvote = function (socket, data, callback) {
helpers.postCommand(socket, 'upvote', 'voted', 'notifications:upvoted_your_post_in', data, callback);
};
SocketPosts.downvote = function(socket, data, callback) {
SocketPosts.downvote = function (socket, data, callback) {
helpers.postCommand(socket, 'downvote', 'voted', '', data, callback);
};
SocketPosts.unvote = function(socket, data, callback) {
SocketPosts.unvote = function (socket, data, callback) {
helpers.postCommand(socket, 'unvote', 'voted', '', data, callback);
};
};