Skip to content

Commit

Permalink
THIS SHIT IS DONE
Browse files Browse the repository at this point in the history
Just need to wait for discordjs/discord.js#5838 to be merged so that I can get rid of the bad patch in ready.ts line 141
  • Loading branch information
ImRodry committed Jun 13, 2021
1 parent e1b5a19 commit b6f5bee
Show file tree
Hide file tree
Showing 42 changed files with 219 additions and 265 deletions.
98 changes: 26 additions & 72 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"canvas": "^2.8.0",
"country-emoji": "^1.5.6",
"countryjs": "^1.8.0",
"discord.js": "^13.0.0-dev.e980948de55e91e59c9e3293ac76bc645a058a53",
"discord.js": "^13.0.0-dev.02693bc02f45980d8165820a103220f0027b96b7",
"lodash": "^4.17.21",
"mongodb": "^3.6.9",
"node-fetch": "^2.6.1",
Expand Down
2 changes: 1 addition & 1 deletion src/commands/Admin/bulksend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const command: Command = {
.setTitle(amount === 1 ? "Success! Message sent." : "Success! Messages sent.")
.setDescription(`${sendTo}`)
.setFooter(`Executed by ${interaction.user.tag}`, interaction.user.displayAvatarURL({ format: "png", dynamic: true }))
await interaction.reply(embed)
await interaction.reply({ embeds: [embed] })
}
}

Expand Down
18 changes: 9 additions & 9 deletions src/commands/Admin/channel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const command: Command = {
.setTitle("Updated the information channel!")
.setDescription(`Check it out at <#762341271611506708>!`) //server-info
.setFooter(`Executed by ${interaction.user.tag}`, interaction.user.displayAvatarURL({ format: "png", dynamic: true }))
await interaction.reply(successEmbed)
await interaction.reply({ embeds: [successEmbed] })
} else if (channelInput === "rules") {
await rules(interaction)
const successEmbed = new Discord.MessageEmbed()
Expand All @@ -46,7 +46,7 @@ const command: Command = {
.setTitle("Updated the rules channel!")
.setDescription(`Check it out at <#796159719617986610>!`) //rules
.setFooter(`Executed by ${interaction.user.tag}`, interaction.user.displayAvatarURL({ format: "png", dynamic: true }))
await interaction.reply(successEmbed)
await interaction.reply({ embeds: [successEmbed] })
} else if (channelInput === "verify") {
await verify(interaction)
const successEmbed = new Discord.MessageEmbed()
Expand All @@ -55,7 +55,7 @@ const command: Command = {
.setTitle("Updated the verification channel!")
.setDescription(`Check it out at <#569178590697095168>!`) //verify
.setFooter(`Executed by ${interaction.user.tag}`, interaction.user.displayAvatarURL({ format: "png", dynamic: true }))
await interaction.reply(successEmbed)
await interaction.reply({ embeds: [successEmbed] })
} else if (!channelInput) {
await info(interaction)
await verify(interaction)
Expand All @@ -66,7 +66,7 @@ const command: Command = {
.setTitle("All channels have been updated!")
.setDescription(`Check them out at <#762341271611506708>, <#796159719617986610> and <#569178590697095168>!`) //server-info, rules and verify
.setFooter(`Executed by ${interaction.user.tag}`, interaction.user.displayAvatarURL({ format: "png", dynamic: true }))
await interaction.reply(successEmbed)
await interaction.reply({ embeds: [successEmbed] })
}
}
}
Expand All @@ -83,7 +83,7 @@ async function info(interaction: Discord.CommandInteraction) {
{ name: "**Main Channels 💬**", value: "<#621298919535804426> - You can use this channel to talk about anything you want really.\n<#619662798133133312> - A text channel where you can post your favorite memes.\n<#712046319375482910> - Post pics of your or someone else's cute pets here.\n<#644620638878695424> - A special channel for special people that have boosted our server. Thank you!\n<#550951034332381184> - A text channel where you can suggest things you would like to see on this Discord server.\n<#549894938712866816> - A channel for you to use bot commands in.\n<#782267779008823326> - A channel for you to use music commands in.\n<#713084081579098152> - A text channel you can use when you can't speak in a voice chat." },
{ name: "**Translation Channels 🔠**", value: "We offer channels for each one of the currently supported projects: **Hypixel**, **SkyblockAddons**, **Quickplay** and our **Bot**.\nEach category has 3 text channels: one for translators, one for proofreaders and one with the project's language status that gets updated every 20 minutes. They also have 2 voice channels: one for translators and one for proofreaders. If you have any questions related to your project, they should be sent here!" },
{ name: "**Language-specific channels 🎏**", value: "We offer channels where translators and proofreaders (of the Hypixel and Quickplay projects) for specific languages can interact with one another! You can speak in English there, but we encourage you to speak the language you're translating. Please keep in mind these channels are not actively moderated. In case you need to report something that occured in these channels, please contact an administrator." })
channelsMessage.edit(null, channelsEmbed)
channelsMessage.edit({ content: null, embeds: [channelsEmbed] })

const botsMessage = await serverInfo.messages.fetch("800415710508744744"),
botsEmbed = new Discord.MessageEmbed()
Expand All @@ -94,7 +94,7 @@ async function info(interaction: Discord.CommandInteraction) {
{ name: "**Bots**", value: "<@620364412649209864> - Our personalised bot! It is currently maintained by <@240875059953139714> and has a bunch of useful features.\n<@155149108183695360> - This is Dyno. He is used for moderation purposes and nothing else, so don't mind him.\n<@294882584201003009> - This is the bot that runs our giveaways in <#787050912005881876>.\n<@235088799074484224> - Rythm can play some good tunes (or memes, you choose) in a voice channel.\n<@472911936951156740> - VoiceMaster allows you to create custom voice channels by joining the channel `Join to Create` and you can use <#549894938712866816> to customise them." },
{ name: "**Custom informational commands**", value: "**`+guide`** - Gives you the link to the Hypixel project's guidelines. This is the only command that's allowed in all channels.\n**`+invite`** - Gives you the invite link to this server, please use this when you want to invite someone.\n**`+thread`** - Gives you the link to the thread regarding this Discord server.\n**`+twitter`** - Gives you the link to our Twitter page.\n**`+hypixel`** - Gives you some useful information about the Hypixel Crowdin project.\n**`+quickplay`** - Gives you some useful information about the Quickplay Crowdin project.\n**`+sba`** - Gives you some useful information about the SkyblockAddons Crowdin project." }
)
botsMessage.edit(null, botsEmbed)
botsMessage.edit({ content: null, embeds: [botsEmbed] })

const rolesMessage = await serverInfo.messages.fetch("800415711864029204"),
rolesEmbed = new Discord.MessageEmbed()
Expand All @@ -109,7 +109,7 @@ async function info(interaction: Discord.CommandInteraction) {
{ name: "**Reaction Roles**", value: `You can react to this message to receive the roles below, here's what they do:\n<@&646098170794868757> - React with 📊 to be notified whenever a new poll is posted on <#646096405252800512>\n<@&732615152246980628> - React with 🤖 to be notified whenever a new major update to <@${interaction.client.user!.id}> is posted on <#732587569744838777>\n<@&801052623745974272> - React with 🎉 to be notified of future giveaways in <#787050912005881876>!` }
)
.setFooter("Need help? Ask your questions in #off-topic | Bot made with lots of care by QkeleQ10#6163")
rolesMessage.edit(null, rolesEmbed)
rolesMessage.edit({ content: null, embeds: [rolesEmbed] })
}

