Pinea
/
Nucleus
mirror of https://github.com/clickscodes/nucleus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nucleus stats done / premium started

Browse Source
pull/11/head
TheCodedProf 3 years ago
parent 9bc8475c08
commit 267563aa1a
32 changed files with 196 additions and 138 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -16,4 +16,4 @@ src/utils/temp/*.jpeg
src/utils/temp/*.jpg
ClicksMigratingProblems/oldData/
ClicksMigratingProblems/oldData copy/
ClicksMigratingProblems/oldData copy/

50
src/Unfinished/categorisationTest.ts → src/Unfinished/categorizationTest.ts
Unescape View File

@ -1,28 +1,30 @@
import { LoadingEmbed } from "../utils/defaults.js";
import { CommandInteraction, GuildChannel, ActionRowBuilder, ButtonBuilder, SelectMenuBuilder, ButtonStyle } from "discord.js";
import { CommandInteraction, GuildChannel, ActionRowBuilder, ButtonBuilder, ButtonStyle, ChannelType, StringSelectMenuBuilder, APIMessageComponentEmoji } from "discord.js";
import { SlashCommandBuilder } from "@discordjs/builders";
import EmojiEmbed from "../utils/generateEmojiEmbed.js";
import client from "../utils/client.js";
import addPlural from "../utils/plurals.js";
import getEmojiByName from "../utils/getEmojiByName.js";
const command = new SlashCommandBuilder().setName("categorise").setDescription("Categorises your servers channels");
const command = new SlashCommandBuilder().setName("categorize").setDescription("Categorizes your servers channels");
const callback = async (interaction: CommandInteraction): Promise<unknown> => {
const channels = interaction.guild.channels.cache.filter((c) => c.type !== "GUILD_CATEGORY");
const categorised = {};
const channels = interaction.guild!.channels.cache.filter((c) => c.type !== ChannelType.GuildCategory);
const categorized = {};
await interaction.reply({ embeds: LoadingEmbed, ephemeral: true });
const predicted = {};
const types = {
general: ["general", "muted", "main", "topic", "discuss"],
important: ["rule", "announcement", "alert", "info"],
general: ["general", "main", "topic", "discuss"],
commands: ["bot", "command", "music"],
images: ["pic", "selfies", "image"],
nsfw: ["porn", "nsfw", "sex"],
links: ["links"],
advertising: ["ads", "advert", "server", "partner"],
staff: ["staff", "mod", "admin"],
spam: ["spam"],
other: ["random"]
images: ["pic", "selfies", "image", "gallery", "meme", "media"],
nsfw: ["porn", "nsfw", "sex", "lewd", "fetish"],
links: ["link"],
advertising: ["ads", "advert", "partner", "bump"],
staff: ["staff", "mod", "admin", "helper", "train"],
spam: ["spam", "count"],
logs: ["log"],
other: ["random", "starboard"],
};
for (const c of channels.values()) {
for (const type in types) {
@ -38,14 +40,14 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
for (const c of channels) {
// convert channel to a channel if its a string
let channel: string | GuildChannel;
if (typeof c === "string") channel = interaction.guild.channels.cache.get(channel as string).id;
if (typeof c === "string") channel = interaction.guild!.channels.cache.get(c as string)!.id;
else channel = (c[0] as unknown as GuildChannel).id;
console.log(channel);
if (!predicted[channel]) predicted[channel] = [];
m = await interaction.editReply({
embeds: [
new EmojiEmbed()
.setTitle("Categorise")
.setTitle("Categorize")
.setDescription(
`Select all types that apply to <#${channel}>.\n\n` +
`${addPlural(predicted[channel].length, "Suggestion")}: ${predicted[channel].join(", ")}`
@ -54,8 +56,8 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
.setStatus("Success")
],
components: [
new ActionRowBuilder().addComponents([
new SelectMenuBuilder()
new ActionRowBuilder<StringSelectMenuBuilder>().addComponents([
new StringSelectMenuBuilder()
.setCustomId("selected")
.setMaxValues(Object.keys(types).length)
.setMinValues(1)
@ -67,18 +69,18 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
}))
)
]),
new ActionRowBuilder().addComponents([
new ActionRowBuilder<ButtonBuilder>().addComponents([
new ButtonBuilder()
.setLabel("Accept Suggestion")
.setCustomId("accept")
.setStyle(ButtonStyle.Success)
.setDisabled(predicted[channel].length === 0)
.setEmoji(client.emojis.cache.get(getEmojiByName("ICONS.TICK", "id"))),
.setEmoji(client.emojis.cache.get(getEmojiByName("ICONS.TICK", "id")) as APIMessageComponentEmoji),
new ButtonBuilder()
.setLabel('Use "Other"')
.setCustomId("reject")
.setStyle(ButtonStyle.Secondary)
.setEmoji(client.emojis.cache.get(getEmojiByName("ICONS.CROSS", "id")))
.setEmoji(client.emojis.cache.get(getEmojiByName("ICONS.CROSS", "id")) as APIMessageComponentEmoji)
])
]
});
@ -86,13 +88,13 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id}
});
} catch (e) {
return await interaction.editReply({
embeds: [
new EmojiEmbed()
.setTitle("Categorise")
.setTitle("Categorize")
.setEmoji("CHANNEL.CATEGORY.DELETE")
.setStatus("Danger")
.setDescription(
@ -105,7 +107,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
]
});
}
i.deferUpdate();
await i.deferUpdate();
let selected;
if (i.customId === "select") {
selected = i.values;
@ -116,9 +118,9 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
if (i.customId === "reject") {
selected = ["other"];
}
categorised[channel] = selected;
categorized[channel] = selected;
}
console.log(categorised);
console.log(categorized);
};
const check = () => {

4
src/actions/roleMenu.ts
Unescape View File

@ -124,7 +124,7 @@ export async function callback(interaction: CommandInteraction | ButtonInteracti
try {
component = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id}
});
} catch (e) {
return;
@ -199,7 +199,7 @@ export async function callback(interaction: CommandInteraction | ButtonInteracti
try {
component = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id}
});
} catch (e) {
return;

2
src/actions/tickets/create.ts
Unescape View File

@ -106,7 +106,7 @@ export default async function (interaction: CommandInteraction | ButtonInteracti
try {
component = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
return;

9
src/commands/mod/about.ts
Unescape View File

@ -10,7 +10,6 @@ import Discord, {
MessageComponentInteraction,
ModalSubmitInteraction,
ButtonStyle,
StringSelectMenuInteraction,
TextInputStyle,
APIMessageComponentEmoji,
} from "discord.js";
@ -253,7 +252,7 @@ async function showHistory(member: Discord.GuildMember, interaction: CommandInte
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
interaction.editReply({
@ -269,7 +268,7 @@ async function showHistory(member: Discord.GuildMember, interaction: CommandInte
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if (i.customId === "filter" && i.isStringSelectMenu()) {
filteredTypes = i.values;
pageIndex = null;
@ -359,7 +358,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
@ -423,7 +422,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
continue;
}
} else if (i.customId === "history") {
i.deferUpdate();
await i.deferUpdate();
if (!(await showHistory(member, interaction))) return;
}
}

2
src/commands/mod/mute.ts
Unescape View File

@ -103,7 +103,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
let component;
try {
component = await m.awaitMessageComponent({
filter: (m) => m.user.id === interaction.user.id,
filter: (i) => {return i.user.id === interaction.user.id && i.id === m.id},
time: 300000
});
} catch {

6
src/commands/mod/purge.ts
Unescape View File

@ -94,7 +94,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
let component;
try {
component = m.awaitMessageComponent({
filter: (m) => m.user.id === interaction.user.id && m.channel!.id === interaction.channel!.id,
filter: (i) => i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.id === m.id,
time: 300000
});
} catch (e) {
@ -188,7 +188,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
let component;
try {
component = await m.awaitMessageComponent({
filter: (m) => m.user.id === interaction.user.id && m.channel!.id === interaction.channel!.id,
filter: (i) => i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.id === m.id,
time: 300000
});
} catch {
@ -358,7 +358,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
let component;
try {
component = await m.awaitMessageComponent({
filter: (m) => m.user.id === interaction.user.id && m.channel!.id === interaction.channel!.id,
filter: (i) => i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.id === m.id,
time: 300000
});
} catch {

4
src/commands/mod/viewas.ts
Unescape View File

@ -157,12 +157,12 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
});
let i;
try {
i = await m.awaitMessageComponent({filter: (i) => i.user.id === interaction.user.id, time: 30000});
i = await m.awaitMessageComponent({filter: (i) => i.user.id === interaction.user.id && i.message.id === m.id, time: 30000});
} catch (e) {
closed = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if (i.customId === "back") page--;
else if (i.customId === "right") page++;
else if (i.customId === "category" && i.isStringSelectMenu()) page = parseInt(i.values[0]!);

2
src/commands/mod/warn.ts
Unescape View File

@ -186,7 +186,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
let component;
try {
component = await m.awaitMessageComponent({
filter: (m) => m.user.id === interaction.user.id && m.channel!.id === interaction.channel!.id,
filter: (i) => i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.id === m.id,
time: 300000
});
} catch (e) {

69
src/commands/nucleus/premium.ts
Unescape View File

@ -1,26 +1,75 @@
import type { CommandInteraction } from "discord.js";
import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction } from "discord.js";
import type { SlashCommandSubcommandBuilder } from "@discordjs/builders";
import EmojiEmbed from "../../utils/generateEmojiEmbed.js";
import client from "../../utils/client.js";
import { LoadingEmbed } from "../../utils/defaults.js";
const command = (builder: SlashCommandSubcommandBuilder) =>
builder.setName("premium").setDescription("Information about Nucleus Premium");
const callback = async (interaction: CommandInteraction): Promise<void> => {
interaction.reply({
embeds: [
await interaction.reply({embeds: LoadingEmbed, ephemeral: true})
const member = await (await interaction.client.guilds.fetch("684492926528651336")).members.fetch(interaction.user.id)
const firstDescription = "\n\nPremium allows your server to get access to extra features, for a fixed price per month.\nThis includes:\n" +
"- Attachment logs - Stores attachments so they can be viewed after a message is deleted.\n" +
"- Ticket Transcripts - Gives a link to view the history of a ticket after it has been closed.\n"
if(!member) {
interaction.editReply({ embeds: [
new EmojiEmbed()
.setTitle("Premium")
.setDescription(
"*Nucleus Premium is currently not available.*\n\n" +
"Premium allows your server to get access to extra features, for a fixed price per month.\nThis includes:\n" +
"- Attachment logs - Stores attachments so they can be viewed after a message is deleted.\n" +
"- Ticket Transcripts - Gives a link to view the history of a ticket after it has been closed.\n"
`*You are not currently in the Clicks Server. To gain access to premium please join.*` + firstDescription
)
.setEmoji("NUCLEUS.LOGO")
.setStatus("Danger")
],
ephemeral: true
});
], components: [new ActionRowBuilder<ButtonBuilder>().addComponents(new ButtonBuilder().setStyle(ButtonStyle.Link).setLabel("Join").setURL("https://discord.gg/bPaNnxe"))] });
return;
}
const dbMember = await client.database.premium.fetchTotal(interaction.user.id)
let premium;
let count = 0;
if (member.roles.cache.has("1066468879309750313")) {
premium = `You have Infinite Premium! You have been gifted this by the developers as a thank you. You can give premium to any and all servers you are in.`;
count = 200;
} else if (member.roles.cache.has("1066465491713003520")) {
premium = `You have Premium tier 1! You can give premium to ${1 - dbMember}.`;
count = 1;
} else if (member.roles.cache.has("1066439526496604194")) {
premium = `You have Premium tier 2! You can give premium to ${3 - dbMember}.`;
count = 3;
} else if (member.roles.cache.has("1066464134322978912")) {
premium = `You have Premium Mod! You already give premium to all servers you have a "manage" permission in.`
count = 3;
}
let closed = false;
do {
interaction.editReply({
embeds: [
new EmojiEmbed()
.setTitle("Premium")
.setDescription(
premium + firstDescription
)
.setEmoji("NUCLEUS.LOGO")
.setStatus("Danger")
],
components: [
new ActionRowBuilder<ButtonBuilder>()
.addComponents(
new ButtonBuilder()
.setStyle(ButtonStyle.Primary)
.setLabel("Activate Premium here")
.setCustomId("premiumActivate")
.setDisabled(count <= 0)
)
]
});
const filter = (i: any) => i.customId === "premiumActivate" && i.user.id === interaction.user.id;
const collector = interaction.channel?.awaitMessageComponent({ filter, time: 60000 });
} while (closed);
};
const check = () => {

7
src/commands/privacy.ts
Unescape View File

@ -150,14 +150,14 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
nextFooter = null;
i.deferUpdate();
await i.deferUpdate();
if (i.customId === "left") {
if (page > 0) page--;
selectPaneOpen = false;
@ -180,11 +180,12 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
.setColor("Danger")
.send(true);
if (confirmation.cancelled) {
break;
continue;
}
if (confirmation.success) {
client.database.guilds.delete(interaction.guild!.id);
client.database.history.delete(interaction.guild!.id);
client.database.notes.delete(interaction.guild!.id);
nextFooter = "All data cleared";
continue;
} else {

8
src/commands/settings/commands.ts
Unescape View File

@ -1,5 +1,5 @@
import { LoadingEmbed } from "../../utils/defaults.js";
import Discord, { CommandInteraction, ActionRowBuilder, ButtonBuilder, Role, ButtonStyle, ButtonComponent, TextInputBuilder } from "discord.js";
import Discord, { CommandInteraction, ActionRowBuilder, ButtonBuilder, Role, ButtonStyle, ButtonComponent, TextInputBuilder, Message } from "discord.js";
import EmojiEmbed from "../../utils/generateEmojiEmbed.js";
import getEmojiByName from "../../utils/getEmojiByName.js";
import type { SlashCommandSubcommandBuilder } from "@discordjs/builders";
@ -20,7 +20,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
ephemeral: true,
fetchReply: true
});
let m;
let m: Message;
let clicked = "";
if (interaction.options.get("role")) {
const confirmation = await new confirmationMessage(interaction)
@ -110,7 +110,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
@ -119,7 +119,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
type modIDs = "mute" | "kick" | "ban" | "softban" | "warn" | "role";
let chosen = moderation[i.customId as modIDs];
if ((i.component as ButtonComponent).customId === "clearMuteRole") {
i.deferUpdate();
await i.deferUpdate();
if (clicked === "clearMuteRole") {
await client.database.guilds.write(interaction.guild!.id, {
"moderation.mute.role": null

4
src/commands/settings/logs/attachment.ts
Unescape View File

@ -150,13 +150,13 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if ((i.component as unknown as ButtonInteraction).customId === "clear") {
clicks ++;
if (clicks === 2) {

4
src/commands/settings/logs/channel.ts
Unescape View File

@ -143,13 +143,13 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
}) as ButtonInteraction;
} catch (e) {
timedOut = true;
}
i = i!
i.deferUpdate();
await i.deferUpdate();
if ((i.component as ButtonComponent).customId === "clear") {
clicks ++;
if (clicks === 2) {

6
src/commands/settings/logs/events.ts
Unescape View File

@ -1,5 +1,5 @@
import { LoadingEmbed } from "../../../utils/defaults.js";
import Discord, { CommandInteraction, Message, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, EmbedBuilder, StringSelectMenuInteraction } from "discord.js";
import Discord, { CommandInteraction, Message, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, EmbedBuilder } from "discord.js";
import { SlashCommandSubcommandBuilder, StringSelectMenuOptionBuilder } from "@discordjs/builders";
import EmojiEmbed from "../../../utils/generateEmojiEmbed.js";
import client from "../../../utils/client.js";
@ -76,13 +76,13 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if (i.isStringSelectMenu() && i.customId === "logs") {
const selected = i.values;
const newLogs = toHexInteger(selected.map((e: string) => Object.keys(logs)[parseInt(e)]!));

4
src/commands/settings/logs/staff.ts
Unescape View File

@ -147,13 +147,13 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if ((i.component as ButtonComponent).customId === "clear") {
clicks ++;
if (clicks === 2) {

10
src/commands/settings/oldStats.ts
Unescape View File

@ -139,7 +139,7 @@ const callback = async (interaction: CommandInteraction) => {
});
let i: MessageComponentInteraction;
try {
i = await m.awaitMessageComponent({ filter: (i) => i.user.id === interaction.user.id, time: 30000 });
i = await m.awaitMessageComponent({ filter: (i) => i.user.id === interaction.user.id && i.message.id === m.id, time: 30000 });
} catch (e) {
closed = true;
continue;
@ -148,7 +148,7 @@ const callback = async (interaction: CommandInteraction) => {
switch(i.customId) {
case "page":
page = Object.keys(stats).indexOf(i.values[0]!);
i.deferUpdate();
await i.deferUpdate();
break;
case "action":
if(!changes[currentID]) changes[currentID] = {};
@ -243,17 +243,17 @@ const callback = async (interaction: CommandInteraction) => {
break;
case "delete":
changes[currentID] = {};
i.deferUpdate();
await i.deferUpdate();
break;
case "toggleEnabled":
changes[currentID]!.enabled = !stats[currentID]!.enabled;
i.deferUpdate();
await i.deferUpdate();
break;
}
break;
}
} else if (i.isButton()) {
i.deferUpdate();
await i.deferUpdate();
switch(i.customId) {
case "back":
page--;

48
src/commands/settings/stats.ts
Unescape View File

@ -73,23 +73,7 @@ const showModal = async (interaction: MessageComponentInteraction, current: { en
type ObjectSchema = Record<string, {name: string, enabled: boolean}>
/*
let out: Discord.ModalSubmitInteraction | null = null;
try {
out = await modalInteractionCollector(
m,
(m) => m.channel!.id === interaction.channel!.id,
(_) => true
) as Discord.ModalSubmitInteraction | null;
} catch (e) {
continue;
}
if (!out) continue
out = out!;
if (!out.fields) continue;
if (out.isButton()) continue;
const name = out.fields.getTextInputValue("text")
*/
const addStatsChannel = async (interaction: CommandInteraction, m: Message, currentObject: ObjectSchema): Promise<ObjectSchema> => {
let closed = false;
@ -99,7 +83,7 @@ const addStatsChannel = async (interaction: CommandInteraction, m: Message, curr
let newChannelName: string = "{memberCount:all}-members";
let newChannelEnabled: boolean = true;
do {
await interaction.editReply({
m = await interaction.editReply({
embeds: [new EmojiEmbed()
.setTitle("Stats Channel")
.setDescription(
@ -114,6 +98,7 @@ const addStatsChannel = async (interaction: CommandInteraction, m: Message, curr
new ActionRowBuilder<ChannelSelectMenuBuilder>().addComponents(
new ChannelSelectMenuBuilder()
.setCustomId("channel")
.setPlaceholder("Select a channel to use")
),
new ActionRowBuilder<ButtonBuilder>().addComponents(
new ButtonBuilder()
@ -141,7 +126,9 @@ const addStatsChannel = async (interaction: CommandInteraction, m: Message, curr
});
let i: ButtonInteraction | ChannelSelectMenuInteraction;
try {
i = await m.awaitMessageComponent({ time: 300000, filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }}) as ButtonInteraction | ChannelSelectMenuInteraction;
i = await m.awaitMessageComponent({ time: 300000, filter: (i) => {
return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id;
}}) as ButtonInteraction | ChannelSelectMenuInteraction;
} catch (e) {
closed = true;
cancelled = true;
@ -150,11 +137,11 @@ const addStatsChannel = async (interaction: CommandInteraction, m: Message, curr
if (i.isButton()) {
switch (i.customId) {
case "back":
if(!i.deferred) await i.deferUpdate();
await i.deferUpdate();
closed = true;
break;
case "save":
if(!i.deferred) await i.deferUpdate(); //I'm lost...
await i.deferUpdate();
if (newChannel) {
currentObject[newChannel] = {
name: newChannelName,
@ -185,8 +172,8 @@ const addStatsChannel = async (interaction: CommandInteraction, m: Message, curr
const out = await modalInteractionCollector(
m,
(m) => m.channel!.id === interaction.channel!.id,
(_) => true
(m) => m.channel!.id === interaction.channel!.id && m.user!.id === interaction.user!.id,
(i) => i.channel!.id === interaction.channel!.id && i.user!.id === interaction.user!.id && i.message!.id === m.id
) as Discord.ModalSubmitInteraction | null;
if (!out) continue;
if (!out.fields) continue;
@ -194,12 +181,12 @@ const addStatsChannel = async (interaction: CommandInteraction, m: Message, curr
newChannelName = out.fields.getTextInputValue("text");
break;
case "toggleEnabled":
if(!i.deferred) await i.deferUpdate();
await i.deferUpdate();
newChannelEnabled = !newChannelEnabled;
break;
}
} else {
if(!i.deferred) await i.deferUpdate();
await i.deferUpdate();
if (i.customId === "channel") {
newChannel = i.values[0];
}
@ -207,7 +194,7 @@ const addStatsChannel = async (interaction: CommandInteraction, m: Message, curr
} while (!closed)
if (cancelled) return originalObject;
if (!(newChannel && newChannelName && newChannelEnabled)) return originalObject;
return currentObject; // check 157
return currentObject;
}
const callback = async (interaction: CommandInteraction) => {
if (!interaction.guild) return;
@ -322,6 +309,7 @@ const callback = async (interaction: CommandInteraction) => {
if(i.isStringSelectMenu()) {
switch(i.customId) {
case "page":
await i.deferUpdate();
page = Object.keys(currentObject).indexOf(i.values[0]!);
break;
case "action":
@ -364,14 +352,15 @@ const callback = async (interaction: CommandInteraction) => {
break;
}
case "toggleEnabled": {
i.deferUpdate();
await i.deferUpdate();
currentObject[Object.keys(currentObject)[page]!]!.enabled = !currentObject[Object.keys(currentObject)[page]!]!.enabled;
modified = true;
break;
}
case "delete": {
i.deferUpdate();
await i.deferUpdate();
delete currentObject[Object.keys(currentObject)[page]!];
page = Math.min(page, Object.keys(currentObject).length - 1);
modified = true;
break;
}
@ -379,7 +368,7 @@ const callback = async (interaction: CommandInteraction) => {
break;
}
} else {
i.deferUpdate();
await i.deferUpdate();
switch(i.customId) {
case "back":
page--;
@ -389,6 +378,7 @@ const callback = async (interaction: CommandInteraction) => {
break;
case "add":
currentObject = await addStatsChannel(interaction, m, currentObject);
page = Object.keys(currentObject).length - 1;
break;
case "save":
client.database.guilds.write(interaction.guild.id, {stats: currentObject});

22
src/commands/settings/tickets.ts
Unescape View File

@ -279,13 +279,13 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if ((i.component as ButtonComponent).customId === "clearCategory") {
if (lastClicked === "cat") {
lastClicked = "";
@ -382,14 +382,14 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
innerTimedOut = true;
continue;
}
if (i.isStringSelectMenu() && i.customId === "template") {
i.deferUpdate();
await i.deferUpdate();
await interaction.channel!.send({
embeds: [
new EmojiEmbed()
@ -413,7 +413,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
templateSelected = true;
continue;
} else if ((i.component as ButtonComponent).customId === "blank") {
i.deferUpdate();
await i.deferUpdate();
await interaction.channel!.send({
components: [
new ActionRowBuilder<ButtonBuilder>().addComponents([
@ -635,21 +635,21 @@ async function manageTypes(interaction: CommandInteraction, data: GuildConfig["t
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
if (i.isStringSelectMenu() && i.customId === "types") {
i.deferUpdate();
await i.deferUpdate();
const types = toHexInteger(i.values, ticketTypes);
await client.database.guilds.write(interaction.guild!.id, {
"tickets.types": types
});
data.types = types;
} else if (i.isStringSelectMenu() && i.customId === "removeTypes") {
i.deferUpdate();
await i.deferUpdate();
const types = i.values;
let customTypes = data.customTypes;
if (customTypes) {
@ -723,15 +723,15 @@ async function manageTypes(interaction: CommandInteraction, data: GuildConfig["t
data.customTypes.push(toAdd);
}
} else if ((i.component as ButtonComponent).customId === "switchToDefault") {
i.deferUpdate();
await i.deferUpdate();
await client.database.guilds.write(interaction.guild!.id, { "tickets.useCustom": false }, []);
data.useCustom = false;
} else if ((i.component as ButtonComponent).customId === "switchToCustom") {
i.deferUpdate();
await i.deferUpdate();
await client.database.guilds.write(interaction.guild!.id, { "tickets.useCustom": true }, []);
data.useCustom = true;
} else {
i.deferUpdate();
await i.deferUpdate();
backPressed = true;
}
}

12
src/commands/settings/verify.ts
Unescape View File

@ -160,13 +160,13 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if ((i.component as ButtonComponent).customId === "clear") {
clicks ++;
if (clicks === 2) {
@ -249,14 +249,14 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
innerTimedOut = true;
continue;
}
if (i.isStringSelectMenu() && i.customId === "template") {
i.deferUpdate();
await i.deferUpdate();
await interaction.channel!.send({
embeds: [
new EmojiEmbed()
@ -280,7 +280,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
templateSelected = true;
continue;
} else if ((i.component as ButtonComponent).customId === "blank") {
i.deferUpdate();
await i.deferUpdate();
await interaction.channel!.send({
components: [
new ActionRowBuilder<ButtonBuilder>().addComponents([
@ -375,7 +375,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
}
}
} else {
i.deferUpdate();
await i.deferUpdate();
break;
}
}

4
src/commands/settings/welcome.ts
Unescape View File

@ -245,13 +245,13 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if (i.customId == "clear-message") {
if (lastClicked == "clear-message") {
await client.database.guilds.write(interaction.guild!.id, {

4
src/commands/tags/list.ts
Unescape View File

@ -139,13 +139,13 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if ((i.component as ButtonComponent).customId === "left") {
if (page > 0) page--;
selectPaneOpen = false;

4
src/commands/user/about.ts
Unescape View File

@ -258,13 +258,13 @@ async function userAbout(guild: Discord.Guild, member: Discord.GuildMember, inte
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if (i.customId === "left") {
if (page > 0) page--;
selectPaneOpen = false;

2
src/commands/user/track.ts
Unescape View File

@ -169,7 +169,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
try {
component = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
} catch (e) {
timedOut = true;

4
src/context/messages/purgeto.ts
Unescape View File

@ -13,7 +13,7 @@ const command = new ContextMenuCommandBuilder()
async function waitForButton(m: Discord.Message, member: Discord.GuildMember): Promise<boolean> {
let component;
try {
component = m.awaitMessageComponent({ time: 200000, filter: (i) => i.user.id === member.id && i.channel!.id === m.channel.id });
component = m.awaitMessageComponent({ time: 200000, filter: (i) => i.user.id === member.id && i.channel!.id === m.channel.id && i.message.id === m.id });
} catch (e) {
return false;
}
@ -211,7 +211,7 @@ const callback = async (interaction: MessageContextMenuCommandInteraction) => {
let component;
try {
component = await m.awaitMessageComponent({
filter: (m) => m.user.id === interaction.user.id && m.channel!.id === interaction.channel!.id,
filter: (i) => i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.id === m.id,
time: 300000
});
} catch {

2
src/events/messageEdit.ts
Unescape View File

@ -18,7 +18,7 @@ export async function callback(client: NucleusClient, oldMessage: Message, newMe
if (config) {
attachmentJump = ` [[View attachments]](${config})`;
}
if (newContent === oldContent && newMessage.attachments.size === oldMessage.attachments.size) {
if (newMessage.crosspostable !== oldMessage.crosspostable) {
if (!replyTo) {
const data = {
meta: {

3
src/events/roleUpdate.ts
Unescape View File

@ -8,7 +8,8 @@ export async function callback(client: NucleusClient, oldRole: Role, newRole: Ro
const { getAuditLog, log, NucleusColors, entry, renderDelta, renderUser, renderRole } = client.logger;
const auditLog = (await getAuditLog(newRole.guild as Guild, AuditLogEvent.RoleUpdate))
.filter((entry: GuildAuditLogsEntry) => (entry.target as Role)!.id === newRole.id)[0]!;
.filter((entry: GuildAuditLogsEntry) => (entry.target as Role)!.id === newRole.id)[0];
if (!auditLog) return;
if (auditLog.executor!.id === client.user!.id) return;
const changes: Record<string, ReturnType<typeof entry>> = {

4
src/premium/createTranscript.ts
Unescape View File

@ -115,9 +115,9 @@ export default async function (interaction: CommandInteraction | MessageComponen
try {
i = await m.awaitMessageComponent({
time: 300000,
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id }
filter: (i) => { return i.user.id === interaction.user.id && i.channel!.id === interaction.channel!.id && i.message.id === m.id }
});
i.deferUpdate();
await i.deferUpdate();
} catch {
return;
}

2
src/reflex/guide.ts
Unescape View File

@ -273,7 +273,7 @@ export default async (guild: Guild, interaction?: CommandInteraction) => {
timedOut = true;
continue;
}
i.deferUpdate();
await i.deferUpdate();
if (!("customId" in i.component)) {
continue;
} else if (i.component.customId === "left") {

4
src/utils/confirmationMessage.ts
Unescape View File

@ -183,7 +183,7 @@ class confirmationMessage {
let component;
try {
component = await m.awaitMessageComponent({
filter: (m) => m.user.id === this.interaction.user.id && m.channel!.id === this.interaction.channel!.id,
filter: (i) => i.user.id === this.interaction.user.id && i.channel!.id === this.interaction.channel!.id && i.id === m.id,
time: 300000
});
} catch (e) {
@ -287,7 +287,7 @@ class confirmationMessage {
await this.interaction.editReply({
embeds: [new EmojiEmbed()
.setTitle(this.title)
.setDescription(this.failedMessage ?? "")
.setDescription(this.failedMessage ?? "*Message timed out*")
.setStatus(this.failedStatus ?? "Danger")
.setEmoji(this.failedEmoji ?? this.redEmoji ?? this.emoji)
], components: []

18
src/utils/database.ts
Unescape View File

@ -67,7 +67,6 @@ export class Guilds {
value: any,
innerKey?: string | null
) {
console.log(Array.isArray(value));
if (innerKey) {
await this.guilds.updateOne(
{ id: guild },
@ -191,6 +190,10 @@ export class ModNotes {
const entry = await this.modNotes.findOne({ guild: guild, user: user });
return entry?.note ?? null;
}
async delete(guild: string) {
await this.modNotes.deleteMany({ guild: guild });
}
}
export class Premium {
@ -204,7 +207,18 @@ export class Premium {
const entry = await this.premium.findOne({
appliesTo: { $in: [guild] }
});
return entry !== null;
if (!entry) return false;
return entry.expires.valueOf() > Date.now();
}
async fetchTotal(user: string): Promise<number> {
const entry = await this.premium.findOne({ user: user });
if (!entry) return 0;
return entry.appliesTo.length;
}
setPremium(user: string, guild: string) {
return this.premium.updateOne({ user: user }, { $addToSet: { appliesTo: guild } }, { upsert: true });
}
}

8
src/utils/dualCollector.ts
Unescape View File

@ -60,15 +60,17 @@ export async function modalInteractionCollector(
})
.on("collect", async (i: ButtonInteraction) => {
mod.stop();
if (!i.deferred) await i.deferUpdate();
int.stop();
await i.deferUpdate();
resolve(i);
});
const mod = new InteractionCollector(client as Client, {
filter: (i: Interaction) => modalFilter(i),
filter: (i: Interaction) => modalFilter(i) && i.isModalSubmit(),
time: 300000
}).on("collect", async (i: ModalSubmitInteraction) => {
int.stop();
if (!i.deferred) await i.deferUpdate();
mod.stop();
await i.deferUpdate();
resolve(i);
});
});

Write Preview
Loading…
Cancel
Save