Skip to content

Merge formatting into main #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

Merge formatting into main #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
166d474
feat: question now prevents repeats
mezotv Jun 4, 2025
cafd9d5
fix: better qotd logging
mezotv Jun 5, 2025
27299a6
Revert "feat: question now prevents repeats"
mezotv Jun 5, 2025
4eb667a
Reapply "feat: question now prevents repeats"
mezotv Jun 5, 2025
edddd76
fix: change selectedModel variable to const for better immutability
mezotv Jun 5, 2025
82d8815
Small fix until we fully remake DMS (I hope soon)
forgetfulskybro Jun 24, 2025
4ad98a8
Revert my last commit :/
forgetfulskybro Jun 24, 2025
d20f660
fix(custom import): made the function actually work
forgetfulskybro Jul 3, 2025
3ee40a2
fix(custom import): make it not double text
forgetfulskybro Jul 3, 2025
5d8c95e
feat(welcome description): made it allow longer strings & fix it's er…
forgetfulskybro Aug 10, 2025
360eb7c
add: Custom Message Permission role
forgetfulskybro Oct 10, 2025
c426764
fix: custom permissions
forgetfulskybro Oct 10, 2025
a658f33
Update info command to look a little better
forgetfulskybro Oct 11, 2025
1827962
Made info better
forgetfulskybro Oct 11, 2025
c5937de
Made info better
forgetfulskybro Oct 11, 2025
38addbe
Okay last info update
forgetfulskybro Oct 11, 2025
e318d14
Okay THIS is the last update :)
forgetfulskybro Oct 11, 2025
9bf9574
Testing new DMS
forgetfulskybro Oct 11, 2025
671db7e
Turn DMS back on
forgetfulskybro Oct 11, 2025
6b19f31
Turning DMS off for testing
forgetfulskybro Oct 11, 2025
535143c
add: dmsError for fixing Daily Message errors
forgetfulskybro Oct 12, 2025
03da488
dmsError not sending ig
forgetfulskybro Oct 12, 2025
e74c1e6
Fix translations
forgetfulskybro Oct 13, 2025
94fcc9f
Testing dmsError
forgetfulskybro Oct 13, 2025
0b02892
Okay I figured out why dmsError didn't work for me :)
forgetfulskybro Oct 13, 2025
291c7bf
fix: make WY not respond to bots =)
forgetfulskybro Oct 23, 2025
cbbe791
Turn off messageCreate for now
forgetfulskybro Oct 23, 2025
7ef3c4d
chore(style): format files
mezotv Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 39 additions & 36 deletions src/buttons/dailyTasks/autoPin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,32 @@ const button: Button = {
const check = guildDb.autoPin;
const autoPin = new EmbedBuilder()
.setTitle(
client.translation.get(guildDb?.language, "Settings.embed.dailyTitle")
client.translation.get(guildDb?.language, "Settings.embed.dailyTitle"),
)
.setDescription(
`${client.translation.get(
guildDb?.language,
"Settings.embed.dailyChannel"
"Settings.embed.dailyChannel",
)}: ${guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"}\n` +
`${client.translation.get(
guildDb?.language,
"Settings.embed.dailyRole"
"Settings.embed.dailyRole",
)}: ${guildDb.dailyRole ? `<@&${guildDb.dailyRole}>` : ":x:"}\n` +
`${client.translation.get(guildDb?.language, "Settings.embed.dailyType")}: ${guildDb?.customTypes}\n` +
`${client.translation.get(guildDb?.language, "Settings.embed.dailyTimezone")}: ${guildDb.dailyTimezone}\n` +
`${client.translation.get(guildDb?.language, "Settings.embed.dailyInterval")}: ${guildDb.dailyInterval}\n` +
`${client.translation.get(
guildDb?.language,
"Settings.embed.dailyThread"
"Settings.embed.dailyThread",
)}: ${guildDb.dailyThread ? ":white_check_mark:" : ":x:"}\n` +
`${client.translation.get(
guildDb?.language,
"Settings.embed.autoPin"
"Settings.embed.autoPin",
)}: ${check ? ":x:" : ":white_check_mark:"}\n` +
`${client.translation.get(
guildDb?.language,
"Settings.embed.dailyMsg"
)}: ${guildDb.dailyMsg ? ":white_check_mark:" : ":x:"}`
"Settings.embed.dailyMsg",
)}: ${guildDb.dailyMsg ? ":white_check_mark:" : ":x:"}`,
)
.setColor("#0598F6");

Expand All @@ -61,32 +61,32 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyChannel"
)
"Settings.button.dailyChannel",
),
)
.setStyle(
guildDb.dailyChannel ? ButtonStyle.Primary : ButtonStyle.Secondary
guildDb.dailyChannel ? ButtonStyle.Primary : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("dailyRole")
.setEmoji("1185973666811478117")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyRole"
)
"Settings.button.dailyRole",
),
)
.setStyle(
guildDb.dailyRole ? ButtonStyle.Primary : ButtonStyle.Secondary
guildDb.dailyRole ? ButtonStyle.Primary : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("dailyType")
.setEmoji("1185973664538177557")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyType"
)
"Settings.button.dailyType",
),
)
.setStyle(ButtonStyle.Primary),
new ButtonBuilder()
Expand All @@ -95,10 +95,10 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyQuestionType"
)
"Settings.button.dailyQuestionType",
),
)
.setStyle(ButtonStyle.Primary)
.setStyle(ButtonStyle.Primary),
);
const dailyButtons2 =
new ActionRowBuilder<MessageActionRowComponentBuilder>().addComponents(
Expand All @@ -108,34 +108,34 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyTimezone"
)
"Settings.button.dailyTimezone",
),
)
.setStyle(
guildDb.dailyTimezone ? ButtonStyle.Success : ButtonStyle.Secondary
guildDb.dailyTimezone ? ButtonStyle.Success : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("dailyInterval")
.setEmoji("1185973661736374405")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyInterval"
)
"Settings.button.dailyInterval",
),
)
.setStyle(
guildDb.dailyInterval ? ButtonStyle.Success : ButtonStyle.Secondary
guildDb.dailyInterval ? ButtonStyle.Success : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("daySelection")
.setEmoji("1220826970133368842")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.daySelect"
)
"Settings.button.daySelect",
),
)
.setStyle(ButtonStyle.Success)
.setStyle(ButtonStyle.Success),
);
const dailyButtons3 =
new ActionRowBuilder<MessageActionRowComponentBuilder>().addComponents(
Expand All @@ -145,33 +145,36 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyThread"
)
"Settings.button.dailyThread",
),
)
.setStyle(
guildDb.dailyThread ? ButtonStyle.Success : ButtonStyle.Secondary
guildDb.dailyThread ? ButtonStyle.Success : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("autoPin")
.setEmoji("1189521962318450698")
.setLabel(
client.translation.get(guildDb?.language, "Settings.button.autoPin")
client.translation.get(
guildDb?.language,
"Settings.button.autoPin",
),
)
.setStyle(
guildDb.autoPin ? ButtonStyle.Secondary : ButtonStyle.Success
guildDb.autoPin ? ButtonStyle.Secondary : ButtonStyle.Success,
),
new ButtonBuilder()
.setCustomId("dailyMsg")
.setEmoji("1185973660465500180")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyMsg"
)
"Settings.button.dailyMsg",
),
)
.setStyle(
guildDb.dailyMsg ? ButtonStyle.Success : ButtonStyle.Secondary
)
guildDb.dailyMsg ? ButtonStyle.Success : ButtonStyle.Secondary,
),
);

await client.database.updateGuild(interaction.guild?.id || "", {
Expand Down
71 changes: 37 additions & 34 deletions src/buttons/dailyTasks/dailyDeleteRole.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@ const button: Button = {
execute: async (interaction, client, guildDb) => {
const dailyMsgs = new EmbedBuilder()
.setTitle(
client.translation.get(guildDb?.language, "Settings.embed.dailyTitle")
client.translation.get(guildDb?.language, "Settings.embed.dailyTitle"),
)
.setDescription(
`${client.translation.get(
guildDb?.language,
"Settings.embed.dailyChannel"
"Settings.embed.dailyChannel",
)}: ${guildDb.dailyChannel ? `<#${guildDb.dailyChannel}>` : ":x:"}\n` +
`${client.translation.get(guildDb?.language, "Settings.embed.dailyRole")}: :x:\n` +
`${client.translation.get(guildDb?.language, "Settings.embed.dailyType")}: ${guildDb?.customTypes}\n` +
`${client.translation.get(guildDb?.language, "Settings.embed.dailyTimezone")}: ${guildDb.dailyTimezone}\n` +
`${client.translation.get(guildDb?.language, "Settings.embed.dailyInterval")}: ${guildDb.dailyInterval}\n` +
`${client.translation.get(
guildDb?.language,
"Settings.embed.dailyThread"
"Settings.embed.dailyThread",
)}: ${guildDb.dailyThread ? ":white_check_mark:" : ":x:"}\n` +
`${client.translation.get(
guildDb?.language,
"Settings.embed.autoPin"
"Settings.embed.autoPin",
)}: ${guildDb.autoPin ? ":white_check_mark:" : ":x:"}\n` +
`${client.translation.get(
guildDb?.language,
"Settings.embed.dailyMsg"
)}: ${guildDb.dailyMsg ? ":white_check_mark:" : ":x:"}`
"Settings.embed.dailyMsg",
)}: ${guildDb.dailyMsg ? ":white_check_mark:" : ":x:"}`,
)

