Merge branch 'main' into v15

Author: Jiralite

Diff for: code-samples/popular-topics/permissions/14/index.js

@@ -1,5 +1,5 @@
 const util = require('node:util');
-const { ChannelType, Client, Events, Formatters, GatewayIntentBits, PermissionsBitField } = require('discord.js');
+const { ChannelType, Client, codeBlock, Events, GatewayIntentBits, PermissionsBitField } = require('discord.js');
 
 const client = new Client({ intents: [GatewayIntentBits.Guilds] });
 
@@ -111,7 +111,7 @@ client.on(Events.InteractionCreate, interaction => {
 	} else if (commandName === 'my-permissions') {
 		const finalPermissions = interaction.channel.permissionsFor(interaction.member);
 
-		interaction.reply({ content: Formatters.codeBlock(util.inspect(finalPermissions.serialize())) });
+		interaction.reply({ content: codeBlock(util.inspect(finalPermissions.serialize())) });
 	} else if (commandName === 'lock-permissions') {
 		if (!interaction.channel.parent) {
 			return interaction.reply('This channel is not placed under a category.');
@@ -129,7 +129,7 @@ client.on(Events.InteractionCreate, interaction => {
 	} else if (commandName === 'role-permissions') {
 		const roleFinalPermissions = interaction.channel.permissionsFor(interaction.member.roles.highest);
 
-		interaction.reply({ content: Formatters.codeBlock(util.inspect(roleFinalPermissions.serialize())) });
+		interaction.reply({ content: codeBlock(util.inspect(roleFinalPermissions.serialize())) });
 	}
 });
 

Diff for: code-samples/sequelize/currency/14/app.js

@@ -1,5 +1,5 @@
 const { Op } = require('sequelize');
-const { Client, Collection, Events, Formatters, GatewayIntentBits } = require('discord.js');
+const { Client, codeBlock, Collection, Events, GatewayIntentBits } = require('discord.js');
 const { Users, CurrencyShop } = require('./dbObjects.js');
 
 const client = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages] });
@@ -86,10 +86,10 @@ client.on(Events.InteractionCreate, async interaction => {
 		return interaction.reply(`You've bought a ${item.name}`);
 	} else if (commandName === 'shop') {
 		const items = await CurrencyShop.findAll();
-		return interaction.reply(Formatters.codeBlock(items.map(i => `${i.name}: ${i.cost}💰`).join('\n')));
+		return interaction.reply(codeBlock(items.map(i => `${i.name}: ${i.cost}💰`).join('\n')));
 	} else if (commandName === 'leaderboard') {
 		return interaction.reply(
-			Formatters.codeBlock(
+			codeBlock(
 				currency.sort((a, b) => b.balance - a.balance)
 					.filter(user => client.users.cache.has(user.user_id))
 					.first(10)