Skip to content

Node.js based forum software built for the modern web

fix: unassigning a flag showed "Guest" as the new assignee (#14834)

palmoni5a671ee20b98f
diff --git a/src/flags.js b/src/flags.js
index 3fc5546e76..0c22697f98 100644
--- a/src/flags.js
+++ b/src/flags.js
@@ -840,11 +840,16 @@ Flags.update = async function (flagId, uid, changeset) {
}
} else if (prop === 'assignee') {
if (changeset[prop] === '') {
- tasks.push(db.sortedSetRemove(`flags:byAssignee:${changeset[prop]}`, flagId));
+ if (current[prop]) {
+ tasks.push(db.sortedSetRemove(`flags:byAssignee:${current[prop]}`, flagId));
+ }
/* eslint-disable-next-line */
} else if (!await isAssignable(parseInt(changeset[prop], 10))) {
delete changeset[prop];
} else {
+ if (current[prop]) {
+ tasks.push(db.sortedSetRemove(`flags:byAssignee:${current[prop]}`, flagId));
+ }
tasks.push(db.sortedSetAdd(`flags:byAssignee:${changeset[prop]}`, now, flagId));
tasks.push(notifyAssignee(changeset[prop]));
}
@@ -914,7 +919,9 @@ Flags.getHistory = async function (flagId) {
// turn assignee uids into usernames
await Promise.all(history.map(async (entry) => {
if (entry.fields.hasOwnProperty('assignee')) {
- entry.fields.assignee = await user.getUserField(entry.fields.assignee, 'username');
+ entry.fields.assignee = entry.fields.assignee === '' ?
+ '[[flags:no-assignee]]' :
+ await user.getUserField(entry.fields.assignee, 'username');
}
}));
diff --git a/test/flags.js b/test/flags.js
index 09c154a706..fed33d3135 100644
--- a/test/flags.js
+++ b/test/flags.js
@@ -574,6 +574,26 @@ describe('Flags', () => {
await Groups.leave(`cid:${category.cid}:privileges:moderate`, uid3);
});
+ it('should unassign the flag and record it in the flag history', async () => {
+ await Flags.update(1, adminUid, {
+ assignee: adminUid,
+ });
+ assert.strictEqual(true, await db.isSortedSetMember(`flags:byAssignee:${adminUid}`, 1));
+
+ await Flags.update(1, adminUid, {
+ assignee: '',
+ });
+ assert.strictEqual(false, await db.isSortedSetMember(`flags:byAssignee:${adminUid}`, 1));
+ assert.strictEqual('', await db.getObjectField('flag:1', 'assignee'));
+
+ const history = await Flags.getHistory(1);
+ const changes = history
+ .filter(entry => entry.fields && entry.fields.hasOwnProperty('assignee'))
+ .map(entry => entry.fields.assignee);
+ assert.ok(changes.includes('[[flags:no-assignee]]'));
+ assert.ok(!changes.includes('[[global:guest]]'));
+ });
+
it('should do nothing when you attempt to set a bogus state', async () => {
await Flags.update(1, adminUid, {
state: 'hocus pocus',