mirror of
https://github.com/pieartsy/PluralFlux.git
synced 2026-04-16 17:45:28 +10:00
renamed stuff to be camel case and refactored a bit around adding help messages
This commit is contained in:
@@ -14,66 +14,137 @@ const errorEnums = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const helpEnums = {
|
const helpEnums = {
|
||||||
MEMBER: "You can shorten this command to `pf;m`. The available subcommands for `pf;member` are `add`, `remove`, `displayname`, and `proxy`. Add ` --help` to the end of a subcommand to find out more about it.",
|
MEMBER: "You can shorten this command to `pf;m`. The available subcommands for `pf;member` are `add`, `remove`, `displayname`, and `proxy`. Add ` --help` to the end of a subcommand to find out more about it, or just send it without arguments.",
|
||||||
ADD: "Creates a new member to proxy with: `pf;member jane`. The member name should ideally be short so you can write other commands with it. \nYou can optionally add a display name after the member name: `pf;member new jane \"Jane Doe | ze/hir\"`. If it has spaces, put it in **double quotes**. The length limit is 32 characters.",
|
ADD: "Creates a new member to proxy with: `pf;member jane`. The member name should ideally be short so you can write other commands with it. \nYou can optionally add a display name after the member name: `pf;member new jane \"Jane Doe | ze/hir\"`. If it has spaces, put it in **double quotes**. The length limit is 32 characters.",
|
||||||
REMOVE: "Removes a member based on their name. `pf;member remove jane`.",
|
REMOVE: "Removes a member based on their name. `pf;member remove jane`.",
|
||||||
DISPLAYNAME: "Updates the display name for a specific member based on their name. `pf;member jane \"Jane Doe | ze/hir\"`.This can be up to 32 characters long. If it has spaces, put it in quotes.",
|
DISPLAYNAME: "Updates the display name for a specific member based on their name. `pf;member jane \"Jane Doe | ze/hir\"`.This can be up to 32 characters long. If it has spaces, put it in quotes.",
|
||||||
PROXY: "Updates the proxy tag for a specific member based on their name. `pf;member jane proxy Jane:`. This is put at **the start** of a message to allow it to be proxied. Proxies that wrap around text or go at the end are **not** currently supported."
|
PROXY: "Updates the proxy tag for a specific member based on their name. `pf;member jane proxy Jane:`. This is put at **the start** of a message to allow it to be proxied. Proxies that wrap around text or go at the end are **not** currently supported."
|
||||||
}
|
}
|
||||||
|
|
||||||
mh.parse_member_command = async function(author_id, args){
|
mh.parseMemberCommand = async function(authorId, args){
|
||||||
console.log(author_id, args);
|
console.log(authorId, args);
|
||||||
if (!args) {
|
if (!args) {
|
||||||
return `${errorEnums.NO_NAME_PROVIDED} querying.`
|
return helpEnums.MEMBER;
|
||||||
}
|
}
|
||||||
switch(args[0]) {
|
switch(args[0]) {
|
||||||
case '--help':
|
case '--help':
|
||||||
return helpEnums.MEMBER;
|
return helpEnums.MEMBER;
|
||||||
case 'add':
|
case 'add':
|
||||||
return await add_new_member(author_id, args);
|
return await addNewMember(authorId, args);
|
||||||
case 'remove':
|
case 'remove':
|
||||||
return await remove_member(author_id, args);
|
return await removeMember(authorId, args);
|
||||||
}
|
}
|
||||||
switch(args[1]) {
|
switch(args[1]) {
|
||||||
case '--help':
|
case '--help':
|
||||||
return helpEnums.MEMBER;
|
return helpEnums.MEMBER;
|
||||||
case 'displayname':
|
case 'displayname':
|
||||||
return await update_display_name(author_id, args);
|
return await updateDisplayName(authorId, args);
|
||||||
case 'proxy':
|
case 'proxy':
|
||||||
return await update_proxy(author_id, args);
|
return await updateProxy(authorId, args);
|
||||||
// case 'avatar':
|
// case 'avatar':
|
||||||
// return await set_avatar(author_id, args)
|
// return await set_avatar(authorId, args)
|
||||||
default:
|
default:
|
||||||
return await get_member_info(author_id, args);
|
return await getMemberInfo(authorId, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function add_new_member(author_id, args) {
|
async function addNewMember(authorId, args) {
|
||||||
const member_name = args[1];
|
if (args[1] && args[1] === "--help" || !args[1]) {
|
||||||
const display_name = args[2];
|
return helpEnums.ADD;
|
||||||
if (!member_name) {
|
|
||||||
return `${errorEnums.NO_NAME_PROVIDED} adding.`;
|
|
||||||
}
|
}
|
||||||
const member = await get_member_info(author_id, member_name);
|
const memberName = args[1];
|
||||||
|
const displayName = args[2];
|
||||||
|
|
||||||
|
const member = await getMemberInfo(authorId, memberName);
|
||||||
if (member !== errorEnums.NO_MEMBER) {
|
if (member !== errorEnums.NO_MEMBER) {
|
||||||
return errorEnums.MEMBER_EXISTS;
|
return errorEnums.MEMBER_EXISTS;
|
||||||
}
|
}
|
||||||
const trimmed_name = display_name ? display_name.replaceAll(' ', '') : null;
|
const trimmedName = displayName ? displayName.replaceAll(' ', '') : null;
|
||||||
return await db.members.create({
|
return await db.members.create({
|
||||||
name: member_name,
|
name: memberName,
|
||||||
userid: author_id,
|
userid: authorId,
|
||||||
displayname: trimmed_name !== null ? display_name : null,
|
displayname: trimmedName !== null ? displayName : null,
|
||||||
}).then((m) => {
|
}).then((m) => {
|
||||||
let success = `Member was successfully added.\nName: ${m.dataValues.name}`
|
let success = `Member was successfully added.\nName: ${m.dataValues.name}`
|
||||||
success += display_name ? `\nDisplay name: ${m.dataValues.displayname}` : "";
|
success += displayName ? `\nDisplay name: ${m.dataValues.displayname}` : "";
|
||||||
return success;
|
return success;
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
return `${errorEnums.ADD_ERROR}: ${e.message}`;
|
return `${errorEnums.ADD_ERROR}: ${e.message}`;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async function get_member_info(author_id, member_name) {
|
async function updateDisplayName(authorId, args) {
|
||||||
let member = await db.members.findOne({ where: { name: member_name, userid: author_id } });
|
if (args[1] && args[1] === "--help" || !args[1]) {
|
||||||
|
return helpEnums.DISPLAYNAME;
|
||||||
|
}
|
||||||
|
|
||||||
|
const memberName = args[0];
|
||||||
|
const displayName = args[2];
|
||||||
|
const trimmed_name = displayName ? displayName.replaceAll(' ', '') : null;
|
||||||
|
|
||||||
|
if (!displayName || trimmed_name === null ) {
|
||||||
|
let member = getMemberInfo(authorId, args);
|
||||||
|
if (member.displayname) {
|
||||||
|
return `Display name for ${memberName} is: ${member.displayname}.`;
|
||||||
|
}
|
||||||
|
return `Display name ${errorEnums.NO_VALUE}`
|
||||||
|
}
|
||||||
|
else if (displayName.count > 32) {
|
||||||
|
return errorEnums.DISPLAY_NAME_TOO_LONG;
|
||||||
|
}
|
||||||
|
console.log(displayName);
|
||||||
|
return await updateMember(authorId, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function updateProxy(authorId, args) {
|
||||||
|
if (args[1] && args[1] === "--help" || !args[1]) {
|
||||||
|
return helpEnums.PROXY;
|
||||||
|
}
|
||||||
|
const proxy = args[2];
|
||||||
|
const trimmedProxy = proxy ? proxy.replaceAll(' ', '') : null;
|
||||||
|
|
||||||
|
if (trimmedProxy == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const members = await mh.getMembersByAuthor(authorId);
|
||||||
|
const proxyExists = members.some(member => member.proxy === proxy);
|
||||||
|
if (proxyExists) {
|
||||||
|
return errorEnums.PROXY_EXISTS;
|
||||||
|
}
|
||||||
|
return await updateMember(authorId, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function removeMember(authorId, args) {
|
||||||
|
if (args[1] && args[1] === "--help") {
|
||||||
|
return helpEnums.REMOVE;
|
||||||
|
}
|
||||||
|
|
||||||
|
const memberName = args[1];
|
||||||
|
if (!memberName) {
|
||||||
|
return `${errorEnums.NO_NAME_PROVIDED} deletion.`;
|
||||||
|
}
|
||||||
|
return await db.members.destroy({ where: { name: memberName, userid: authorId } }).then(() => {
|
||||||
|
return `${memberName} has been deleted.`;
|
||||||
|
}).catch(e => {
|
||||||
|
return `${errorEnums.NO_MEMBER}: ${e.message}`;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/* non-commands */
|
||||||
|
async function updateMember(authorId, args) {
|
||||||
|
const memberName = args[0];
|
||||||
|
const columnName = args[1];
|
||||||
|
const value = args[2];
|
||||||
|
return await db.members.update({[columnName]: value}, { where: { name: memberName, userid: authorId } }).then(() => {
|
||||||
|
return `Updated ${columnName} for ${memberName} to ${value}`;
|
||||||
|
}).catch(e => {
|
||||||
|
return `${errorEnums.NO_MEMBER}: ${e.message}`;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getMemberInfo(authorId, memberName) {
|
||||||
|
let member = await db.members.findOne({ where: { name: memberName, userid: authorId } });
|
||||||
if (member) {
|
if (member) {
|
||||||
let member_info = `Member name: ${member.name}`;
|
let member_info = `Member name: ${member.name}`;
|
||||||
member_info += member.displayname ? `\nDisplay name: ${member.displayname}` : '\nDisplay name: unset';
|
member_info += member.displayname ? `\nDisplay name: ${member.displayname}` : '\nDisplay name: unset';
|
||||||
@@ -84,76 +155,14 @@ async function get_member_info(author_id, member_name) {
|
|||||||
return errorEnums.NO_MEMBER;
|
return errorEnums.NO_MEMBER;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function update_display_name(author_id, args) {
|
mh.getMemberByProxy = async function(authorId, proxy) {
|
||||||
const member_name = args[0];
|
return await db.members.findOne({ where: { userid: authorId, proxy: proxy } }).catch(e => {
|
||||||
const display_name = args[2];
|
|
||||||
const trimmed_name = display_name ? display_name.replaceAll(' ', '') : null;
|
|
||||||
console.log(trimmed_name, display_name);
|
|
||||||
if (!member_name) {
|
|
||||||
return `${errorEnums.NO_NAME_PROVIDED} display name.`;
|
|
||||||
}
|
|
||||||
else if (!display_name || trimmed_name === null ) {
|
|
||||||
let member = await get_member_info(author_id, args);
|
|
||||||
console.log(member.displayname);
|
|
||||||
if (member.displayname) {
|
|
||||||
return `Display name for ${member_name} is: ${member.displayname}.`;
|
|
||||||
}
|
|
||||||
return `Display name ${errorEnums.NO_VALUE}`
|
|
||||||
}
|
|
||||||
else if (display_name.count > 32) {
|
|
||||||
return errorEnums.DISPLAY_NAME_TOO_LONG;
|
|
||||||
}
|
|
||||||
console.log(display_name);
|
|
||||||
return await update_member(author_id, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function update_proxy(author_id, args) {
|
|
||||||
const proxy = args[2];
|
|
||||||
const trimmed_proxy = proxy ? proxy.replaceAll(' ', '') : null;
|
|
||||||
|
|
||||||
if (trimmed_proxy == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const members = await mh.get_members_by_author(author_id);
|
|
||||||
const proxyExists = members.some(member => member.proxy === proxy);
|
|
||||||
if (proxyExists) {
|
|
||||||
return errorEnums.PROXY_EXISTS;
|
|
||||||
}
|
|
||||||
return await update_member(author_id, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function update_member(author_id, args) {
|
|
||||||
const member_name = args[0];
|
|
||||||
const column_Name = args[1];
|
|
||||||
const value = args[2];
|
|
||||||
return await db.members.update({[column_Name]: value}, { where: { name: member_name, userid: author_id } }).then(() => {
|
|
||||||
return `Updated ${column_Name} for ${member_name} to ${value}`;
|
|
||||||
}).catch(e => {
|
|
||||||
return `${errorEnums.NO_MEMBER}: ${e.message}`;
|
return `${errorEnums.NO_MEMBER}: ${e.message}`;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function remove_member(author_id, args) {
|
mh.getMembersByAuthor = async function(authorId) {
|
||||||
const member_name = args[1];
|
return await db.members.findAll({ where: { userid: authorId } }).catch(e => {
|
||||||
if (!member_name) {
|
|
||||||
return `${errorEnums.NO_NAME_PROVIDED} deletion.`;
|
|
||||||
}
|
|
||||||
return await db.members.destroy({ where: { name: member_name, userid: author_id } }).then(() => {
|
|
||||||
return `${member_name} has been deleted.`;
|
|
||||||
}).catch(e => {
|
|
||||||
return `${errorEnums.NO_MEMBER}: ${e.message}`;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
mh.get_member_by_proxy = async function(author_id, proxy) {
|
|
||||||
return await db.members.findOne({ where: { userid: author_id, proxy: proxy } }).catch(e => {
|
|
||||||
return `${errorEnums.NO_MEMBER}: ${e.message}`;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
mh.get_members_by_author = async function(author_id) {
|
|
||||||
return await db.members.findAll({ where: { userid: author_id } }).catch(e => {
|
|
||||||
// I have no idea how this could possibly happen but better safe than sorry
|
// I have no idea how this could possibly happen but better safe than sorry
|
||||||
return `${errorEnums.USER_NO_MEMBERS}: ${e.message}`;
|
return `${errorEnums.USER_NO_MEMBERS}: ${e.message}`;
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user