powermaker450/confoss
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: powermaker450:6f8435b699bbb3a9af87e14f7eb3b9d75fcf0741
Branches Tags
powermaker450:main
..
compare: powermaker450:256956df73706c74c3209830a6d134a8745efc8a
Branches Tags
powermaker450:main

No commits in common. "6f8435b699bbb3a9af87e14f7eb3b9d75fcf0741" and "256956df73706c74c3209830a6d134a8745efc8a" have entirely different histories.
6f8435b699 ... 256956df73

21 changed files with 206 additions and 276 deletions
Show stats Expand all files Collapse all files

39
src/commands/confess.ts
View file

@ -26,14 +26,11 @@ 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)
@ -41,11 +38,10 @@ 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
});
}
@ -57,6 +53,7 @@ export async function execute(interaction: CommandInteraction) {
});
}
const confessChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
.confessChannel;
const adminChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
@ -77,40 +74,32 @@ 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);
}
}

23
src/commands/confessban.ts
View file

@ -16,24 +16,17 @@
* 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);
@ -41,20 +34,16 @@ 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);
}
}

48
src/commands/confessdel.ts
View file

@ -16,25 +16,20 @@
* 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!)) {
@ -50,41 +45,30 @@ export async function execute(interaction: CommandInteraction) {
const result = dt.getConfession(interaction.guild?.id!, idVal);
if (result) {
try {
const confession = dt.getConfession(
interaction.guild?.id!,
idVal,
)?.messageId;
const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings
.confessChannel!;
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,
});
} catch (err) {
logger.error("An error occured:", err);
}
ephemeral: true
})
} 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
});
}
}

25
src/commands/confesspardon.ts
View file

@ -16,45 +16,34 @@
* 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);
}
}

8
src/commands/setup.ts
View file

@ -28,8 +28,6 @@ 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.")
@ -54,7 +52,6 @@ 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,
@ -131,10 +128,7 @@ 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);
}
}

33
src/storeman/client.ts
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,13 +117,7 @@ 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) {
@ -133,9 +127,7 @@ 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;
}
@ -146,10 +138,7 @@ 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) {
@ -164,10 +153,7 @@ 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;
@ -175,7 +161,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;
});
@ -222,8 +208,7 @@ 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;
@ -239,7 +224,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!;
});

2
src/utils/getRandomColor.ts
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;