diff --git a/config.template.json b/config.template.json index ac7163893..693542246 100644 --- a/config.template.json +++ b/config.template.json @@ -1,7 +1,4 @@ { "discord_token": "", - "discord_client_id": "", - "discord_guild_id": "", - "discord_verify_channel": "", "wargaming_application_id": "" } diff --git a/discord.json b/discord.json new file mode 100644 index 000000000..1c3abe096 --- /dev/null +++ b/discord.json @@ -0,0 +1,7 @@ +{ + "client_id": "1097673957865443370", + "guild_id": "894784231677513819", + "verify_channel": "1097677884266643527", + "verify_role": "909968395154358333", + "peasant_role": "896878529512370228" +} diff --git a/src/behaviors/guildMemberAdd.ts b/src/behaviors/guildMemberAdd.ts index 0ed1a87cb..59a43c855 100644 --- a/src/behaviors/guildMemberAdd.ts +++ b/src/behaviors/guildMemberAdd.ts @@ -1,14 +1,12 @@ import { faker } from '@faker-js/faker'; import { EmbedBuilder, GuildMember, TextChannel } from 'discord.js'; -import config from '../../config.json' assert { type: 'json' }; +import discord from '../../discord.json' assert { type: 'json' }; export default async function (member: GuildMember) { console.log(`${member.user.tag} joined`); await ( - member.guild.channels.cache.get( - config.discord_verify_channel, - ) as TextChannel + member.guild.channels.cache.get(discord.verify_channel) as TextChannel ).send({ embeds: [ new EmbedBuilder() @@ -24,8 +22,6 @@ export default async function (member: GuildMember) { ], }); await ( - member.guild.channels.cache.get( - config.discord_verify_channel, - ) as TextChannel + member.guild.channels.cache.get(discord.verify_channel) as TextChannel ).send(member.toString()); } diff --git a/src/behaviors/interactionCreate.ts b/src/behaviors/interactionCreate.ts index 932f8e029..a652d8ac4 100644 --- a/src/behaviors/interactionCreate.ts +++ b/src/behaviors/interactionCreate.ts @@ -1,3 +1,4 @@ +import discord from '../../discord.json' assert { type: 'json' }; import { CacheType, Collection, @@ -31,8 +32,8 @@ try { const data = (await rest.put( Routes.applicationGuildCommands( - config.discord_client_id, - config.discord_guild_id, + discord.client_id, + discord.guild_id, ), { body: commands }, )) as { length: number }; diff --git a/src/commands/verify.ts b/src/commands/verify.ts index f3a9bc37f..1d7b05810 100644 --- a/src/commands/verify.ts +++ b/src/commands/verify.ts @@ -5,6 +5,7 @@ import { SlashCommandBuilder, } from 'discord.js'; import config from '../../config.json' assert { type: 'json' }; +import discord from '../../discord.json' assert { type: 'json' }; import AccountList from '../types/accountList.js'; const SERVER_NAMES = { com: 'North America', eu: 'Europe', asia: 'Asia' }; @@ -37,8 +38,8 @@ export async function execute( member ?.setNickname(`${ign}${clanTag}`) .then(async () => { - await member.roles.remove(config.discord_verify_role); - await member.roles.add(config.discord_peasant_role); + await member.roles.remove(discord.verify_role); + await member.roles.add(discord.peasant_role); await interaction.reply({ embeds: [ new EmbedBuilder()