Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion public/src/client/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ define('forum/register', [
if (results.every(obj => obj.status === 'rejected')) {
showSuccess(usernameInput, username_notify, successIcon);
} else {
showError(usernameInput, username_notify, '[[error:username-taken]]');
var suggestion = username + '123';
showError(usernameInput, username_notify, '[[error:username-taken]] Try <b>' + suggestion + '</b>?');
}

callback();
Expand Down
17 changes: 13 additions & 4 deletions src/user/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -398,17 +398,26 @@ module.exports = function (User) {
};

User.incrementUserFieldBy = async function (uid, field, value) {
return await incrDecrUserFieldBy(uid, field, value, 'increment');
return await incrDecrUserFieldBy(uid, field, value);
};

User.decrementUserFieldBy = async function (uid, field, value) {
return await incrDecrUserFieldBy(uid, field, -value, 'decrement');
return await incrDecrUserFieldBy(uid, field, -value);
};

async function incrDecrUserFieldBy(uid, field, value, type) {
async function incrDecrUserFieldBy(uid, field, value) {
const prefix = `user${activitypub.helpers.isUri(uid) ? 'Remote' : ''}`;
const newValue = await db.incrObjectFieldBy(`${prefix}:${uid}`, field, value);
plugins.hooks.fire('action:user.set', { uid: uid, field: field, value: newValue, type: type });
let type;
if (value >= 0) {
type = 'increment';
} else {
type = 'decrement';
}

plugins.hooks.fire('action:user.set', { uid, field, value: newValue, type });

return newValue;
}

};
Loading