async function rules(interaction: Discord.CommandInteraction) {
Expand All @@ -131,7 +131,7 @@ async function rules(interaction: Discord.CommandInteraction) {
{ name: "And most importantly have fun!", value: "If you see something against the rules or something that makes you feel unsafe, please let staff know. We want this server to be a welcoming space for everyone!" }
)
.setFooter("Have any questions? Ask any staff member, they're here to help!")
rulesMessage.edit(null, rulesEmbed)
rulesMessage.edit({ content: null, embeds: [rulesEmbed] })
}

async function verify(interaction: Discord.CommandInteraction) {
Expand All @@ -149,7 +149,7 @@ async function verify(interaction: Discord.CommandInteraction) {
{ name: "Need help?", value: "Feel free to send a message on this channel, or DM either <@240875059953139714>, <@241926666400563203> or <@435546264432803840> with any questions you might have!" }
)
.setFooter("Have fun on our server!")
verifyMessage.edit("**Please read the entire message before sending anything on the channel.**", verifyEmbed)
verifyMessage.edit({ content: "**Please read the entire message before sending anything on the channel.**", embeds: [verifyEmbed] })
}

export default command
2 changes: 1 addition & 1 deletion src/commands/Admin/crowdinverify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const command: Command = {
.setTitle("All verified users had their roles updated!")
.setDescription("Check the console for any errors that may have occured in the process")
.setFooter(`Executed by ${interaction.user.tag}`, interaction.user.displayAvatarURL({ format: "png", dynamic: true }))
await interaction.editReply(embed)
await interaction.editReply({ embeds: [embed] })
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/commands/Admin/giveaway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ const command: Command = {
async execute(interaction: Discord.CommandInteraction) {
const giveawayMsg = await (interaction.channel as Discord.TextChannel).messages.fetch((interaction.options.get("messageid")!.value as Discord.Snowflake))
.catch(err => {
return interaction.reply("Couldn't find that message! Here's the error:\n" + err, { ephemeral: true })
return interaction.reply({ content: "Couldn't find that message! Here's the error:\n" + err, ephemeral: true })
}) as Discord.Message
const users = await giveawayMsg.reactions.cache.get("🎉")?.users.fetch() as Discord.Collection<string, Discord.User>
if (!users) return interaction.reply("That message doesn't have any 🎉 reactions.", { ephemeral: true })
if (!users) return interaction.reply({ content: "That message doesn't have any 🎉 reactions.", ephemeral: true })
const winners: (Discord.User | undefined)[] = users.random(Number(interaction.options.get("winners")?.value) || 1)
await interaction.reply(`Congratulations to ${winners.filter(user => user).join(", ")}`)
}
Expand Down
Loading

0 comments on commit b6f5bee

Please sign in to comment.