mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-18 18:40:58 +01:00
Merge branch 'master' into develop
This commit is contained in:
@@ -151,12 +151,12 @@ UserReset.clean = async function () {
|
||||
};
|
||||
|
||||
UserReset.cleanByUid = async function (uid) {
|
||||
const tokensToClean = [];
|
||||
uid = parseInt(uid, 10);
|
||||
if (!uid) {
|
||||
return;
|
||||
}
|
||||
|
||||
const tokensToClean = [];
|
||||
await batch.processSortedSet('reset:issueDate', async (tokens) => {
|
||||
const results = await db.getObjectFields('reset:uid', tokens);
|
||||
for (const [code, result] of Object.entries(results)) {
|
||||
@@ -167,11 +167,9 @@ UserReset.cleanByUid = async function (uid) {
|
||||
}, { batch: 500 });
|
||||
|
||||
if (!tokensToClean.length) {
|
||||
winston.verbose(`[UserReset.cleanByUid] No tokens found for uid (${uid}).`);
|
||||
return;
|
||||
}
|
||||
|
||||
winston.verbose(`[UserReset.cleanByUid] Found ${tokensToClean.length} token(s), removing...`);
|
||||
await Promise.all([
|
||||
cleanTokens(tokensToClean),
|
||||
db.deleteObjectField('locks', `reset${uid}`),
|
||||
|
||||
Reference in New Issue
Block a user