Prettier
This commit is contained in:
parent
9da9926fac
commit
6f8435b699
|
@ -33,7 +33,7 @@ const logger = new Logger("(/) confess");
|
||||||
export const data = new SlashCommandBuilder()
|
export const data = new SlashCommandBuilder()
|
||||||
.setName("confess")
|
.setName("confess")
|
||||||
.setDescription("Send a confession")
|
.setDescription("Send a confession")
|
||||||
.addStringOption(option =>
|
.addStringOption((option) =>
|
||||||
option
|
option
|
||||||
.setName("message")
|
.setName("message")
|
||||||
.setRequired(true)
|
.setRequired(true)
|
||||||
|
@ -45,7 +45,7 @@ export async function execute(interaction: CommandInteraction) {
|
||||||
if (dt.isBanned(interaction.guild?.id!, interaction.user.id)) {
|
if (dt.isBanned(interaction.guild?.id!, interaction.user.id)) {
|
||||||
return interaction.reply({
|
return interaction.reply({
|
||||||
content: "You are banned from confessions in this server!",
|
content: "You are banned from confessions in this server!",
|
||||||
ephemeral: true
|
ephemeral: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,7 +57,6 @@ export async function execute(interaction: CommandInteraction) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const confessChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
|
const confessChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
|
||||||
.confessChannel;
|
.confessChannel;
|
||||||
const adminChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
|
const adminChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
|
||||||
|
@ -78,29 +77,34 @@ export async function execute(interaction: CommandInteraction) {
|
||||||
.setTitle(`Anonymous Confession \`${messageId}\``)
|
.setTitle(`Anonymous Confession \`${messageId}\``)
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
.setDescription(messageContent)
|
.setDescription(messageContent)
|
||||||
.addFields({
|
.addFields(
|
||||||
|
{
|
||||||
name: "Author",
|
name: "Author",
|
||||||
value: interaction.user.displayName
|
value: interaction.user.displayName,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Author ID",
|
name: "Author ID",
|
||||||
value: interaction.user.id
|
value: interaction.user.id,
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
const message = await (
|
const message = await (
|
||||||
BotClient.channels.cache.get(confessChannel!) as TextChannel
|
BotClient.channels.cache.get(confessChannel!) as TextChannel
|
||||||
)
|
).send({
|
||||||
.send({
|
embeds: [userConfessionEmbed],
|
||||||
embeds: [userConfessionEmbed]
|
|
||||||
});
|
});
|
||||||
|
|
||||||
await (BotClient.channels.cache.get(adminChannel!) as TextChannel)
|
await (BotClient.channels.cache.get(adminChannel!) as TextChannel).send({
|
||||||
.send({
|
embeds: [adminConfessionEmbed],
|
||||||
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({
|
return interaction.reply({
|
||||||
content: "Confession sent!",
|
content: "Confession sent!",
|
||||||
|
|
|
@ -16,7 +16,11 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 { dt } from "../main";
|
||||||
import Logger from "../utils/Logger";
|
import Logger from "../utils/Logger";
|
||||||
|
|
||||||
|
@ -25,11 +29,11 @@ const logger = new Logger("(/) confessban");
|
||||||
export const data = new SlashCommandBuilder()
|
export const data = new SlashCommandBuilder()
|
||||||
.setName("confessban")
|
.setName("confessban")
|
||||||
.setDescription("Ban a user from submitting confessions.")
|
.setDescription("Ban a user from submitting confessions.")
|
||||||
.addStringOption(option =>
|
.addStringOption((option) =>
|
||||||
option
|
option
|
||||||
.setName("id")
|
.setName("id")
|
||||||
.setDescription("The confession ID to ban")
|
.setDescription("The confession ID to ban")
|
||||||
.setRequired(true)
|
.setRequired(true),
|
||||||
)
|
)
|
||||||
.setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers);
|
.setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers);
|
||||||
|
|
||||||
|
@ -37,18 +41,18 @@ export async function execute(interaction: CommandInteraction) {
|
||||||
const result = dt.addBan(
|
const result = dt.addBan(
|
||||||
interaction.guild?.id!,
|
interaction.guild?.id!,
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
interaction.options.getString("id")
|
interaction.options.getString("id"),
|
||||||
);
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return result
|
return result
|
||||||
? interaction.reply({
|
? interaction.reply({
|
||||||
content: "User was banned.",
|
content: "User was banned.",
|
||||||
ephemeral: true
|
ephemeral: true,
|
||||||
})
|
})
|
||||||
: interaction.reply({
|
: interaction.reply({
|
||||||
content: "No confession with that ID was found.",
|
content: "No confession with that ID was found.",
|
||||||
ephemeral: true
|
ephemeral: true,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error("An error occured:", err);
|
logger.error("An error occured:", err);
|
||||||
|
|
|
@ -16,7 +16,12 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 { dt } from "../main";
|
||||||
import { BotClient } from "../bot";
|
import { BotClient } from "../bot";
|
||||||
import getRandomColor from "../utils/getRandomColor";
|
import getRandomColor from "../utils/getRandomColor";
|
||||||
|
@ -27,12 +32,9 @@ const logger = new Logger("(/) confessdel");
|
||||||
export const data = new SlashCommandBuilder()
|
export const data = new SlashCommandBuilder()
|
||||||
.setName("confessdel")
|
.setName("confessdel")
|
||||||
.setDescription("Deletes a confession")
|
.setDescription("Deletes a confession")
|
||||||
.addStringOption(option =>
|
.addStringOption((option) =>
|
||||||
option
|
option.setName("id").setDescription("The confession id").setRequired(true),
|
||||||
.setName("id")
|
);
|
||||||
.setDescription("The confession id")
|
|
||||||
.setRequired(true)
|
|
||||||
)
|
|
||||||
|
|
||||||
export async function execute(interaction: CommandInteraction) {
|
export async function execute(interaction: CommandInteraction) {
|
||||||
if (!dt.getGuildInfo(interaction.guild?.id!)) {
|
if (!dt.getGuildInfo(interaction.guild?.id!)) {
|
||||||
|
@ -49,33 +51,40 @@ export async function execute(interaction: CommandInteraction) {
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
try {
|
try {
|
||||||
const confession = dt.getConfession(interaction.guild?.id!, idVal)?.messageId;
|
const confession = dt.getConfession(
|
||||||
const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings.confessChannel!;
|
interaction.guild?.id!,
|
||||||
|
idVal,
|
||||||
|
)?.messageId;
|
||||||
|
const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings
|
||||||
|
.confessChannel!;
|
||||||
const emptyEmbed = new EmbedBuilder()
|
const emptyEmbed = new EmbedBuilder()
|
||||||
.setColor(getRandomColor())
|
.setColor(getRandomColor())
|
||||||
.setTitle("Confession Deleted")
|
.setTitle("Confession Deleted")
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
.setDescription("[Confession Deleted]");
|
.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({
|
e.edit({
|
||||||
embeds: [emptyEmbed]
|
embeds: [emptyEmbed],
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
dt.delConfesssion(interaction, idVal);
|
dt.delConfesssion(interaction, idVal);
|
||||||
|
|
||||||
return interaction.reply({
|
return interaction.reply({
|
||||||
content: "Confession removed.",
|
content: "Confession removed.",
|
||||||
ephemeral: true
|
ephemeral: true,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error("An error occured:", err);
|
logger.error("An error occured:", err);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return interaction.reply({
|
return interaction.reply({
|
||||||
content: "Either the confession wasn't found or you may not be allowed to remove it.",
|
content:
|
||||||
ephemeral: true
|
"Either the confession wasn't found or you may not be allowed to remove it.",
|
||||||
|
ephemeral: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,11 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 { dt } from "../main";
|
||||||
import Logger from "../utils/Logger";
|
import Logger from "../utils/Logger";
|
||||||
|
|
||||||
|
@ -25,30 +29,30 @@ const logger = new Logger("(/) confesspardon");
|
||||||
export const data = new SlashCommandBuilder()
|
export const data = new SlashCommandBuilder()
|
||||||
.setName("confesspardon")
|
.setName("confesspardon")
|
||||||
.setDescription("Unbans a user from confessions")
|
.setDescription("Unbans a user from confessions")
|
||||||
.addStringOption(option =>
|
.addStringOption((option) =>
|
||||||
option
|
option
|
||||||
.setName("id")
|
.setName("id")
|
||||||
.setDescription("The confession ID to unban")
|
.setDescription("The confession ID to unban")
|
||||||
.setRequired(true)
|
.setRequired(true),
|
||||||
)
|
)
|
||||||
.setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages)
|
.setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages);
|
||||||
|
|
||||||
export function execute(interaction: CommandInteraction) {
|
export function execute(interaction: CommandInteraction) {
|
||||||
const result = dt.removeBan(
|
const result = dt.removeBan(
|
||||||
interaction.guild?.id!,
|
interaction.guild?.id!,
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
interaction.options.getString("id")
|
interaction.options.getString("id"),
|
||||||
);
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return result
|
return result
|
||||||
? interaction.reply({
|
? interaction.reply({
|
||||||
content: "User was unbanned.",
|
content: "User was unbanned.",
|
||||||
ephemeral: true
|
ephemeral: true,
|
||||||
})
|
})
|
||||||
: interaction.reply({
|
: interaction.reply({
|
||||||
content: "No confession with that ID was found.",
|
content: "No confession with that ID was found.",
|
||||||
ephemeral: true
|
ephemeral: true,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error("An error occured:", err);
|
logger.error("An error occured:", err);
|
||||||
|
|
|
@ -131,7 +131,7 @@ export async function execute(interaction: CommandInteraction) {
|
||||||
interaction.followUp({
|
interaction.followUp({
|
||||||
content: "No channel selected. Try again.",
|
content: "No channel selected. Try again.",
|
||||||
ephemeral: true,
|
ephemeral: true,
|
||||||
components: []
|
components: [],
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
|
@ -38,14 +38,14 @@ export class StoreMan {
|
||||||
id: string,
|
id: string,
|
||||||
author: string,
|
author: string,
|
||||||
authorId: string,
|
authorId: string,
|
||||||
content: string
|
content: string,
|
||||||
): Confession {
|
): Confession {
|
||||||
return {
|
return {
|
||||||
id: id,
|
id: id,
|
||||||
messageId: message.id,
|
messageId: message.id,
|
||||||
author: author,
|
author: author,
|
||||||
authorId: authorId,
|
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.
|
// 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;
|
const guildId = message.guild?.id;
|
||||||
|
|
||||||
for (const guild of this.data) {
|
for (const guild of this.data) {
|
||||||
|
@ -127,7 +133,9 @@ export class StoreMan {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
guild.confessions.push(StoreMan.toConfession(message, id, author, authorId, content));
|
guild.confessions.push(
|
||||||
|
StoreMan.toConfession(message, id, author, authorId, content),
|
||||||
|
);
|
||||||
this.saveFile();
|
this.saveFile();
|
||||||
return true;
|
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) {
|
for (const guild of this.data) {
|
||||||
if (guild.id === guildId) {
|
if (guild.id === guildId) {
|
||||||
for (const confession of guild.confessions) {
|
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.
|
// 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 guildId = guild?.id;
|
||||||
const userId = user.id;
|
const userId = user.id;
|
||||||
|
|
||||||
|
@ -161,7 +175,7 @@ export class StoreMan {
|
||||||
if (guild.id === guildId) {
|
if (guild.id === guildId) {
|
||||||
for (const confession of guild.confessions) {
|
for (const confession of guild.confessions) {
|
||||||
if (confession.authorId === userId) {
|
if (confession.authorId === userId) {
|
||||||
guild.confessions = guild.confessions.filter(confession => {
|
guild.confessions = guild.confessions.filter((confession) => {
|
||||||
return confession.id !== confessionId;
|
return confession.id !== confessionId;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -208,7 +222,8 @@ export class StoreMan {
|
||||||
if (guild.id === guildId) {
|
if (guild.id === guildId) {
|
||||||
if (confession) {
|
if (confession) {
|
||||||
// Only add the user to the ban list if they aren't banned already
|
// 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();
|
this.saveFile();
|
||||||
return true;
|
return true;
|
||||||
|
@ -224,7 +239,7 @@ export class StoreMan {
|
||||||
for (const guild of this.data) {
|
for (const guild of this.data) {
|
||||||
if (guild.id === guildId) {
|
if (guild.id === guildId) {
|
||||||
if (this.getConfession(guildId, confessionId)) {
|
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!;
|
return ban !== this.getConfession(guildId, confessionId)?.authorId!;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,6 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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;
|
export default getRandomColor;
|
||||||
|
|
Loading…
Reference in a new issue