r
This commit is contained in:
1 parent
494a55d74c
commit
2a9230c21d
1 file changed
+35
-36
+35
-36
@@ -80,7 +80,7 @@ const roles = [
|
|||||||
{ name: 'StreamElements', color: 0xF1C40F },
|
{ name: 'StreamElements', color: 0xF1C40F },
|
||||||
{ name: 'Llamas', color: 0xFF69B4 },
|
{ name: 'Llamas', color: 0xFF69B4 },
|
||||||
{ name: 'Repaz', color: 0xD4AC0D },
|
{ name: 'Repaz', color: 0xD4AC0D },
|
||||||
{ name: 'lollek', color: 0xFFFFFF },
|
{ name: 'lollek', color: 0xcccccc },
|
||||||
{ name: 'Celebration Heart', color: 0x9B59B6 },
|
{ name: 'Celebration Heart', color: 0x9B59B6 },
|
||||||
{ name: 'Funflower', color: 0xD4C227 },
|
{ name: 'Funflower', color: 0xD4C227 },
|
||||||
{ name: 'Level 100', color: 0xBB44EE },
|
{ name: 'Level 100', color: 0xBB44EE },
|
||||||
@@ -1034,7 +1034,7 @@ async function sendLockerImageEmbed(message, { title, description, imageBuffer,
|
|||||||
? `${String(title).slice(0, 247)}...`
|
? `${String(title).slice(0, 247)}...`
|
||||||
: String(title || 'Locker Check');
|
: String(title || 'Locker Check');
|
||||||
const embed = new EmbedBuilder()
|
const embed = new EmbedBuilder()
|
||||||
.setColor(0xffffff)
|
.setColor(0xcccccc)
|
||||||
.setDescription("**" + safeTitle + "**\n" + description)
|
.setDescription("**" + safeTitle + "**\n" + description)
|
||||||
.setImage(`attachment://${fileName}`)
|
.setImage(`attachment://${fileName}`)
|
||||||
.setTimestamp();
|
.setTimestamp();
|
||||||
@@ -1369,7 +1369,7 @@ function getRolesForLocker(ownedMap, ccItems) {
|
|||||||
// ─────────────────────────────────────────────────────────────────────────────
|
// ─────────────────────────────────────────────────────────────────────────────
|
||||||
// BOT READY
|
// BOT READY
|
||||||
// ─────────────────────────────────────────────────────────────────────────────
|
// ─────────────────────────────────────────────────────────────────────────────
|
||||||
client.once('ready', async () => {
|
client.once('clientReady', async () => {
|
||||||
console.log(`logged in as ${client.user.tag}`);
|
console.log(`logged in as ${client.user.tag}`);
|
||||||
|
|
||||||
client.user.setActivity(
|
client.user.setActivity(
|
||||||
@@ -1789,7 +1789,7 @@ client.on('messageCreate', async (message) => {
|
|||||||
const loginUrl = `https://www.epicgames.com/activate?userCode=${deviceData.user_code}`;
|
const loginUrl = `https://www.epicgames.com/activate?userCode=${deviceData.user_code}`;
|
||||||
|
|
||||||
const embed = new EmbedBuilder()
|
const embed = new EmbedBuilder()
|
||||||
.setColor(0xffffff)
|
.setColor(0xcccccc)
|
||||||
.setAuthor({
|
.setAuthor({
|
||||||
name: message.author.username,
|
name: message.author.username,
|
||||||
icon_url: message.author.displayAvatarURL(),
|
icon_url: message.author.displayAvatarURL(),
|
||||||
@@ -1814,7 +1814,7 @@ client.on('messageCreate', async (message) => {
|
|||||||
if (!tokenData)
|
if (!tokenData)
|
||||||
return message.author.send({
|
return message.author.send({
|
||||||
content: null, embeds: [{
|
content: null, embeds: [{
|
||||||
color: 0xffffff,
|
color: 0xcccccc,
|
||||||
author: {
|
author: {
|
||||||
name: message.author.username,
|
name: message.author.username,
|
||||||
icon_url: message.author.displayAvatarURL(),
|
icon_url: message.author.displayAvatarURL(),
|
||||||
@@ -1833,7 +1833,7 @@ client.on('messageCreate', async (message) => {
|
|||||||
//return message.author.send('Authentication failed. Please try again.');
|
//return message.author.send('Authentication failed. Please try again.');
|
||||||
return message.author.send({
|
return message.author.send({
|
||||||
content: null, embeds: [{
|
content: null, embeds: [{
|
||||||
color: 0xffffff,
|
color: 0xcccccc,
|
||||||
author: {
|
author: {
|
||||||
name: message.author.username,
|
name: message.author.username,
|
||||||
icon_url: message.author.displayAvatarURL(),
|
icon_url: message.author.displayAvatarURL(),
|
||||||
@@ -1851,7 +1851,7 @@ client.on('messageCreate', async (message) => {
|
|||||||
//await message.author.send(`logged in as **${displayName}**! fetching locker...`);
|
//await message.author.send(`logged in as **${displayName}**! fetching locker...`);
|
||||||
await message.author.send({
|
await message.author.send({
|
||||||
content: null, embeds: [{
|
content: null, embeds: [{
|
||||||
color: 0xffffff,
|
color: 0xcccccc,
|
||||||
author: {
|
author: {
|
||||||
name: message.author.username,
|
name: message.author.username,
|
||||||
icon_url: message.author.displayAvatarURL(),
|
icon_url: message.author.displayAvatarURL(),
|
||||||
@@ -1893,33 +1893,6 @@ client.on('messageCreate', async (message) => {
|
|||||||
// Store verified state so they can't re-verify without !unverify
|
// Store verified state so they can't re-verify without !unverify
|
||||||
verifiedUsers.set(userId, { guildId: guild.id, assignedRoles: assigned, epicName: displayName });
|
verifiedUsers.set(userId, { guildId: guild.id, assignedRoles: assigned, epicName: displayName });
|
||||||
|
|
||||||
const verifyEmbed = new EmbedBuilder()
|
|
||||||
.setColor(0x2B2D31)
|
|
||||||
.setAuthor({
|
|
||||||
name: displayName + " (" + message.author.username + ")",
|
|
||||||
iconURL: message.author.displayAvatarURL(),
|
|
||||||
})
|
|
||||||
.setDescription(
|
|
||||||
assigned.length === 0
|
|
||||||
? 'no exclusive roles found!'
|
|
||||||
: "roles added: " + assigned.map(r => `— ${r}`).join('\n')
|
|
||||||
)
|
|
||||||
.addFields(
|
|
||||||
{ name: 'total outfits', value: String(outfits.length), inline: true },
|
|
||||||
{ name: 'total pickaxes', value: String(pickaxes.length), inline: true },
|
|
||||||
)
|
|
||||||
.setFooter({
|
|
||||||
text: `1-800 @ ${message.guild.name}`,
|
|
||||||
icon_url: client.user.displayAvatarURL(),
|
|
||||||
});
|
|
||||||
|
|
||||||
await message.author.send({ embeds: [verifyEmbed] });
|
|
||||||
|
|
||||||
// Send verification log to designated channel
|
|
||||||
try {
|
|
||||||
const logChannel = await client.channels.fetch(LOG_CHANNEL_ID).catch(() => null);
|
|
||||||
if (logChannel) {
|
|
||||||
// Fetch server emojis to use next to role names
|
|
||||||
const emojiGuild = await client.guilds.fetch(process.env.EMOJI_GUILD_ID).catch(() => null);
|
const emojiGuild = await client.guilds.fetch(process.env.EMOJI_GUILD_ID).catch(() => null);
|
||||||
await emojiGuild?.emojis.fetch().catch(() => null);
|
await emojiGuild?.emojis.fetch().catch(() => null);
|
||||||
|
|
||||||
@@ -1961,8 +1934,34 @@ client.on('messageCreate', async (message) => {
|
|||||||
return emoji ? `${emoji} ` : '';
|
return emoji ? `${emoji} ` : '';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const verifyEmbed = new EmbedBuilder()
|
||||||
|
.setColor(0xcccccc)
|
||||||
|
.setAuthor({
|
||||||
|
name: displayName + " (" + message.author.username + ")",
|
||||||
|
iconURL: message.author.displayAvatarURL(),
|
||||||
|
})
|
||||||
|
.setDescription(
|
||||||
|
assigned.length === 0
|
||||||
|
? 'no exclusive roles found!'
|
||||||
|
: "roles added: \n" + assigned.map(r => `${getServerEmoji(r)}${r}`).join('\n')
|
||||||
|
)
|
||||||
|
.addFields(
|
||||||
|
{ name: 'total outfits', value: String(outfits.length), inline: true },
|
||||||
|
{ name: 'total pickaxes', value: String(pickaxes.length), inline: true },
|
||||||
|
)
|
||||||
|
.setFooter({
|
||||||
|
text: `1-800 @ ${message.guild.name}`,
|
||||||
|
icon_url: client.user.displayAvatarURL(),
|
||||||
|
});
|
||||||
|
|
||||||
|
await message.author.send({ embeds: [verifyEmbed] });
|
||||||
|
|
||||||
|
// Send verification log to designated channel
|
||||||
|
try {
|
||||||
|
const logChannel = await client.channels.fetch(LOG_CHANNEL_ID).catch(() => null);
|
||||||
|
if (logChannel) {
|
||||||
const logEmbed = new EmbedBuilder()
|
const logEmbed = new EmbedBuilder()
|
||||||
.setColor(0xffffff)
|
.setColor(0xcccccc)
|
||||||
.setAuthor({
|
.setAuthor({
|
||||||
name: displayName + " (" + message.author.username + ")",
|
name: displayName + " (" + message.author.username + ")",
|
||||||
iconURL: message.author.displayAvatarURL(),
|
iconURL: message.author.displayAvatarURL(),
|
||||||
@@ -2092,7 +2091,7 @@ client.on('messageCreate', async (message) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await message.author.send(`Building your full locker (${categories.length} categories)...`);
|
//await message.author.send(`Building your full locker (${categories.length} categories)...`);
|
||||||
|
|
||||||
for (const cat of categories) {
|
for (const cat of categories) {
|
||||||
const items = cat.ids.map(id => ({
|
const items = cat.ids.map(id => ({
|
||||||
|
|||||||
Reference in new issue
Block a user