diff --git a/src/bot.js b/src/bot.js index c0e0766..1ebbe44 100644 --- a/src/bot.js +++ b/src/bot.js @@ -748,7 +748,7 @@ const OG_STYLE_ICONS = { 'cid_690_athena_commando_f_photographer': 'https://fortnite-api.com/images/cosmetics/br/cid_690_athena_commando_f_photographer/variants/progressive/stage4.png', }; -let logoURL = `https://cdn.discordapp.com/attachments/1366104795215167558/1520980834138718238/icon_1.png?ex=6a432b49&is=6a41d9c9&hm=e9b35d70e831bc2035bf7486f975a357e3b7ba080b727ce4507f061674e17c3c&`; +let logoURL = `https://storage.radium.wtf/1-800.png`; // Cache the logo so we only fetch once per session let _logoBuffer = null; @@ -756,7 +756,7 @@ async function getLogoBuffer() { if (_logoBuffer) return _logoBuffer; try { const res = await fetchWithTimeout( - 'https://cdn.discordapp.com/attachments/1366104795215167558/1520980834138718238/icon_1.png?ex=6a432b49&is=6a41d9c9&hm=e9b35d70e831bc2035bf7486f975a357e3b7ba080b727ce4507f061674e17c3c&', + logoURL, 8000 ); if (res.ok) _logoBuffer = Buffer.from(await res.arrayBuffer()); @@ -1048,9 +1048,9 @@ async function sendLockerImageEmbed(message, { title, description, imageBuffer, : String(title || 'Locker Check'); const embed = new EmbedBuilder() .setColor(0xcccccc) - .setAuthor({ - name: `${displayName} (${message.author.username})`, - iconURL: message.author.displayAvatarURL() + .setAuthor({ + name: `${displayName} (${message.author.username})`, + iconURL: message.author.displayAvatarURL() }) .setDescription(`**${title}**\n${description}`) .setImage(`attachment://${fileName}`) @@ -1390,14 +1390,23 @@ function getRolesForLocker(ownedMap, ccItems) { // ───────────────────────────────────────────────────────────────────────────── // BOT READY // ───────────────────────────────────────────────────────────────────────────── -client.once('clientReady', async () => { - console.log(`logged in as ${client.user.tag}`); +let prefix = "!"; + +client.once('clientReady', async () => { client.user.setActivity( 'checking skins', { type: ActivityType.Playing } ); + if (client.user.displayName.includes("dev")) { + console.log(`logged in as ${client.user.tag} (developer)`); + prefix = "," + } else { + console.log(`logged in as ${client.user.tag}`); + prefix = "!" + } + const rest = new REST({ version: '10' }).setToken(process.env.TOKEN); const slashCommands = [ new SlashCommandBuilder() @@ -1494,7 +1503,7 @@ client.on('messageCreate', async (message) => { // !setuproles // ───────────────────────────────────────────────────────────────────────────── client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!setuproles') return; + if (message.author.bot || message.content !== prefix + 'setuproles') return; if (!message.member.permissions.has(PermissionsBitField.Flags.Administrator)) return message.reply('Need Administrator permission.'); @@ -1520,7 +1529,7 @@ client.on('messageCreate', async (message) => { // !removeoldemojis // ───────────────────────────────────────────────────────────────────────────── client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!removeoldemojis') return; + if (message.author.bot || message.content !== prefix + 'removeoldemojis') return; if (!message.member.permissions.has(PermissionsBitField.Flags.Administrator)) return message.reply('Need Administrator permission.'); @@ -1557,7 +1566,7 @@ let emojiSession = null; // { resolve, name, channel } // !skipemoji — skip the currently stuck emoji client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!skipemoji') return; + if (message.author.bot || message.content !== prefix + 'skipemoji') return; if (!message.member.permissions.has(PermissionsBitField.Flags.Administrator)) return; if (!emojiSession) return message.reply('No emoji upload is currently in progress.'); message.reply(`Skipping **${emojiSession.name}**...`); @@ -1566,7 +1575,7 @@ client.on('messageCreate', async (message) => { // !stopemojis — stop the whole session client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!stopemojis') return; + if (message.author.bot || message.content !== prefix + 'stopemojis') return; if (!message.member.permissions.has(PermissionsBitField.Flags.Administrator)) return; if (!emojiSession) return message.reply('No emoji upload is currently in progress.'); message.reply('Stopping emoji upload session.'); @@ -1577,7 +1586,7 @@ client.on('messageCreate', async (message) => { let addIconsRunning = false; client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!addicons') return; + if (message.author.bot || message.content !== prefix + 'addicons') return; if (!message.member.permissions.has(PermissionsBitField.Flags.Administrator)) return message.reply('Need Administrator permission.'); @@ -1649,7 +1658,7 @@ client.on('messageCreate', async (message) => { // !setroleicons // ───────────────────────────────────────────────────────────────────────────── client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!setroleicons') return; + if (message.author.bot || message.content !== prefix + 'setroleicons') return; if (!message.member.permissions.has(PermissionsBitField.Flags.Administrator)) return message.reply('Need Administrator permission.'); @@ -1683,7 +1692,7 @@ client.on('messageCreate', async (message) => { // !unverify — remove verification and strip roles // ───────────────────────────────────────────────────────────────────────────── client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!unverify') return; + if (message.author.bot || message.content !== prefix + 'unverify') return; const userId = message.author.id; @@ -1726,24 +1735,24 @@ client.on('messageCreate', async (message) => { verifiedUsers.delete(userId); //message.reply(`Your verification as **${prev.epicName}** has been removed and your roles have been stripped. You can now use \`!verify\` to link a different account.`); await message.reply({ - content: null, embeds: [{ - color: 0xefecef, - author: { - name: message.author.username, - iconURL: message.author.displayAvatarURL(), - }, - description: `<:check:1481811973447356496> your verification as **${prev.epicName}** has been removed and your roles have been stripped! you can now use \`!verify\` to link a different account.`, - footer: { - text: `1-800 @ ${message.guild.name}`, - iconURL: client.user.displayAvatarURL(), - }, - timestamp: new Date(), - }], - }) + content: null, embeds: [{ + color: 0xefecef, + author: { + name: message.author.username, + iconURL: message.author.displayAvatarURL(), + }, + description: `<:check:1481811973447356496> your verification as **${prev.epicName}** has been removed and your roles have been stripped! you can now use \`!verify\` to link a different account.`, + footer: { + text: `1-800 @ ${message.guild.name}`, + iconURL: client.user.displayAvatarURL(), + }, + timestamp: new Date(), + }], + }) }); client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!test') return; + if (message.author.bot || message.content !== prefix + 'test') return; const userId = message.author.id; @@ -1777,7 +1786,7 @@ client.on('messageCreate', async (message) => { // !verify // ───────────────────────────────────────────────────────────────────────────── client.on('messageCreate', async (message) => { - if (message.author.bot || message.content !== '!verify') return; + if (message.author.bot || message.content !== prefix + 'verify') return; console.log("verify");