hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more flagged posts shenanigans

Browse Source
v1.18.x
barisusakli 9 years ago
parent 086e99de5c
commit e6cf8ec5cf
8 changed files with 105 additions and 74 deletions
Show Stats Download Patch File Download Diff File

3
public/src/ajaxify.js
Unescape Escape View File

@ -195,6 +195,9 @@ $(document).ready(function() {
ajaxify.loadScript = function(tpl_url, callback) {
var location = !app.inAdmin ? 'forum/' : '';
if (tpl_url.startsWith('admin')) {
location = '';
}
var data = {
tpl_url: tpl_url,
scripts: [location + tpl_url]

29
src/controllers/admin/flags.js
Unescape Escape View File

@ -1,28 +1,31 @@
"use strict";
var async = require('async');
var posts = require('../../posts');
var flagsController = {};
flagsController.get = function(req, res, next) {
function done(err, posts) {
if (err) {
return next(err);
}
res.render('admin/manage/flags', {posts: posts, next: stop + 1, byUsername: byUsername});
}
var sortBy = req.query.sortBy || 'count';
var byUsername = req.query.byUsername || '';
var start = 0;
var stop = 19;
if (byUsername) {
posts.getUserFlags(byUsername, sortBy, req.uid, start, stop, done);
} else {
var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
posts.getFlags(set, req.uid, start, stop, done);
}
async.waterfall([
function (next) {
if (byUsername) {
posts.getUserFlags(byUsername, sortBy, req.uid, start, stop, next);
} else {
var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
posts.getFlags(set, req.uid, start, stop, next);
}
}
], function (err, posts) {
if (err) {
return next(err);
}
res.render('admin/manage/flags', {posts: posts, next: stop + 1, byUsername: byUsername});
});
};

25
src/controllers/posts.js
Unescape Escape View File

@ -1,31 +1,18 @@
"use strict";
var posts = require('../posts');
var user = require('../user');
var adminFlagsController = require('./admin/flags');
var postsController = {};
postsController.flagged = function(req, res, next) {
function done(err, posts) {
if (err) {
user.isAdminOrGlobalMod(req.uid, function(err, isAdminOrGlobalMod) {
if (err || !isAdminOrGlobalMod) {
return next(err);
}
res.render('admin/manage/flags', {posts: posts, next: stop + 1, byUsername: byUsername});
}
var sortBy = req.query.sortBy || 'count';
var byUsername = req.query.byUsername || '';
var start = 0;
var stop = 19;
if (byUsername) {
posts.getUserFlags(byUsername, sortBy, req.uid, start, stop, done);
} else {
var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
posts.getFlags(set, req.uid, start, stop, done);
}
adminFlagsController.get(req, res, next);
});
};

2
src/routes/index.js
Unescape Escape View File

@ -37,7 +37,7 @@ function mainRoutes(app, middleware, controllers) {
}
function postRoutes(app, middleware, controllers) {
setupPageRoute(app, '/posts/flagged', middleware, [], controllers.posts.flagged);
setupPageRoute(app, '/posts/flags', middleware, [], controllers.posts.flagged);
}
function topicRoutes(app, middleware, controllers) {

40
src/socket.io/admin.js
Unescape Escape View File

@ -39,12 +39,13 @@ SocketAdmin.before = function(socket, method, data, next) {
if (!socket.uid) {
return;
}
user.isAdministrator(socket.uid, function(err, isAdmin) {
if (!err && isAdmin) {
next();
} else {
winston.warn('[socket.io] Call to admin method ( ' + method + ' ) blocked (accessed by uid ' + socket.uid + ')');
if (err || isAdmin) {
return next(err);
}
winston.warn('[socket.io] Call to admin method ( ' + method + ' ) blocked (accessed by uid ' + socket.uid + ')');
});
};
@ -323,36 +324,5 @@ SocketAdmin.deleteAllEvents = function(socket, data, callback) {
events.deleteAll(callback);
};
SocketAdmin.dismissFlag = function(socket, pid, callback) {
if (!pid) {
return callback('[[error:invalid-data]]');
}
posts.dismissFlag(pid, callback);
};
SocketAdmin.dismissAllFlags = function(socket, data, callback) {
posts.dismissAllFlags(callback);
};
SocketAdmin.getMoreFlags = function(socket, data, callback) {
if (!data || !parseInt(data.after, 10)) {
return callback('[[error:invalid-data]]');
}
var sortBy = data.sortBy || 'count';
var byUsername = data.byUsername || '';
var start = parseInt(data.after, 10);
var stop = start + 19;
if (byUsername) {
posts.getUserFlags(byUsername, sortBy, socket.uid, start, stop, function(err, posts) {
callback(err, {posts: posts, next: stop + 1});
});
} else {
var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
posts.getFlags(set, socket.uid, start, stop, function(err, posts) {
callback(err, {posts: posts, next: stop + 1});
});
}
};
module.exports = SocketAdmin;

62
src/socket.io/posts/flag.js
Unescape Escape View File

@ -98,4 +98,66 @@ module.exports = function(SocketPosts) {
}
], callback);
};
SocketPosts.dismissFlag = function(socket, pid, callback) {
if (!pid || !socket.uid) {
return callback('[[error:invalid-data]]');
}
async.waterfall([
function (next) {
user.isAdminOrGlobalModerator(socket.uid, next);
},
function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) {
return next(new Error('[[no-privileges]]'));
}
posts.dismissFlag(pid, next);
}
], callback);
};
SocketPosts.dismissAllFlags = function(socket, data, callback) {
async.waterfall([
function (next) {
user.isAdminOrGlobalModerator(socket.uid, next);
},
function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) {
return next(new Error('[[no-privileges]]'));
}
posts.dismissAllFlags(next);
}
], callback);
};
SocketPosts.getMoreFlags = function(socket, data, callback) {
if (!data || !parseInt(data.after, 10)) {
return callback('[[error:invalid-data]]');
}
var sortBy = data.sortBy || 'count';
var byUsername = data.byUsername || '';
var start = parseInt(data.after, 10);
var stop = start + 19;
async.waterfall([
function (next) {
user.isAdminOrGlobalModerator(socket.uid, next);
},
function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) {
return next(new Error('[[no-privileges]]'));
}
if (byUsername) {
posts.getUserFlags(byUsername, sortBy, socket.uid, start, stop, next);
} else {
var set = sortBy === 'count' ? 'posts:flags:count' : 'posts:flagged';
posts.getFlags(set, socket.uid, start, stop, next);
}
},
function (posts, next) {
next(null, {posts: posts, next: stop + 1});
},
], callback);
};
};

