mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-06 15:42:52 +01:00
* feat: webpack 5 part 1 * fix: gruntfile fixes * fix: fix taskbar warning add app.importScript copy public/src/modules to build folder * refactor: remove commented old code * feat: reenable admin * fix: acp settings pages, fix sortable on manage categories embedded require in html not allowed * fix: bundle serialize/deserizeli so plugins dont break * test: fixe util tests * test: fix require path * test: more test fixes * test: require correct utils module * test: require correct utils * test: log stack * test: fix db require blowing up tests * test: move and disable bundle test * refactor: add aliases * test: disable testing route * fix: move webpack modules necessary for build, into `dependencies` * test: fix one more test remove 500-embed.tpl * fix: restore use of assets/nodebb.min.js, at least for now * fix: remove unnecessary line break * fix: point to proper ACP bundle * test: maybe fix build test * test: composer * refactor: dont need dist * refactor: more cleanup use everything from build/public folder * get rid of conditional import in app.js * fix: ace * refactor: cropper alias * test: lint and test fixes * lint: fix * refactor: rename function to app.require * refactor: go back to using app.require * chore: use github branch * chore: use webpack branch * feat: webpack webinstaller * feat: add chunkFile name with contenthash * refactor: move hooks to top * refactor: get rid of template500Function * fix(deps): use webpack5 branch of 2factor plugin * chore: tagging v2.0.0-beta.0 pre-release version 💥 :shipit: 🎉 🚀 * refactor: disable cache on templates loadTemplate is called once by benchpress and the result is cache internally * refactor: add server side helpers.js * feat: deprecate /plugins shorthand route, closes #10343 * refactor: use build/public for webpack * test: fix filename * fix: more specific selector * lint: ignore * refactor: fix comments * test: add debug for random failing test * refactor: cleanup remove test page, remove dupe functions in utils.common * lint: use relative path for now * chore: bump prerelease version * feat: add translateKeys * fix: optional params * fix: get rid of extra timeago files * refactor: cleanup, require timeago locale earlier remove translator.prepareDOM, it is in header.tpl html tag * refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378) * refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels - Existing hooks are preserved (to be deprecated at a later date, possibly) - New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks * docs: fix typo in comment * test: spec changes * refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378) * refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels - Existing hooks are preserved (to be deprecated at a later date, possibly) - New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks * docs: fix typo in comment * test: spec changes * feat: allow app.require('bootbox'/'benchpressjs') * refactor: require server side utils * test: jquery ready * change istaller to use build/public * test: use document.addEventListener * refactor: closes #10301 * refactor: generateTopicClass * fix: column counts for other privileges * fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking] * fix: typo in hook name * refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags) * fix: crash if `delay` not passed in (as it cannot be destructured) * refactor: replace substr * feat: set --panel-offset style in html element based on stored value in localStorage * refactor: addDropupHandler() logic to be less naive - Take into account height of the menu - Don't apply dropUp logic if there's nothing in the dropdown - Remove 'hidden' class (added by default in Persona for post tools) when menu items are added closes #10423 * refactor: simplify utils.params [breaking] Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do. * feat: add support for returning full URLSearchParams for utils.params * fix: utils.params() fallback handling * fix: default empty obj for params() * fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end * fix: utils.params() not allowing relative paths to be passed in * refactor(DRY): new assertPasswordValidity utils method * fix: incorrect error message returned on insufficient privilege on flag edit * fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate - added failing tests and patched up middleware.assert.flags to fix * refactor: flag api v3 tests to create new post and flags on every round * fix: missing error:no-flag language key * refactor: flags.canView to check flag existence, simplify middleware.assert.flag * feat: flag deletion API endpoint, #10426 * feat: UI for flag deletion, closes #10426 * chore: update plugin versions * chore: up emoji * chore: update markdown * chore: up emoji-android * fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check Co-authored-by: Julian Lam <julian@nodebb.org>
142 lines
4.4 KiB
JavaScript
142 lines
4.4 KiB
JavaScript
'use strict';
|
|
|
|
const _ = require('lodash');
|
|
const validator = require('validator');
|
|
|
|
const db = require('../database');
|
|
const posts = require('../posts');
|
|
const topics = require('../topics');
|
|
const utils = require('../utils');
|
|
|
|
module.exports = function (User) {
|
|
User.getLatestBanInfo = async function (uid) {
|
|
// Simply retrieves the last record of the user's ban, even if they've been unbanned since then.
|
|
const record = await db.getSortedSetRevRange(`uid:${uid}:bans:timestamp`, 0, 0);
|
|
if (!record.length) {
|
|
throw new Error('no-ban-info');
|
|
}
|
|
const banInfo = await db.getObject(record[0]);
|
|
const expire = parseInt(banInfo.expire, 10);
|
|
const expire_readable = utils.toISOString(expire);
|
|
return {
|
|
uid: uid,
|
|
timestamp: banInfo.timestamp,
|
|
banned_until: expire,
|
|
expiry: expire, /* backward compatible alias */
|
|
banned_until_readable: expire_readable,
|
|
expiry_readable: expire_readable, /* backward compatible alias */
|
|
reason: validator.escape(String(banInfo.reason || '')),
|
|
};
|
|
};
|
|
|
|
User.getModerationHistory = async function (uid) {
|
|
let [flags, bans] = await Promise.all([
|
|
db.getSortedSetRevRangeWithScores(`flags:byTargetUid:${uid}`, 0, 19),
|
|
db.getSortedSetRevRange(`uid:${uid}:bans:timestamp`, 0, 19),
|
|
]);
|
|
|
|
// Get pids from flag objects
|
|
const keys = flags.map(flagObj => `flag:${flagObj.value}`);
|
|
const payload = await db.getObjectsFields(keys, ['type', 'targetId']);
|
|
|
|
// Only pass on flag ids from posts
|
|
flags = payload.reduce((memo, cur, idx) => {
|
|
if (cur.type === 'post') {
|
|
memo.push({
|
|
value: parseInt(cur.targetId, 10),
|
|
score: flags[idx].score,
|
|
});
|
|
}
|
|
|
|
return memo;
|
|
}, []);
|
|
|
|
[flags, bans] = await Promise.all([
|
|
getFlagMetadata(flags),
|
|
formatBanData(bans),
|
|
]);
|
|
|
|
return {
|
|
flags: flags,
|
|
bans: bans,
|
|
};
|
|
};
|
|
|
|
User.getHistory = async function (set) {
|
|
const data = await db.getSortedSetRevRangeWithScores(set, 0, -1);
|
|
return data.map((set) => {
|
|
set.timestamp = set.score;
|
|
set.timestampISO = utils.toISOString(set.score);
|
|
set.value = validator.escape(String(set.value.split(':')[0]));
|
|
delete set.score;
|
|
return set;
|
|
});
|
|
};
|
|
|
|
async function getFlagMetadata(flags) {
|
|
const pids = flags.map(flagObj => parseInt(flagObj.value, 10));
|
|
const postData = await posts.getPostsFields(pids, ['tid']);
|
|
const tids = postData.map(post => post.tid);
|
|
|
|
const topicData = await topics.getTopicsFields(tids, ['title']);
|
|
flags = flags.map((flagObj, idx) => {
|
|
flagObj.pid = flagObj.value;
|
|
flagObj.timestamp = flagObj.score;
|
|
flagObj.timestampISO = new Date(flagObj.score).toISOString();
|
|
flagObj.timestampReadable = new Date(flagObj.score).toString();
|
|
|
|
delete flagObj.value;
|
|
delete flagObj.score;
|
|
if (!tids[idx]) {
|
|
flagObj.targetPurged = true;
|
|
}
|
|
return _.extend(flagObj, topicData[idx]);
|
|
});
|
|
return flags;
|
|
}
|
|
|
|
async function formatBanData(bans) {
|
|
const banData = await db.getObjects(bans);
|
|
const uids = banData.map(banData => banData.fromUid);
|
|
const usersData = await User.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture']);
|
|
return banData.map((banObj, index) => {
|
|
banObj.user = usersData[index];
|
|
banObj.until = parseInt(banObj.expire, 10);
|
|
banObj.untilReadable = new Date(banObj.until).toString();
|
|
banObj.timestampReadable = new Date(parseInt(banObj.timestamp, 10)).toString();
|
|
banObj.timestampISO = utils.toISOString(banObj.timestamp);
|
|
banObj.reason = validator.escape(String(banObj.reason || '')) || '[[user:info.banned-no-reason]]';
|
|
return banObj;
|
|
});
|
|
}
|
|
|
|
User.getModerationNotes = async function (uid, start, stop) {
|
|
const noteIds = await db.getSortedSetRevRange(`uid:${uid}:moderation:notes`, start, stop);
|
|
const keys = noteIds.map(id => `uid:${uid}:moderation:note:${id}`);
|
|
const notes = await db.getObjects(keys);
|
|
const uids = [];
|
|
|
|
const noteData = notes.map((note) => {
|
|
if (note) {
|
|
uids.push(note.uid);
|
|
note.timestampISO = utils.toISOString(note.timestamp);
|
|
note.note = validator.escape(String(note.note));
|
|
}
|
|
return note;
|
|
});
|
|
|
|
const userData = await User.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture']);
|
|
noteData.forEach((note, index) => {
|
|
if (note) {
|
|
note.user = userData[index];
|
|
}
|
|
});
|
|
return noteData;
|
|
};
|
|
|
|
User.appendModerationNote = async ({ uid, noteData }) => {
|
|
await db.sortedSetAdd(`uid:${uid}:moderation:notes`, noteData.timestamp, noteData.timestamp);
|
|
await db.setObject(`uid:${uid}:moderation:note:${noteData.timestamp}`, noteData);
|
|
};
|
|
};
|