Skip to content

Node.js based forum software built for the modern web

fix: flag history labelled registration details as username/email changes (#14836)

palmoni5572bb42f8565
diff --git a/public/language/en-GB/flags.json b/public/language/en-GB/flags.json
index 01beb9d224..720a579418 100644
--- a/public/language/en-GB/flags.json
+++ b/public/language/en-GB/flags.json
@@ -61,6 +61,8 @@
"note-added": "Note Added",
"note-deleted": "Note Deleted",
"flag-deleted": "Flag Deleted",
+ "registered-username": "Registered As",
+ "registered-email": "Registered With",
"history": "Account & Flag History",
"no-history": "No flag history.",
diff --git a/src/flags.js b/src/flags.js
index 0c22697f98..f9c9811d6d 100644
--- a/src/flags.js
+++ b/src/flags.js
@@ -1111,7 +1111,7 @@ async function mergeUsernameEmailChanges(history, targetUid, uids) {
uid: targetUid,
meta: [
{
- key: '[[user:change-username]]',
+ key: changeObj.byUid ? '[[user:change-username]]' : '[[flags:registered-username]]',
value: changeObj.value,
labelClass: 'primary',
},
@@ -1121,13 +1121,13 @@ async function mergeUsernameEmailChanges(history, targetUid, uids) {
});
return memo;
- }, [])).concat(emailChanges.reduce((memo, changeObj) => {
+ }, [])).concat(emailChanges.reduce((memo, changeObj, idx) => {
uids.push(targetUid);
memo.push({
uid: targetUid,
meta: [
{
- key: '[[user:change-email]]',
+ key: idx === emailChanges.length - 1 ? '[[flags:registered-email]]' : '[[user:change-email]]',
value: changeObj.value,
labelClass: 'primary',
},
diff --git a/test/flags.js b/test/flags.js
index fed33d3135..c38cfb1be8 100644
--- a/test/flags.js
+++ b/test/flags.js
@@ -944,6 +944,17 @@ describe('Flags', () => {
done();
});
});
+
+ it('should label registration details as such, not as changes', async () => {
+ const history = await Flags.getHistory(1);
+ const keys = history
+ .filter(entry => entry.meta)
+ .reduce((memo, entry) => memo.concat(entry.meta.map(item => item.key)), []);
+
+ assert.ok(keys.includes('[[flags:registered-username]]'));
+ assert.ok(!keys.includes('[[user:change-username]]'));
+ assert.ok(!keys.includes('[[user:change-email]]'));
+ });
});
describe('(v3 API)', () => {