.setColor("#0598F6");
Expand All @@ -47,20 +47,20 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyChannel"
)
"Settings.button.dailyChannel",
),
)
.setStyle(
guildDb.dailyChannel ? ButtonStyle.Primary : ButtonStyle.Secondary
guildDb.dailyChannel ? ButtonStyle.Primary : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("dailyRole")
.setEmoji("1185973666811478117")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyRole"
)
"Settings.button.dailyRole",
),
)
.setStyle(ButtonStyle.Secondary),
new ButtonBuilder()
Expand All @@ -69,8 +69,8 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyType"
)
"Settings.button.dailyType",
),
)
.setStyle(ButtonStyle.Primary),
new ButtonBuilder()
Expand All @@ -79,10 +79,10 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyQuestionType"
)
"Settings.button.dailyQuestionType",
),
)
.setStyle(ButtonStyle.Primary)
.setStyle(ButtonStyle.Primary),
);
const dailyButtons2 =
new ActionRowBuilder<MessageActionRowComponentBuilder>().addComponents(
Expand All @@ -92,34 +92,34 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyTimezone"
)
"Settings.button.dailyTimezone",
),
)
.setStyle(
guildDb.dailyTimezone ? ButtonStyle.Success : ButtonStyle.Secondary
guildDb.dailyTimezone ? ButtonStyle.Success : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("dailyInterval")
.setEmoji("1185973661736374405")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyInterval"
)
"Settings.button.dailyInterval",
),
)
.setStyle(
guildDb.dailyInterval ? ButtonStyle.Success : ButtonStyle.Secondary
guildDb.dailyInterval ? ButtonStyle.Success : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("daySelection")
.setEmoji("1220826970133368842")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.daySelect"
)
"Settings.button.daySelect",
),
)
.setStyle(ButtonStyle.Success)
.setStyle(ButtonStyle.Success),
);
const dailyButtons3 =
new ActionRowBuilder<MessageActionRowComponentBuilder>().addComponents(
Expand All @@ -129,33 +129,36 @@ const button: Button = {
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyThread"
)
"Settings.button.dailyThread",
),
)
.setStyle(
guildDb.dailyThread ? ButtonStyle.Success : ButtonStyle.Secondary
guildDb.dailyThread ? ButtonStyle.Success : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("autoPin")
.setEmoji("1189521962318450698")
.setLabel(
client.translation.get(guildDb?.language, "Settings.button.autoPin")
client.translation.get(
guildDb?.language,
"Settings.button.autoPin",
),
)
.setStyle(
guildDb.autoPin ? ButtonStyle.Success : ButtonStyle.Secondary
guildDb.autoPin ? ButtonStyle.Success : ButtonStyle.Secondary,
),
new ButtonBuilder()
.setCustomId("dailyMsg")
.setEmoji("1185973660465500180")
.setLabel(
client.translation.get(
guildDb?.language,
"Settings.button.dailyMsg"
)
"Settings.button.dailyMsg",
),
)
.setStyle(
guildDb.dailyMsg ? ButtonStyle.Success : ButtonStyle.Secondary
)
guildDb.dailyMsg ? ButtonStyle.Success : ButtonStyle.Secondary,
),
);

await client.database.updateGuild(interaction.guild?.id || "", {
Expand Down
Loading