Compare commits

..

2 commits

Author SHA1 Message Date
powermaker450 6f8435b699 Prettier 2024-10-12 18:51:09 -04:00
powermaker450 9da9926fac Cast some nets 2024-10-12 18:50:34 -04:00
21 changed files with 273 additions and 203 deletions

View file

@ -26,11 +26,14 @@ import { BotClient } from "../bot";
import { dt } from "../main";
import { StoreMan } from "../storeman";
import getRandomColor from "../utils/getRandomColor";
import Logger from "../utils/Logger";
const logger = new Logger("(/) confess");
export const data = new SlashCommandBuilder()
.setName("confess")
.setDescription("Send a confession")
.addStringOption(option =>
.addStringOption((option) =>
option
.setName("message")
.setRequired(true)
@ -38,10 +41,11 @@ export const data = new SlashCommandBuilder()
);
export async function execute(interaction: CommandInteraction) {
try {
if (dt.isBanned(interaction.guild?.id!, interaction.user.id)) {
return interaction.reply({
content: "You are banned from confessions in this server!",
ephemeral: true
ephemeral: true,
});
}
@ -53,7 +57,6 @@ export async function execute(interaction: CommandInteraction) {
});
}
const confessChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
.confessChannel;
const adminChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
@ -74,32 +77,40 @@ export async function execute(interaction: CommandInteraction) {
.setTitle(`Anonymous Confession \`${messageId}\``)
// @ts-ignore
.setDescription(messageContent)
.addFields({
.addFields(
{
name: "Author",
value: interaction.user.displayName
value: interaction.user.displayName,
},
{
name: "Author ID",
value: interaction.user.id
}
value: interaction.user.id,
},
);
const message = await (
BotClient.channels.cache.get(confessChannel!) as TextChannel
)
.send({
embeds: [userConfessionEmbed]
).send({
embeds: [userConfessionEmbed],
});
await (BotClient.channels.cache.get(adminChannel!) as TextChannel)
.send({
embeds: [adminConfessionEmbed]
await (BotClient.channels.cache.get(adminChannel!) as TextChannel).send({
embeds: [adminConfessionEmbed],
});
dt.addConfession(message, messageId, interaction.user.displayName, interaction.user.id, messageContent);
dt.addConfession(
message,
messageId,
interaction.user.displayName,
interaction.user.id,
messageContent,
);
return interaction.reply({
content: "Confession sent!",
ephemeral: true,
});
} catch (err) {
logger.error("An error occured:", err);
}
}

View file

@ -16,17 +16,24 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { CommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
import {
CommandInteraction,
PermissionFlagsBits,
SlashCommandBuilder,
} from "discord.js";
import { dt } from "../main";
import Logger from "../utils/Logger";
const logger = new Logger("(/) confessban");
export const data = new SlashCommandBuilder()
.setName("confessban")
.setDescription("Ban a user from submitting confessions.")
.addStringOption(option =>
.addStringOption((option) =>
option
.setName("id")
.setDescription("The confession ID to ban")
.setRequired(true)
.setRequired(true),
)
.setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers);
@ -34,16 +41,20 @@ export async function execute(interaction: CommandInteraction) {
const result = dt.addBan(
interaction.guild?.id!,
// @ts-ignore
interaction.options.getString("id")
interaction.options.getString("id"),
);
try {
return result
? interaction.reply({
content: "User was banned.",
ephemeral: true
ephemeral: true,
})
: interaction.reply({
content: "No confession with that ID was found.",
ephemeral: true
ephemeral: true,
});
} catch (err) {
logger.error("An error occured:", err);
}
}

View file

@ -16,20 +16,25 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { CommandInteraction, EmbedBuilder, SlashCommandBuilder, TextChannel } from "discord.js";
import {
CommandInteraction,
EmbedBuilder,
SlashCommandBuilder,
TextChannel,
} from "discord.js";
import { dt } from "../main";
import { BotClient } from "../bot";
import getRandomColor from "../utils/getRandomColor";
import Logger from "../utils/Logger";
const logger = new Logger("(/) confessdel");
export const data = new SlashCommandBuilder()
.setName("confessdel")
.setDescription("Deletes a confession")
.addStringOption(option =>
option
.setName("id")
.setDescription("The confession id")
.setRequired(true)
)
.addStringOption((option) =>
option.setName("id").setDescription("The confession id").setRequired(true),
);
export async function execute(interaction: CommandInteraction) {
if (!dt.getGuildInfo(interaction.guild?.id!)) {
@ -45,30 +50,41 @@ export async function execute(interaction: CommandInteraction) {
const result = dt.getConfession(interaction.guild?.id!, idVal);
if (result) {
const confession = dt.getConfession(interaction.guild?.id!, idVal)?.messageId;
const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings.confessChannel!;
try {
const confession = dt.getConfession(
interaction.guild?.id!,
idVal,
)?.messageId;
const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings
.confessChannel!;
const emptyEmbed = new EmbedBuilder()
.setColor(getRandomColor())
.setTitle("Confession Deleted")
// @ts-ignore
.setDescription("[Confession Deleted]");
await (BotClient.channels.cache.get(channelId) as TextChannel).messages.fetch(confession!).then(e => {
await (BotClient.channels.cache.get(channelId) as TextChannel).messages
.fetch(confession!)
.then((e) => {
e.edit({
embeds: [emptyEmbed]
})
embeds: [emptyEmbed],
});
});
dt.delConfesssion(interaction, idVal);
return interaction.reply({
content: "Confession removed.",
ephemeral: true
})
ephemeral: true,
});
} catch (err) {
logger.error("An error occured:", err);
}
} else {
return interaction.reply({
content: "Either the confession wasn't found or you may not be allowed to remove it.",
ephemeral: true
content:
"Either the confession wasn't found or you may not be allowed to remove it.",
ephemeral: true,
});
}
}

View file

@ -16,34 +16,45 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { CommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
import {
CommandInteraction,
PermissionFlagsBits,
SlashCommandBuilder,
} from "discord.js";
import { dt } from "../main";
import Logger from "../utils/Logger";
const logger = new Logger("(/) confesspardon");
export const data = new SlashCommandBuilder()
.setName("confesspardon")
.setDescription("Unbans a user from confessions")
.addStringOption(option =>
.addStringOption((option) =>
option
.setName("id")
.setDescription("The confession ID to unban")
.setRequired(true)
.setRequired(true),
)
.setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages)
.setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages);
export function execute(interaction: CommandInteraction) {
const result = dt.removeBan(
interaction.guild?.id!,
// @ts-ignore
interaction.options.getString("id")
interaction.options.getString("id"),
);
try {
return result
? interaction.reply({
content: "User was unbanned.",
ephemeral: true
ephemeral: true,
})
: interaction.reply({
content: "No confession with that ID was found.",
ephemeral: true
ephemeral: true,
});
} catch (err) {
logger.error("An error occured:", err);
}
}

View file

@ -28,6 +28,8 @@ import {
import { dt } from "../main";
import Logger from "../utils/Logger";
const logger = new Logger("(/) setup");
export const data = new SlashCommandBuilder()
.setName("setup")
.setDescription("Setup the bot.")
@ -52,6 +54,7 @@ export async function execute(interaction: CommandInteraction) {
const channelRow =
new ActionRowBuilder<ChannelSelectMenuBuilder>().addComponents(channelList);
try {
const response = await interaction.reply({
content: `# Let's get started, ${interaction.user.displayName}!\nFirst, let's choose a channel for your confessions.`,
ephemeral: true,
@ -128,7 +131,10 @@ export async function execute(interaction: CommandInteraction) {
interaction.followUp({
content: "No channel selected. Try again.",
ephemeral: true,
components: []
components: [],
});
});
} catch (err) {
logger.error("An error occured:", err);
}
}

View file

@ -38,14 +38,14 @@ export class StoreMan {
id: string,
author: string,
authorId: string,
content: string
content: string,
): Confession {
return {
id: id,
messageId: message.id,
author: author,
authorId: authorId,
content: content
content: content,
};
}
@ -117,7 +117,13 @@ export class StoreMan {
}
// Attempts to add a confession. Returns true if the confession is sent, false if otherwise.
public addConfession(message: Message, id: string, author: string, authorId: string, content: string): boolean {
public addConfession(
message: Message,
id: string,
author: string,
authorId: string,
content: string,
): boolean {
const guildId = message.guild?.id;
for (const guild of this.data) {
@ -127,7 +133,9 @@ export class StoreMan {
return false;
}
guild.confessions.push(StoreMan.toConfession(message, id, author, authorId, content));
guild.confessions.push(
StoreMan.toConfession(message, id, author, authorId, content),
);
this.saveFile();
return true;
}
@ -138,7 +146,10 @@ export class StoreMan {
);
}
public getConfession(guildId: string, confessionId: string): Confession | null {
public getConfession(
guildId: string,
confessionId: string,
): Confession | null {
for (const guild of this.data) {
if (guild.id === guildId) {
for (const confession of guild.confessions) {
@ -153,7 +164,10 @@ export class StoreMan {
}
// Attempts to delete a confession. If it is sucessfully deleted, returns true, else false.
public delConfesssion({ guild, user }: CommandInteraction, confessionId: string): boolean {
public delConfesssion(
{ guild, user }: CommandInteraction,
confessionId: string,
): boolean {
const guildId = guild?.id;
const userId = user.id;
@ -161,7 +175,7 @@ export class StoreMan {
if (guild.id === guildId) {
for (const confession of guild.confessions) {
if (confession.authorId === userId) {
guild.confessions = guild.confessions.filter(confession => {
guild.confessions = guild.confessions.filter((confession) => {
return confession.id !== confessionId;
});
@ -208,7 +222,8 @@ export class StoreMan {
if (guild.id === guildId) {
if (confession) {
// Only add the user to the ban list if they aren't banned already
!this.isBanned(guildId, confession.authorId) && guild.settings.bans.push(confession.authorId!);
!this.isBanned(guildId, confession.authorId) &&
guild.settings.bans.push(confession.authorId!);
this.saveFile();
return true;
@ -224,7 +239,7 @@ export class StoreMan {
for (const guild of this.data) {
if (guild.id === guildId) {
if (this.getConfession(guildId, confessionId)) {
guild.settings.bans = guild.settings.bans.filter(ban => {
guild.settings.bans = guild.settings.bans.filter((ban) => {
return ban !== this.getConfession(guildId, confessionId)?.authorId!;
});

View file

@ -16,6 +16,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
const getRandomColor = () => (Math.random() * 0xFFFFFF << 0);
const getRandomColor = () => (Math.random() * 0xffffff) << 0;
export default getRandomColor;