Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/buttons/gamesActivities/neverhaveiever.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ const button: Button = {
name: "neverhaveiever",
execute: async (interaction: any, client, guildDb) => {
if (interaction.guild) {
await interaction.message.edit({ components: [interaction.message.components[0]] });
await interaction.message.edit({
components: [interaction.message.components[0]],
});
if (interaction.channel.isThread()) {
if (
!interaction.channel
Expand Down
4 changes: 3 additions & 1 deletion src/buttons/gamesActivities/wouldyourather.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const button: Button = {
name: "wouldyourather",
execute: async (interaction: any, client, guildDb) => {
if (interaction.guild) {
await interaction.message.edit({ components: [interaction.message.components[0]] });
await interaction.message.edit({
components: [interaction.message.components[0]],
});
if (interaction.channel.isThread()) {
if (
!interaction.channel
Expand Down
5 changes: 3 additions & 2 deletions src/commands/game/dare.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ const command: ChatInputCommand = {
* @param {guildModel} guildDb
*/
execute: async (interaction, client, guildDb) => {

const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
const userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

let Dare = await getDare(
guildDb?.language != null ? guildDb.language : userDb.language,
Expand Down
4 changes: 3 additions & 1 deletion src/commands/game/higherlower.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ const command: ChatInputCommand = {
execute: async (interaction, client, guildDb) => {
await interaction.deferReply();

const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
const userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

const initembed = new HigherLowerEmbed(interaction, client, guildDb);

Expand Down
32 changes: 10 additions & 22 deletions src/commands/game/leaderboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@ const command: ChatInputCommand = {
* @param {guildModel} guildDb
*/
execute: async (interaction, client, guildDb) => {
const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
const userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

let language = guildDb?.language != null ? guildDb.language : userDb.language;
let language =
guildDb?.language != null ? guildDb.language : userDb.language;

switch (interaction.options.getString("game")) {
case "higherlower":
Expand Down Expand Up @@ -70,10 +73,7 @@ const command: ChatInputCommand = {

if (data.length === 0) {
interaction.reply({
content: client.translation.get(
language,
"Leaderboard.none",
),
content: client.translation.get(language, "Leaderboard.none"),
});
return;
}
Expand All @@ -96,10 +96,7 @@ const command: ChatInputCommand = {
page.add(
new EmbedBuilder()
.setTitle(
client.translation.get(
language,
"Leaderboard.global",
),
client.translation.get(language, "Leaderboard.global"),
)
.setDescription(data.join("\n").toString())
.setColor("#0598F6"),
Expand All @@ -116,10 +113,7 @@ const command: ChatInputCommand = {
page.add(
new EmbedBuilder()
.setTitle(
client.translation.get(
language,
"Leaderboard.global",
),
client.translation.get(language, "Leaderboard.global"),
)
.setColor("#0598F6"),
);
Expand Down Expand Up @@ -147,10 +141,7 @@ const command: ChatInputCommand = {

if (data.length === 0) {
interaction.reply({
content: client.translation.get(
language,
"Leaderboard.none",
),
content: client.translation.get(language, "Leaderboard.none"),
});
return;
}
Expand Down Expand Up @@ -181,10 +172,7 @@ const command: ChatInputCommand = {
page.add(
new EmbedBuilder()
.setTitle(
client.translation.get(
language,
"Leaderboard.guild",
),
client.translation.get(language, "Leaderboard.guild"),
)
.setDescription(e.slice(0, 10).join("\n").toString())
.setColor("#0598F6"),
Expand Down
5 changes: 3 additions & 2 deletions src/commands/game/neverhaveiever.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ const command: ChatInputCommand = {
*/

execute: async (interaction, client, guildDb) => {

let userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
let userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

let { Funny, Basic, Young, Food, RuleBreak } = await getNeverHaveIEver(
guildDb?.language != null ? guildDb.language : userDb.language,
Expand Down
5 changes: 3 additions & 2 deletions src/commands/game/random.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ const command: ChatInputCommand = {
* @param {guildModel} guildDb
*/
execute: async (interaction, client, guildDb) => {

const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
const userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

let Randomtod = await getRandomTod(
guildDb?.language != null ? guildDb.language : userDb.language,
Expand Down
5 changes: 3 additions & 2 deletions src/commands/game/truth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ const command: ChatInputCommand = {
* @param {guildModel} guildDb
*/
execute: async (interaction, client, guildDb) => {

const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
const userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

let Truth = await getTruth(
guildDb?.language != null ? guildDb.language : userDb.language,
Expand Down
5 changes: 3 additions & 2 deletions src/commands/game/whatwouldyoudo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ const command: ChatInputCommand = {
* @param {guildModel} guildDb
*/
execute: async (interaction, client, guildDb) => {

const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
const userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

let WWYD = await getWwyd(
guildDb?.language != null ? guildDb.language : userDb.language,
Expand Down
5 changes: 3 additions & 2 deletions src/commands/game/wouldyourather.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ const command: ChatInputCommand = {
*/

execute: async (interaction, client, guildDb) => {

const userDb = await UserModel.findOne({ userID: interaction.user?.id }) as IUserModel;
const userDb = (await UserModel.findOne({
userID: interaction.user?.id,
})) as IUserModel;

let General = await getWouldYouRather(
guildDb?.language != null ? guildDb.language : userDb.language,
Expand Down
55 changes: 36 additions & 19 deletions src/commands/settings/language.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,36 @@ const command: ChatInputCommand = {
let languageembed;

const languageMap = {
de_DE: { title: "Sprache geändert!", description: "Deutsch wurde als neue Sprache ausgewählt!" },
en_EN: { title: "Language changed!", description: "English has been selected as the new language!" },
es_ES: { title: "¡Idioma cambiado!", description: "¡Has seleccionado el español como nuevo idioma!"},
fr_FR: { title: "Langue changée!", description: "Français a été sélectionné comme nouvelle langue!"},
} as Record<string, { title: string; description: string }>
de_DE: {
title: "Sprache geändert!",
description: "Deutsch wurde als neue Sprache ausgewählt!",
},
en_EN: {
title: "Language changed!",
description: "English has been selected as the new language!",
},
es_ES: {
title: "¡Idioma cambiado!",
description: "¡Has seleccionado el español como nuevo idioma!",
},
fr_FR: {
title: "Langue changée!",
description: "Français a été sélectionné comme nouvelle langue!",
},
} as Record<string, { title: string; description: string }>;

languageembed = new EmbedBuilder()
.setTitle(languageMap[interaction.options.getString("language") || "en_EN"].title)
.setDescription(languageMap[interaction.options.getString("language") || "en_EN"].description)
.setFooter({
text: "Would You",
iconURL: client?.user?.displayAvatarURL() || undefined,
});
.setTitle(
languageMap[interaction.options.getString("language") || "en_EN"].title,
)
.setDescription(
languageMap[interaction.options.getString("language") || "en_EN"]
.description,
)
.setFooter({
text: "Would You",
iconURL: client?.user?.displayAvatarURL() || undefined,
});

switch (interaction.options.getString("type")) {
case "user": {
Expand All @@ -83,14 +100,14 @@ const command: ChatInputCommand = {
);

interaction
.reply({
embeds: [languageembed as EmbedBuilder],
ephemeral: true,
})
.catch((err) => {
captureException(err);
});
break;
.reply({
embeds: [languageembed as EmbedBuilder],
ephemeral: true,
})
.catch((err) => {
captureException(err);
});
break;
}
case "server": {
if (!interaction.guild) {
Expand Down
2 changes: 1 addition & 1 deletion src/util/Functions/supportAppCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const userCommands = [
"whatwouldyoudo",
"leaderboard",
"privacy",
"language"
"language",
];

export default function supportAppCommands(
Expand Down
2 changes: 1 addition & 1 deletion src/util/Models/userModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const userModelSchema = new Schema(
{
userID: { type: String, unique: true },
votePrivacy: { type: Boolean, default: false },
language : { type: String, default: "en_EN" },
language: { type: String, default: "en_EN" },
wouldyourather: {
yes: { type: Number, default: 0 },
no: { type: Number, default: 0 },
Expand Down