9
src/socket.io/user/ban.js
Unescape Escape View File

@ -34,13 +34,10 @@ module.exports = function(SocketUser) {
async.waterfall([
function (next) {
async.parallel({
isAdmin: async.apply(user.isAdministrator, uid),
isGlobalMod: async.apply(user.isGlobalModerator, uid)
}, next);
user.isAdminOrGlobalMod(uid, next);
},
function (results, next) {
if (!results.isAdmin && !results.isGlobalMod) {
function (isAdminOrGlobalMod, next) {
if (!isAdminOrGlobalMod) {
return next(new Error('[[error:no-privileges]]'));
}
async.each(uids, method, next);

9
src/user.js
Unescape Escape View File

@ -234,6 +234,15 @@ var async = require('async'),
privileges.users.isGlobalModerator(uid, callback);
};
User.isAdminOrGlobalMod = function(uid, callback) {
async.parallel({
isAdmin: async.apply(User.isAdministrator, uid),
isGlobalMod: async.apply(User.isGlobalModerator, uid)
}, function(err, results) {
callback(err, results ? (results.isAdmin || results.isGlobalMod) : false);
});
};
User.isAdminOrSelf = function(callerUid, uid, callback) {
if (parseInt(callerUid, 10) === parseInt(uid, 10)) {
return callback();

Write Preview
Loading…
Cancel
Save