From 2ddec025695af9f78f9a99de78f4e5c01178aab1 Mon Sep 17 00:00:00 2001 From: Aster Fialla Date: Fri, 13 Feb 2026 20:37:02 -0500 Subject: [PATCH] renamed stuff to be camel case since apparently I got that convention wrong --- bot.js | 30 +++++++++++++++--------------- helpers/messageHelper.js | 6 +++--- helpers/webhookHelper.js | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/bot.js b/bot.js index ea29d87..b48fe91 100644 --- a/bot.js +++ b/bot.js @@ -27,39 +27,39 @@ const gateway = new WebSocketManager({ export const client = new Client({ rest, gateway }); -let plural_flux_name = ""; -let plural_flux_discriminator = ""; +let pluralFluxName = ""; +let pluralFluxDiscriminator = ""; client.on(GatewayDispatchEvents.MessageCreate, async ({ api, data }) => { if (data.webhook_id) { return; } - else if (data.author.username === plural_flux_name && data.author.discriminator === plural_flux_discriminator) { + else if (data.author.username === pluralFluxName && data.author.discriminator === pluralFluxDiscriminator) { return; } else if (!data.content.startsWith(messageHelper.prefix)) { - const proxyMatch = await messageHelper.parse_proxy_tags(data.author.id, data.content); + const proxyMatch = await messageHelper.parseProxyTags(data.author.id, data.content); if (!proxyMatch.proxy) { return; } - const member = await memberHelper.get_member_by_proxy(data.author.id, proxyMatch.proxy); - await webhookHelper.replace_message(api, data, proxyMatch.message, member); + const member = await memberHelper.getMemberByProxy(data.author.id, proxyMatch.proxy); + await webhookHelper.replaceMessage(api, data, proxyMatch.message, member); + return; } - else { - const command_name = data.content.slice(messageHelper.prefix.length).split(" ")[0]; - const args = messageHelper.parse_command_args(data.content, command_name); + const command_name = data.content.slice(messageHelper.prefix.length).split(" ")[0]; + const args = messageHelper.parseCommandArgs(data.content, command_name); - if (command_name === "member" || command_name === "m") { - const reply = await memberHelper.parse_member_command(data.author.id, args); - await api.channels.createMessage(data.channel_id, {content: reply}); - } + if (command_name === "member" || command_name === "m") { + const reply = await memberHelper.parseMemberCommand(data.author.id, args); + await api.channels.createMessage(data.channel_id, {content: reply}); } + }); client.on(GatewayDispatchEvents.Ready, async ({data}) => { console.log(`Logged in as ${data.user.username}#${data.user.discriminator}`); - plural_flux_name = data.user.username; - plural_flux_discriminator = data.user.discriminator; + pluralFluxName = data.user.username; + pluralFluxDiscriminator = data.user.discriminator; await db.check_connection(); }); diff --git a/helpers/messageHelper.js b/helpers/messageHelper.js index 7391c64..0d47697 100644 --- a/helpers/messageHelper.js +++ b/helpers/messageHelper.js @@ -4,7 +4,7 @@ const msgh = {}; msgh.prefix = "pf;" -msgh.parse_command_args = function(text, command_name) { +msgh.parseCommandArgs = function(text, command_name) { const message = text.slice(msgh.prefix.length + command_name.length).trim(); // slices up message arguments including retaining quoted strings return message.match(/\\?.|^$/g).reduce((accumulator, chara) => { @@ -22,8 +22,8 @@ msgh.parse_command_args = function(text, command_name) { }, {array: ['']}).array // initial array with empty string for the reducer } -msgh.parse_proxy_tags = async function (author_id, text){ - const members = await memberHelper.get_members_by_author(author_id); +msgh.parseProxyTags = async function (author_id, text){ + const members = await memberHelper.getMembersByAuthor(author_id); const proxyMessage = {} members.forEach(member => { if (text.startsWith(member.proxy) && text.length > member.proxy.length) { diff --git a/helpers/webhookHelper.js b/helpers/webhookHelper.js index 2baefe9..32479dd 100644 --- a/helpers/webhookHelper.js +++ b/helpers/webhookHelper.js @@ -1,21 +1,21 @@ const wh = {}; -wh.get_or_create_webhook = async function (api, channel_id) { +wh.getOrCreateWebhook = async function (api, channelId) { const name = 'PluralFlux Proxy Webhook'; - let webhook = await get_webhook(api, channel_id, name); + let webhook = await getWebhook(api, channelId, name); if (webhook === undefined) { - webhook = await api.channels.createWebhook(channel_id, {name: name}); + webhook = await api.channels.createWebhook(channelId, {name: name}); } return webhook; } -async function get_webhook(api, channel_id, name) { - const all_webhooks = await api.channels.getWebhooks(channel_id); - if (all_webhooks.length === 0) { +async function getWebhook(api, channelId, name) { + const allWebhooks = await api.channels.getWebhooks(channelId); + if (allWebhooks.length === 0) { return; } let pf_webhook; - all_webhooks.forEach((webhook) => { + allWebhooks.forEach((webhook) => { if (webhook.name === name) { pf_webhook = webhook; } @@ -23,9 +23,9 @@ async function get_webhook(api, channel_id, name) { return pf_webhook; } -wh.replace_message = async function (api, data, text, member) { +wh.replaceMessage = async function (api, data, text, member) { if (text.length > 0) { - const webhook = await wh.get_or_create_webhook(api, data.channel_id); + const webhook = await wh.getOrCreateWebhook(api, data.channel_id); await api.webhooks.execute(webhook.id, webhook.token, {content: text, username: member.displayname ?? member.name, propic: member.propic}); await api.channels.deleteMessage(data.channel_id, data.id); }