diff --git a/discord.json b/discord.json index 5fb5d98b4..d169bf4c9 100644 --- a/discord.json +++ b/discord.json @@ -1,9 +1,12 @@ { "client_id": "1097673957865443370", "client_id_dev": "1099063696015229078", - "guild_id": "894784231677513819", - "verify_channel": "909968131873726545", - "log_channel": "1101124775100809307", - "verify_role": "909968395154358333", - "peasant_role": "896878529512370228" + + "sklld_guild_id": "894784231677513819", + "sklld_verify_channel": "909968131873726545", + "sklld_verify_role": "909968395154358333", + "sklld_peasant_role": "896878529512370228", + + "tres_guild_id": "734786591205359697", + "tres_log_channel": "1109262265850544148" } diff --git a/src/commands/help.ts b/src/commands/help.ts index cebfb96b6..becfdb964 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -28,7 +28,7 @@ export default { `**About**\n${ client.user?.username } automates many mundane tasks and provide statistics in numerous flexible ways.\n\nMade by TresAbhi from the Skilled [SKLLD] clan.\nGitHub: https://github.com/tresabhi/sklld-bot\nDiscord server: https://discord.gg/nDt7AjGJQH\nSkilled server: https://discord.gg/ZPvcEG7DS8\n\n**Commands**\n${(interaction.guildId === - discord.guild_id + discord.sklld_guild_id ? [...guildCommands, ...publicCommands] : publicCommands ) diff --git a/src/commands/verify.ts b/src/commands/verify.ts index 59e305686..20de24570 100644 --- a/src/commands/verify.ts +++ b/src/commands/verify.ts @@ -68,7 +68,7 @@ export default { try { await member.setNickname(`${accountInfo[id].nickname}${clanTag}`); - if (interaction.guildId === discord.guild_id) { + if (interaction.guildId === discord.sklld_guild_id) { if ( !interaction.guild?.members.me?.permissions.has('ManageRoles') ) { @@ -94,8 +94,8 @@ export default { return; } - await member.roles.remove(discord.verify_role); - await member.roles.add(discord.peasant_role); + await member.roles.remove(discord.sklld_verify_role); + await member.roles.add(discord.sklld_peasant_role); } await interaction.editReply({ diff --git a/src/events/error.ts b/src/events/error.ts index 37a08e84d..bc99ced50 100644 --- a/src/events/error.ts +++ b/src/events/error.ts @@ -12,8 +12,8 @@ export function handleError(error: Error, client: Client, command: string) { ( client.guilds.cache - .get(discord.guild_id) - ?.channels.cache.get(discord.log_channel) as TextChannel + .get(discord.tres_guild_id) + ?.channels.cache.get(discord.tres_log_channel) as TextChannel ).send({ embeds: [ new EmbedBuilder() diff --git a/src/events/guildMemberAdd.ts b/src/events/guildMemberAdd.ts index 92f2833ee..032be1845 100644 --- a/src/events/guildMemberAdd.ts +++ b/src/events/guildMemberAdd.ts @@ -3,9 +3,11 @@ import discord from '../../discord.json' assert { type: 'json' }; import { SKILLED_COLOR } from '../constants/colors.js'; export default async function (member: GuildMember) { - if (member.guild.id === discord.guild_id) { + if (member.guild.id === discord.sklld_guild_id) { await ( - member.guild.channels.cache.get(discord.verify_channel) as TextChannel + member.guild.channels.cache.get( + discord.sklld_verify_channel, + ) as TextChannel ).send({ content: member.toString(), embeds: [ diff --git a/src/events/interactionCreate.ts b/src/events/interactionCreate.ts index 00b725e78..5582f2465 100644 --- a/src/events/interactionCreate.ts +++ b/src/events/interactionCreate.ts @@ -59,7 +59,7 @@ try { console.log(`Refreshing ${guildCommands.length} guild command(s).`); const guildData = (await rest.put( - Routes.applicationGuildCommands(getClientId(), discord.guild_id), + Routes.applicationGuildCommands(getClientId(), discord.sklld_guild_id), { body: guildCommands }, )) as RESTPostAPIChatInputApplicationCommandsJSONBody[]; console.log(`Successfully refreshed ${guildData.length} guild command(s).`);