Meta: Use of Prettier #58
37 changed files with 2343 additions and 1962 deletions
|
@ -1,27 +1,20 @@
|
|||
{
|
||||
|
||||
"extends": [
|
||||
"eslint:recommended",
|
||||
"plugin:@typescript-eslint/recommended"
|
||||
"plugin:@typescript-eslint/recommended",
|
||||
"prettier"
|
||||
],
|
||||
"parser": "@typescript-eslint/parser",
|
||||
"parserOptions": {
|
||||
"project": ["./tsconfig.json"]
|
||||
},
|
||||
"plugins": [
|
||||
"@typescript-eslint"
|
||||
],
|
||||
"plugins": ["@typescript-eslint"],
|
||||
"rules": {
|
||||
"arrow-spacing": ["warn", { "before": true, "after": true }],
|
||||
"brace-style": ["error"],
|
||||
"comma-dangle": ["error", "always-multiline"],
|
||||
"comma-spacing": "error",
|
||||
"comma-style": "error",
|
||||
"curly": ["error", "multi-line", "consistent"],
|
||||
"dot-location": ["error", "property"],
|
||||
"handle-callback-err": "off",
|
||||
"indent": ["error", "tab", { "SwitchCase": 1 }],
|
||||
"keyword-spacing": "error",
|
||||
"max-nested-callbacks": ["error", { "max": 4 }],
|
||||
"max-statements-per-line": ["error", { "max": 2 }],
|
||||
"no-console": "off",
|
||||
|
@ -30,23 +23,19 @@
|
|||
"no-inline-comments": "error",
|
||||
"no-lonely-if": "error",
|
||||
"no-multi-spaces": "error",
|
||||
"no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
|
||||
"no-multiple-empty-lines": [
|
||||
"error",
|
||||
{ "max": 2, "maxEOF": 1, "maxBOF": 0 }
|
||||
],
|
||||
"no-shadow": "off",
|
||||
"@typescript-eslint/no-shadow": ["error", { "allow": ["err", "resolve", "reject"] }],
|
||||
"@typescript-eslint/no-shadow": [
|
||||
"error",
|
||||
{ "allow": ["err", "resolve", "reject"] }
|
||||
],
|
||||
"no-trailing-spaces": ["error"],
|
||||
"no-var": "error",
|
||||
"object-curly-spacing": ["error", "always"],
|
||||
"prefer-const": "error",
|
||||
"quotes": ["error", "single"],
|
||||
"semi": ["error", "always"],
|
||||
"space-before-blocks": "error",
|
||||
"space-before-function-paren": ["error", {
|
||||
"anonymous": "never",
|
||||
"named": "never",
|
||||
"asyncArrow": "always"
|
||||
}],
|
||||
"space-in-parens": "error",
|
||||
"space-infix-ops": "error",
|
||||
"space-unary-ops": "error",
|
||||
"spaced-comment": "error",
|
||||
"yoda": "error"
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
---
|
||||
|
||||
name: "🐞 Rapport d'un bug"
|
||||
about: "Signal un problème rencontré"
|
||||
ref: "main"
|
||||
labels:
|
||||
|
||||
- bug
|
||||
- "help wanted"
|
||||
|
||||
- bug
|
||||
- "help wanted"
|
||||
---
|
||||
|
||||
Bot version: v`X.Y.Z`
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
---
|
||||
|
||||
name: "💫 Demande une fonctionnalitée"
|
||||
about: "Propose une nouvelle fonctionnalité à ajouter"
|
||||
ref: "main"
|
||||
labels:
|
||||
|
||||
- enhancement
|
||||
|
||||
- enhancement
|
||||
---
|
||||
|
|
1
.prettierignore
Normal file
1
.prettierignore
Normal file
|
@ -0,0 +1 @@
|
|||
dist
|
1
.prettierrc.json
Normal file
1
.prettierrc.json
Normal file
|
@ -0,0 +1 @@
|
|||
{}
|
4
.vscode/extensions.json
vendored
4
.vscode/extensions.json
vendored
|
@ -1,5 +1,3 @@
|
|||
{
|
||||
"recommendations": [
|
||||
"dbaeumer.vscode-eslint"
|
||||
]
|
||||
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
|
||||
}
|
||||
|
|
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"editor.tabSize": 4,
|
||||
"editor.tabSize": 2,
|
||||
"editor.insertSpaces": false,
|
||||
|
||||
"files.insertFinalNewline": true,
|
||||
|
|
23
README.md
23
README.md
|
@ -3,23 +3,29 @@
|
|||
[**Ajoute le bot à ton serveur**](https://discord.com/api/oauth2/authorize?client_id=965598852407230494&permissions=8&scope=bot%20applications.commands)
|
||||
|
||||
## Lancer le bot
|
||||
|
||||
### En local
|
||||
|
||||
> Cloner le repo.
|
||||
|
||||
> Spécifier un fichier `.env` en suivant [l'exemple](config/example.env).
|
||||
|
||||
> Installer les dépendences du bot.
|
||||
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
> Lancer le bot.
|
||||
|
||||
```bash
|
||||
npm run main
|
||||
```
|
||||
|
||||
### Avec Docker (Recommandé)
|
||||
|
||||
> Facile avec `docker-compose`
|
||||
|
||||
```docker
|
||||
version: "3.9"
|
||||
services:
|
||||
|
@ -34,23 +40,28 @@ services:
|
|||
```
|
||||
|
||||
## Variables d'environnements
|
||||
| Nom | Description | Par défaut | Commentaire
|
||||
| :-----------: | :--------------: | :--------: | :-:
|
||||
|
||||
| Nom | Description | Par défaut | Commentaire |
|
||||
| :-----------: | :---------------: | :--------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
|
||||
| TOKEN_DISCORD | Token Discord | Aucune |
|
||||
| DEFAULT_LANG | Langue par défaut | `fr` | Expérimental, si la langue par défaut n'est pas complète (càd 100%), le bot pourrait ne pas fonctionner correctement.<br>Liste des traductions disponibles [ici](./src/locales/).
|
||||
| DEFAULT_LANG | Langue par défaut | `fr` | Expérimental, si la langue par défaut n'est pas complète (càd 100%), le bot pourrait ne pas fonctionner correctement.<br>Liste des traductions disponibles [ici](./src/locales/). |
|
||||
|
||||
## Volumes
|
||||
| Chemin | Description
|
||||
| :-------: | :-:
|
||||
| `/config` | Dossier de configuration, par exemple, c'est ici que la base de donnée est.
|
||||
|
||||
| Chemin | Description |
|
||||
| :-------: | :-------------------------------------------------------------------------: |
|
||||
| `/config` | Dossier de configuration, par exemple, c'est ici que la base de donnée est. |
|
||||
|
||||
# Contribuer
|
||||
|
||||
Toute contribution est la bienvenue !
|
||||
|
||||
Pour commencer, lis le [fichier de contribution](./CONTRIBUTING.md).
|
||||
|
||||
# Licence
|
||||
|
||||
Voir le [fichier LICENCE](./LICENCE).
|
||||
|
||||
# Références
|
||||
|
||||
[Photo de profil](https://picrew.me/image_maker/1497656)
|
||||
|
|
22
package-lock.json
generated
22
package-lock.json
generated
|
@ -23,6 +23,7 @@
|
|||
"@typescript-eslint/parser": "^5.30.7",
|
||||
"dotenv": "^16.0.1",
|
||||
"eslint": "^8.20.0",
|
||||
"prettier": "2.8.3",
|
||||
"ts-node-dev": "^2.0.0"
|
||||
}
|
||||
},
|
||||
|
@ -2438,6 +2439,21 @@
|
|||
"node": ">= 0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/prettier": {
|
||||
"version": "2.8.3",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
|
||||
"integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"prettier": "bin-prettier.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.13.0"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/prettier/prettier?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/promise-inflight": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
|
||||
|
@ -5110,6 +5126,12 @@
|
|||
"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
|
||||
"dev": true
|
||||
},
|
||||
"prettier": {
|
||||
"version": "2.8.3",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
|
||||
"integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==",
|
||||
"dev": true
|
||||
},
|
||||
"promise-inflight": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
"scripts": {
|
||||
"main": "rm -r dist 2> /dev/null; npx tsc && node ./dist/index.js",
|
||||
"debug": "npx tsnd --respawn ./src/index.ts",
|
||||
"lint": "npx eslint src"
|
||||
"lint": "npx eslint src",
|
||||
"format": "npx prettier --check src"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
@ -17,18 +18,19 @@
|
|||
"dependencies": {
|
||||
"@discordjs/rest": "^1.1.0",
|
||||
"@types/sqlite3": "^3.1.8",
|
||||
"@types/uuid": "^9.0.0",
|
||||
"discord-api-types": "^0.36.3",
|
||||
"discord.js": "^14.3.0",
|
||||
"sqlite3": "^5.0.11",
|
||||
"typescript": "^4.7.4",
|
||||
"uuid": "^9.0.0",
|
||||
"@types/uuid": "^9.0.0"
|
||||
"uuid": "^9.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "^5.30.7",
|
||||
"@typescript-eslint/parser": "^5.30.7",
|
||||
"dotenv": "^16.0.1",
|
||||
"eslint": "^8.20.0",
|
||||
"prettier": "2.8.3",
|
||||
"ts-node-dev": "^2.0.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,28 +1,33 @@
|
|||
import { readdir } from 'fs/promises';
|
||||
import { removeExtension } from '../utils/misc';
|
||||
import { ChatInputCommandInteraction, Client, MessageComponentInteraction } from 'discord.js';
|
||||
import { getLocale } from '../utils/locales';
|
||||
import { readdir } from "fs/promises";
|
||||
import { removeExtension } from "../utils/misc";
|
||||
import {
|
||||
ChatInputCommandInteraction,
|
||||
Client,
|
||||
MessageComponentInteraction,
|
||||
} from "discord.js";
|
||||
import { getLocale } from "../utils/locales";
|
||||
|
||||
export default async (client: Client) => {
|
||||
// Dossier des buttons
|
||||
const buttons_categories = (await readdir(__dirname))
|
||||
.filter(element => !element.endsWith('.js') && !element.endsWith('.ts'));
|
||||
const buttons_categories = (await readdir(__dirname)).filter(
|
||||
(element) => !element.endsWith(".js") && !element.endsWith(".ts")
|
||||
);
|
||||
|
||||
await Promise.all(
|
||||
// For each categorie
|
||||
buttons_categories.map(async buttons_category => {
|
||||
buttons_categories.map(async (buttons_category) => {
|
||||
// Retrieve all the commands
|
||||
const button_files = await readdir(`${__dirname}/${buttons_category}`);
|
||||
|
||||
// Add the category to the collection for the help command
|
||||
client.buttons.categories.set(
|
||||
buttons_category,
|
||||
button_files.map(removeExtension),
|
||||
button_files.map(removeExtension)
|
||||
);
|
||||
|
||||
// Add the button
|
||||
return Promise.all(
|
||||
button_files.map(async button_file => {
|
||||
button_files.map(async (button_file) => {
|
||||
const button = (
|
||||
await import(`../buttons/${buttons_category}/${button_file}`)
|
||||
).default;
|
||||
|
@ -30,9 +35,9 @@ export default async (client: Client) => {
|
|||
// Add it to the collection so the interaction will work
|
||||
client.buttons.list.set(button.data.name, button);
|
||||
return button.data;
|
||||
}),
|
||||
})
|
||||
);
|
||||
}),
|
||||
})
|
||||
);
|
||||
};
|
||||
|
||||
|
@ -43,20 +48,28 @@ export default async (client: Client) => {
|
|||
* @param id Button ID
|
||||
* @param deferUpdate defer update in case update take time
|
||||
*/
|
||||
export const collect = (client: Client, interaction: ChatInputCommandInteraction | MessageComponentInteraction, id: string, deferUpdate = false) => {
|
||||
export const collect = (
|
||||
client: Client,
|
||||
interaction: ChatInputCommandInteraction | MessageComponentInteraction,
|
||||
id: string,
|
||||
deferUpdate = false
|
||||
) => {
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
const button = client.buttons.list.get(id.split('_')[0]);
|
||||
const button = client.buttons.list.get(id.split("_")[0]);
|
||||
|
||||
if (!button) {
|
||||
interaction.reply({
|
||||
content: loc.get('e_interacreate_no_button'),
|
||||
content: loc.get("e_interacreate_no_button"),
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
||||
const filter = (i: MessageComponentInteraction) => i.customId === id;
|
||||
const collector = interaction.channel?.createMessageComponentCollector({ filter, max: 1 });
|
||||
collector?.on('collect', async (i) => {
|
||||
const collector = interaction.channel?.createMessageComponentCollector({
|
||||
filter,
|
||||
max: 1,
|
||||
});
|
||||
collector?.on("collect", async (i) => {
|
||||
if (deferUpdate) {
|
||||
await i.deferUpdate();
|
||||
}
|
||||
|
|
|
@ -1,15 +1,25 @@
|
|||
import { ActionRowBuilder, ButtonBuilder, ButtonStyle, Client, MessageComponentInteraction, User } from 'discord.js';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { getLocale } from '../../utils/locales';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import { embedListReminders } from '../../utils/reminder';
|
||||
import { collect } from '../loader';
|
||||
import {
|
||||
ActionRowBuilder,
|
||||
ButtonBuilder,
|
||||
ButtonStyle,
|
||||
Client,
|
||||
MessageComponentInteraction,
|
||||
User,
|
||||
} from "discord.js";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
import { getLocale } from "../../utils/locales";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
import { embedListReminders } from "../../utils/reminder";
|
||||
import { collect } from "../loader";
|
||||
|
||||
export default {
|
||||
data: {
|
||||
name: getFilename(__filename),
|
||||
},
|
||||
interaction: async (interaction: MessageComponentInteraction, client: Client) => {
|
||||
interaction: async (
|
||||
interaction: MessageComponentInteraction,
|
||||
client: Client
|
||||
) => {
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
const embed_desc = interaction.message.embeds.at(0)?.description as string;
|
||||
|
||||
|
@ -27,21 +37,28 @@ export default {
|
|||
const user = client.users.cache.get(userId) as User;
|
||||
|
||||
// Fetch list
|
||||
const list = await embedListReminders(client, user, interaction.guildId, page, interaction.locale);
|
||||
const list = await embedListReminders(
|
||||
client,
|
||||
user,
|
||||
interaction.guildId,
|
||||
page,
|
||||
interaction.locale
|
||||
);
|
||||
|
||||
const idPrec = 'reminderList-prec_' + uuidv4();
|
||||
const idNext = 'reminderList-next_' + uuidv4();
|
||||
const idPrec = "reminderList-prec_" + uuidv4();
|
||||
const idNext = "reminderList-next_" + uuidv4();
|
||||
const row = new ActionRowBuilder<ButtonBuilder>()
|
||||
.addComponents(
|
||||
new ButtonBuilder()
|
||||
.setCustomId(idPrec)
|
||||
.setLabel(loc.get('c_reminder12'))
|
||||
.setStyle(ButtonStyle.Primary))
|
||||
.setLabel(loc.get("c_reminder12"))
|
||||
.setStyle(ButtonStyle.Primary)
|
||||
)
|
||||
.addComponents(
|
||||
new ButtonBuilder()
|
||||
.setCustomId(idNext)
|
||||
.setLabel(loc.get('c_reminder13'))
|
||||
.setStyle(ButtonStyle.Primary),
|
||||
.setLabel(loc.get("c_reminder13"))
|
||||
.setStyle(ButtonStyle.Primary)
|
||||
);
|
||||
|
||||
// Buttons interactions
|
||||
|
|
|
@ -1,15 +1,25 @@
|
|||
import { ActionRowBuilder, ButtonBuilder, ButtonStyle, Client, MessageComponentInteraction, User } from 'discord.js';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { getLocale } from '../../utils/locales';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import { embedListReminders } from '../../utils/reminder';
|
||||
import { collect } from '../loader';
|
||||
import {
|
||||
ActionRowBuilder,
|
||||
ButtonBuilder,
|
||||
ButtonStyle,
|
||||
Client,
|
||||
MessageComponentInteraction,
|
||||
User,
|
||||
} from "discord.js";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
import { getLocale } from "../../utils/locales";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
import { embedListReminders } from "../../utils/reminder";
|
||||
import { collect } from "../loader";
|
||||
|
||||
export default {
|
||||
data: {
|
||||
name: getFilename(__filename),
|
||||
},
|
||||
interaction: async (interaction: MessageComponentInteraction, client: Client) => {
|
||||
interaction: async (
|
||||
interaction: MessageComponentInteraction,
|
||||
client: Client
|
||||
) => {
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
const embed_desc = interaction.message.embeds.at(0)?.description as string;
|
||||
|
||||
|
@ -27,21 +37,28 @@ export default {
|
|||
const user = client.users.cache.get(userId) as User;
|
||||
|
||||
// Fetch list
|
||||
const list = await embedListReminders(client, user, interaction.guildId, page, interaction.locale);
|
||||
const list = await embedListReminders(
|
||||
client,
|
||||
user,
|
||||
interaction.guildId,
|
||||
page,
|
||||
interaction.locale
|
||||
);
|
||||
|
||||
const idPrec = 'reminderList-prec_' + uuidv4();
|
||||
const idNext = 'reminderList-next_' + uuidv4();
|
||||
const idPrec = "reminderList-prec_" + uuidv4();
|
||||
const idNext = "reminderList-next_" + uuidv4();
|
||||
const row = new ActionRowBuilder<ButtonBuilder>()
|
||||
.addComponents(
|
||||
new ButtonBuilder()
|
||||
.setCustomId(idPrec)
|
||||
.setLabel(loc.get('c_reminder12'))
|
||||
.setStyle(ButtonStyle.Primary))
|
||||
.setLabel(loc.get("c_reminder12"))
|
||||
.setStyle(ButtonStyle.Primary)
|
||||
)
|
||||
.addComponents(
|
||||
new ButtonBuilder()
|
||||
.setCustomId(idNext)
|
||||
.setLabel(loc.get('c_reminder13'))
|
||||
.setStyle(ButtonStyle.Primary),
|
||||
.setLabel(loc.get("c_reminder13"))
|
||||
.setStyle(ButtonStyle.Primary)
|
||||
);
|
||||
|
||||
// Buttons interactions
|
||||
|
|
|
@ -1,32 +1,33 @@
|
|||
import { REST } from '@discordjs/rest';
|
||||
import { Routes } from 'discord-api-types/v9';
|
||||
import { Client } from 'discord.js';
|
||||
import { readdir } from 'fs/promises';
|
||||
import { removeExtension } from '../utils/misc';
|
||||
import { REST } from "@discordjs/rest";
|
||||
import { Routes } from "discord-api-types/v9";
|
||||
import { Client } from "discord.js";
|
||||
import { readdir } from "fs/promises";
|
||||
import { removeExtension } from "../utils/misc";
|
||||
|
||||
/** Load all the commands. */
|
||||
export default async (client: Client) => {
|
||||
const rest = new REST({ version: '10' }).setToken(client.token ?? '');
|
||||
const rest = new REST({ version: "10" }).setToken(client.token ?? "");
|
||||
|
||||
const command_categories = (await readdir(__dirname))
|
||||
.filter(element => !element.endsWith('.js') && !element.endsWith('.ts'));
|
||||
const command_categories = (await readdir(__dirname)).filter(
|
||||
(element) => !element.endsWith(".js") && !element.endsWith(".ts")
|
||||
);
|
||||
|
||||
const commands = (
|
||||
await Promise.all(
|
||||
// For each categorie
|
||||
command_categories.map(async command_category => {
|
||||
command_categories.map(async (command_category) => {
|
||||
// Retrieve all the commands
|
||||
const command_files = await readdir(`${__dirname}/${command_category}`);
|
||||
|
||||
// Add the category to the collection for the help command
|
||||
client.commands.categories.set(
|
||||
command_category,
|
||||
command_files.map(removeExtension),
|
||||
command_files.map(removeExtension)
|
||||
);
|
||||
|
||||
// Add the command
|
||||
return Promise.all(
|
||||
command_files.map(async command_file => {
|
||||
command_files.map(async (command_file) => {
|
||||
const command = (
|
||||
await import(`../commands/${command_category}/${command_file}`)
|
||||
).default;
|
||||
|
@ -36,9 +37,9 @@ export default async (client: Client) => {
|
|||
client.commands.list.set(command.data.name, command);
|
||||
|
||||
return command;
|
||||
}),
|
||||
})
|
||||
);
|
||||
}),
|
||||
})
|
||||
)
|
||||
).flat(2);
|
||||
|
||||
|
@ -49,7 +50,9 @@ export default async (client: Client) => {
|
|||
const allowedGuilds = client.guilds.cache;
|
||||
|
||||
// Assign each commands to the guilds
|
||||
commands.filter((c) => c.scope().length > 0).forEach((c) => {
|
||||
commands
|
||||
.filter((c) => c.scope().length > 0)
|
||||
.forEach((c) => {
|
||||
c.scope().forEach((guild: string) => {
|
||||
if (allowedGuilds.get(guild) !== undefined) {
|
||||
const guildCommands = scopedCommands.get(guild);
|
||||
|
@ -63,11 +66,15 @@ export default async (client: Client) => {
|
|||
});
|
||||
});
|
||||
|
||||
scopedCommands
|
||||
.forEach(async (command, guild) => await rest.put(
|
||||
Routes.applicationGuildCommands(client.user?.id as string, guild), {
|
||||
scopedCommands.forEach(
|
||||
async (command, guild) =>
|
||||
await rest.put(
|
||||
Routes.applicationGuildCommands(client.user?.id as string, guild),
|
||||
{
|
||||
body: command,
|
||||
}));
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
// Send global commands to Discord
|
||||
const globalCommands = commands.filter((c) => c.scope().length == 0);
|
||||
|
|
|
@ -1,93 +1,119 @@
|
|||
import { SlashCommandBuilder } from '@discordjs/builders';
|
||||
import { ChannelType, Client, Colors, CommandInteraction, EmbedBuilder, NonThreadGuildBasedChannel } from 'discord.js';
|
||||
import '../../modules/string';
|
||||
import { getLocale, getLocalizations } from '../../utils/locales';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import { SlashCommandBuilder } from "@discordjs/builders";
|
||||
import {
|
||||
ChannelType,
|
||||
Client,
|
||||
Colors,
|
||||
CommandInteraction,
|
||||
EmbedBuilder,
|
||||
NonThreadGuildBasedChannel,
|
||||
} from "discord.js";
|
||||
import "../../modules/string";
|
||||
import { getLocale, getLocalizations } from "../../utils/locales";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
|
||||
export default {
|
||||
scope: () => ['807244911350906920'],
|
||||
scope: () => ["807244911350906920"],
|
||||
|
||||
data: (client: Client) => {
|
||||
const filename = getFilename(__filename);
|
||||
return new SlashCommandBuilder()
|
||||
.setName(
|
||||
filename.toLowerCase())
|
||||
.setDescription(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? '')
|
||||
return (
|
||||
new SlashCommandBuilder()
|
||||
.setName(filename.toLowerCase())
|
||||
.setDescription(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_name`, true))
|
||||
getLocalizations(client, `c_${filename}_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_desc`))
|
||||
getLocalizations(client, `c_${filename}_desc`)
|
||||
)
|
||||
|
||||
// Command option
|
||||
.addStringOption(option => option
|
||||
.setName(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_name`) ?? '')
|
||||
.setDescription(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_desc`) ?? '')
|
||||
.addStringOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_name`) ?? ""
|
||||
)
|
||||
.setDescription(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_opt1_name`, true))
|
||||
getLocalizations(client, `c_${filename}_opt1_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_opt1_desc`))
|
||||
getLocalizations(client, `c_${filename}_opt1_desc`)
|
||||
)
|
||||
)
|
||||
);
|
||||
},
|
||||
|
||||
interaction: async (interaction: CommandInteraction, client: Client) => {
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
const desiredCat = interaction.options.get(client
|
||||
.locales
|
||||
const desiredCat = interaction.options.get(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? '')?.value as string;
|
||||
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? ""
|
||||
)?.value as string;
|
||||
|
||||
// If a category isn't specified
|
||||
if (!desiredCat) {
|
||||
|
||||
// Sends a list of commands sorted into categories
|
||||
return interaction.reply({
|
||||
embeds: [
|
||||
new EmbedBuilder()
|
||||
.setColor(Colors.Blurple)
|
||||
.setTitle(loc.get('c_archive1'))
|
||||
.setDescription(loc.get('c_archive2')),
|
||||
.setTitle(loc.get("c_archive1"))
|
||||
.setDescription(loc.get("c_archive2")),
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
// If a category is specified
|
||||
const cleanCat = ['L1', 'L2', 'L3', 'M1', 'M2'];
|
||||
const cleanCat = ["L1", "L2", "L3", "M1", "M2"];
|
||||
const channel = cleanCat.includes(desiredCat);
|
||||
if (!channel) {
|
||||
// Category doesn't exist or is not included
|
||||
return interaction.reply({
|
||||
content: `${loc.get('c_archive3')} \`${desiredCat}\``,
|
||||
content: `${loc.get("c_archive3")} \`${desiredCat}\``,
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
||||
const allChannel = interaction.guild?.channels.fetch();
|
||||
allChannel?.then(async channelGuild => {
|
||||
allChannel?.then(async (channelGuild) => {
|
||||
// Retrieve category to archive
|
||||
const catToArchive = channelGuild
|
||||
.filter(chan => chan?.type == ChannelType.GuildCategory)
|
||||
.filter(chan => chan?.name == desiredCat);
|
||||
.filter((chan) => chan?.type == ChannelType.GuildCategory)
|
||||
.filter((chan) => chan?.name == desiredCat);
|
||||
|
||||
// Create/Retrieve the archive category
|
||||
const catArchivedName = 'archive - ' + desiredCat;
|
||||
const catArchivedName = "archive - " + desiredCat;
|
||||
const catArchivedMap = channelGuild
|
||||
.filter(chan => chan?.type == ChannelType.GuildCategory)
|
||||
.filter(chan => chan?.name == catArchivedName);
|
||||
.filter((chan) => chan?.type == ChannelType.GuildCategory)
|
||||
.filter((chan) => chan?.name == catArchivedName);
|
||||
|
||||
let catArchived: NonThreadGuildBasedChannel | null | undefined;
|
||||
if (catArchivedMap.size > 0) {
|
||||
catArchived = catArchivedMap.at(0);
|
||||
} else {
|
||||
catArchived = await interaction.guild?.channels
|
||||
.create({ name: catArchivedName, type: ChannelType.GuildCategory });
|
||||
catArchived = await interaction.guild?.channels.create({
|
||||
name: catArchivedName,
|
||||
type: ChannelType.GuildCategory,
|
||||
});
|
||||
}
|
||||
|
||||
const allChannelDesired = channelGuild
|
||||
.filter(chan => chan?.type == 0)
|
||||
.filter(chan => chan?.parentId == catToArchive.map(cat => cat?.id)[0]);
|
||||
.filter((chan) => chan?.type == 0)
|
||||
.filter(
|
||||
(chan) => chan?.parentId == catToArchive.map((cat) => cat?.id)[0]
|
||||
);
|
||||
|
||||
// If no channels in the source category
|
||||
if (allChannelDesired.size == 0) {
|
||||
|
@ -95,32 +121,36 @@ export default {
|
|||
embeds: [
|
||||
new EmbedBuilder()
|
||||
.setColor(Colors.Blurple)
|
||||
.setTitle(loc.get('c_archive6'))
|
||||
.setDescription(
|
||||
loc.get('c_archive7')
|
||||
),
|
||||
.setTitle(loc.get("c_archive6"))
|
||||
.setDescription(loc.get("c_archive7")),
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
// Move channels to the archived categoryx
|
||||
allChannelDesired.forEach(elem => elem?.setParent(catArchived?.id as string));
|
||||
allChannelDesired.forEach((elem) =>
|
||||
elem?.setParent(catArchived?.id as string)
|
||||
);
|
||||
|
||||
return interaction.reply({
|
||||
embeds: [
|
||||
new EmbedBuilder()
|
||||
.setColor(Colors.Blurple)
|
||||
.setTitle(loc.get('c_archive4')
|
||||
+ ' `'
|
||||
+ catToArchive.map(cat => cat?.name)
|
||||
+ '` '
|
||||
+ loc.get('c_archive5')
|
||||
+ ' `'
|
||||
+ catArchivedName
|
||||
+ '`')
|
||||
.setTitle(
|
||||
loc.get("c_archive4") +
|
||||
" `" +
|
||||
catToArchive.map((cat) => cat?.name) +
|
||||
"` " +
|
||||
loc.get("c_archive5") +
|
||||
" `" +
|
||||
catArchivedName +
|
||||
"`"
|
||||
)
|
||||
.setDescription(
|
||||
allChannelDesired
|
||||
.map(cgD => cgD?.name).toString().replaceAll(',', '\n')
|
||||
.map((cgD) => cgD?.name)
|
||||
.toString()
|
||||
.replaceAll(",", "\n")
|
||||
),
|
||||
],
|
||||
});
|
||||
|
|
|
@ -1,44 +1,68 @@
|
|||
import { SlashCommandBuilder } from '@discordjs/builders';
|
||||
import { Locale } from 'discord-api-types/v9';
|
||||
import { Client, ChatInputCommandInteraction, EmbedBuilder, Colors } from 'discord.js';
|
||||
import { getLocale, getLocalizations } from '../../utils/locales';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import '../../modules/string';
|
||||
import { SlashCommandBuilder } from "@discordjs/builders";
|
||||
import { Locale } from "discord-api-types/v9";
|
||||
import {
|
||||
Client,
|
||||
ChatInputCommandInteraction,
|
||||
EmbedBuilder,
|
||||
Colors,
|
||||
} from "discord.js";
|
||||
import { getLocale, getLocalizations } from "../../utils/locales";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
import "../../modules/string";
|
||||
|
||||
export default {
|
||||
scope: () => [],
|
||||
|
||||
data: (client: Client) => {
|
||||
const filename = getFilename(__filename);
|
||||
return new SlashCommandBuilder()
|
||||
.setName(
|
||||
filename.toLowerCase())
|
||||
.setDescription(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? '')
|
||||
return (
|
||||
new SlashCommandBuilder()
|
||||
.setName(filename.toLowerCase())
|
||||
.setDescription(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_name`, true))
|
||||
getLocalizations(client, `c_${filename}_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_desc`))
|
||||
getLocalizations(client, `c_${filename}_desc`)
|
||||
)
|
||||
|
||||
// Command option
|
||||
.addStringOption(option => option
|
||||
.setName(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_name`) ?? '')
|
||||
.setDescription(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_desc`) ?? '')
|
||||
.addStringOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_name`) ?? ""
|
||||
)
|
||||
.setDescription(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_opt1_name`, true))
|
||||
getLocalizations(client, `c_${filename}_opt1_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_opt1_desc`))
|
||||
getLocalizations(client, `c_${filename}_opt1_desc`)
|
||||
)
|
||||
)
|
||||
);
|
||||
},
|
||||
|
||||
interaction: async (interaction: ChatInputCommandInteraction, client: Client) => {
|
||||
interaction: async (
|
||||
interaction: ChatInputCommandInteraction,
|
||||
client: Client
|
||||
) => {
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
const desired_command = interaction.options.getString(client
|
||||
.locales
|
||||
const desired_command = interaction.options.getString(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? '');
|
||||
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? ""
|
||||
);
|
||||
|
||||
// If a command isn't specified
|
||||
if (!desired_command) {
|
||||
|
@ -52,7 +76,7 @@ export default {
|
|||
client.commands.categories.forEach((commands_name, category) => {
|
||||
const commands = commands_name.reduce((data, command_name) => {
|
||||
return data + `\`/${command_name}\`, `;
|
||||
}, '');
|
||||
}, "");
|
||||
|
||||
fields.push({
|
||||
name: category.capitalize() + ` (${commands_name.length})`,
|
||||
|
@ -61,13 +85,15 @@ export default {
|
|||
});
|
||||
|
||||
// Sends a list of commands sorted into categories
|
||||
return interaction.reply({ embeds: [
|
||||
return interaction.reply({
|
||||
embeds: [
|
||||
new EmbedBuilder()
|
||||
.setColor(Colors.Blurple)
|
||||
.setTitle(loc.get('c_help1'))
|
||||
.setDescription(loc.get('c_help2'))
|
||||
.setTitle(loc.get("c_help1"))
|
||||
.setDescription(loc.get("c_help2"))
|
||||
.addFields(fields),
|
||||
] });
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
// If a command is specified
|
||||
|
@ -76,23 +102,25 @@ export default {
|
|||
if (!command) {
|
||||
// Command don't exist
|
||||
return interaction.reply({
|
||||
content: `${loc.get('c_help3')} \`${desired_command}\``,
|
||||
content: `${loc.get("c_help3")} \`${desired_command}\``,
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
||||
// Send information about the command
|
||||
return interaction.reply({ embeds: [
|
||||
return interaction.reply({
|
||||
embeds: [
|
||||
new EmbedBuilder()
|
||||
.setColor(Colors.Blurple)
|
||||
.setTitle('`/' + command.data.name + '`')
|
||||
.setTitle("`/" + command.data.name + "`")
|
||||
.setDescription(
|
||||
// Loads the description
|
||||
// according to the user's locals
|
||||
command.data.description_localizations
|
||||
?.[interaction.locale as Locale]
|
||||
?? command.data.description
|
||||
command.data.description_localizations?.[
|
||||
interaction.locale as Locale
|
||||
] ?? command.data.description
|
||||
),
|
||||
] });
|
||||
],
|
||||
});
|
||||
},
|
||||
};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { SlashCommandBuilder } from '@discordjs/builders';
|
||||
import { ChatInputCommandInteraction, Client, Message } from 'discord.js';
|
||||
import { getLocale, getLocalizations } from '../../utils/locales';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import { SlashCommandBuilder } from "@discordjs/builders";
|
||||
import { ChatInputCommandInteraction, Client, Message } from "discord.js";
|
||||
import { getLocale, getLocalizations } from "../../utils/locales";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
|
||||
export default {
|
||||
scope: () => [],
|
||||
|
@ -9,28 +9,35 @@ export default {
|
|||
data: (client: Client) => {
|
||||
const filename = getFilename(__filename);
|
||||
return new SlashCommandBuilder()
|
||||
.setName(
|
||||
filename.toLowerCase())
|
||||
.setDescription(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? '')
|
||||
.setName(filename.toLowerCase())
|
||||
.setDescription(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_name`, true))
|
||||
getLocalizations(client, `c_${filename}_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_desc`)
|
||||
);
|
||||
},
|
||||
|
||||
interaction: async (interaction: ChatInputCommandInteraction, client: Client) => {
|
||||
interaction: async (
|
||||
interaction: ChatInputCommandInteraction,
|
||||
client: Client
|
||||
) => {
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
|
||||
const sent = await interaction.reply({
|
||||
content: 'Pinging...',
|
||||
const sent = (await interaction.reply({
|
||||
content: "Pinging...",
|
||||
fetchReply: true,
|
||||
}) as Message;
|
||||
})) as Message;
|
||||
|
||||
interaction.editReply(
|
||||
`${loc?.get('c_ping1')}: \
|
||||
`${loc?.get("c_ping1")}: \
|
||||
${sent.createdTimestamp - interaction.createdTimestamp}ms
|
||||
${loc?.get('c_ping2')}: ${client.ws.ping}ms.`);
|
||||
${loc?.get("c_ping2")}: ${client.ws.ping}ms.`
|
||||
);
|
||||
},
|
||||
};
|
||||
|
|
|
@ -1,115 +1,142 @@
|
|||
import { SlashCommandBuilder } from '@discordjs/builders';
|
||||
import { ChannelType, Client, Colors, CommandInteraction, EmbedBuilder } from 'discord.js';
|
||||
import '../../modules/string';
|
||||
import { getLocale, getLocalizations } from '../../utils/locales';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import { SlashCommandBuilder } from "@discordjs/builders";
|
||||
import {
|
||||
ChannelType,
|
||||
Client,
|
||||
Colors,
|
||||
CommandInteraction,
|
||||
EmbedBuilder,
|
||||
} from "discord.js";
|
||||
import "../../modules/string";
|
||||
import { getLocale, getLocalizations } from "../../utils/locales";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
|
||||
export default {
|
||||
scope: () => ['807244911350906920'],
|
||||
scope: () => ["807244911350906920"],
|
||||
|
||||
data: (client: Client) => {
|
||||
const filename = getFilename(__filename);
|
||||
return new SlashCommandBuilder()
|
||||
.setName(
|
||||
filename.toLowerCase())
|
||||
.setDescription(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? '')
|
||||
return (
|
||||
new SlashCommandBuilder()
|
||||
.setName(filename.toLowerCase())
|
||||
.setDescription(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_name`, true))
|
||||
getLocalizations(client, `c_${filename}_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_desc`))
|
||||
getLocalizations(client, `c_${filename}_desc`)
|
||||
)
|
||||
|
||||
// Command option
|
||||
.addStringOption(option => option
|
||||
.setName(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_name`) ?? '')
|
||||
.setDescription(client.locales.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_desc`) ?? '')
|
||||
.addStringOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_name`) ?? ""
|
||||
)
|
||||
.setDescription(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${filename}_opt1_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_opt1_name`, true))
|
||||
getLocalizations(client, `c_${filename}_opt1_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_opt1_desc`))
|
||||
getLocalizations(client, `c_${filename}_opt1_desc`)
|
||||
)
|
||||
)
|
||||
);
|
||||
},
|
||||
|
||||
interaction: async (interaction: CommandInteraction, client: Client) => {
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
const desired_cat = interaction.options.get(client
|
||||
.locales
|
||||
const desired_cat = interaction.options.get(
|
||||
client.locales
|
||||
.get(client.config.default_lang)
|
||||
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? '')?.value as string;
|
||||
?.get(`c_${getFilename(__filename)}_opt1_name`) ?? ""
|
||||
)?.value as string;
|
||||
|
||||
// If a category isn't specified
|
||||
if (!desired_cat) {
|
||||
|
||||
// Sends a list of commands sorted into categories
|
||||
return interaction.reply({
|
||||
embeds: [
|
||||
new EmbedBuilder()
|
||||
.setColor(Colors.Blurple)
|
||||
.setTitle(loc.get('c_prep1'))
|
||||
.setDescription(loc.get('c_prep2')),
|
||||
.setTitle(loc.get("c_prep1"))
|
||||
.setDescription(loc.get("c_prep2")),
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
// If a category is specified
|
||||
const allowedCategories = ['L1', 'L2', 'L3', 'M1', 'M2'];
|
||||
const allowedCategories = ["L1", "L2", "L3", "M1", "M2"];
|
||||
const channel = allowedCategories.includes(desired_cat);
|
||||
if (!channel) {
|
||||
// Category doesn't exist or is not allowed
|
||||
return interaction.reply({
|
||||
content: `${loc.get('c_prep3')} \`${desired_cat}\``,
|
||||
content: `${loc.get("c_prep3")} \`${desired_cat}\``,
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
||||
// Send information about the command
|
||||
const allChannel = interaction.guild?.channels.fetch();
|
||||
allChannel?.then(channel_guild => {
|
||||
const cat_to_prep = channel_guild.filter(chan => chan?.type == ChannelType.GuildCategory).filter(chan => chan?.name == desired_cat);
|
||||
const cat_to_prep_id = cat_to_prep.map(cat => cat?.id);
|
||||
const cat_to_prep_name = cat_to_prep.map(cat => cat?.name);
|
||||
allChannel?.then((channel_guild) => {
|
||||
const cat_to_prep = channel_guild
|
||||
.filter((chan) => chan?.type == ChannelType.GuildCategory)
|
||||
.filter((chan) => chan?.name == desired_cat);
|
||||
const cat_to_prep_id = cat_to_prep.map((cat) => cat?.id);
|
||||
const cat_to_prep_name = cat_to_prep.map((cat) => cat?.name);
|
||||
|
||||
// console.log(cat_to_prep);
|
||||
const all_channel_desired = channel_guild.filter(chan => chan?.type == 0).filter(chan => chan?.parentId == cat_to_prep_id[0]);
|
||||
const all_channel_desired_name = all_channel_desired.map(c_d => c_d?.name);
|
||||
const all_channel_desired = channel_guild
|
||||
.filter((chan) => chan?.type == 0)
|
||||
.filter((chan) => chan?.parentId == cat_to_prep_id[0]);
|
||||
const all_channel_desired_name = all_channel_desired.map(
|
||||
(c_d) => c_d?.name
|
||||
);
|
||||
|
||||
let desc = '';
|
||||
let desc = "";
|
||||
|
||||
const general = 'général';
|
||||
if (all_channel_desired_name.filter(cdn => cdn == general).length == 0) {
|
||||
const general = "général";
|
||||
if (
|
||||
all_channel_desired_name.filter((cdn) => cdn == general).length == 0
|
||||
) {
|
||||
interaction.guild?.channels.create({
|
||||
name: general,
|
||||
type: 0,
|
||||
parent: cat_to_prep_id[0],
|
||||
});
|
||||
desc = general + loc.get('c_prep5') + '\n';
|
||||
desc = general + loc.get("c_prep5") + "\n";
|
||||
}
|
||||
|
||||
const info = 'informations';
|
||||
if (all_channel_desired_name.filter(cdn => cdn == info).length == 0) {
|
||||
const info = "informations";
|
||||
if (all_channel_desired_name.filter((cdn) => cdn == info).length == 0) {
|
||||
interaction.guild?.channels.create({
|
||||
name: info,
|
||||
type: 0,
|
||||
parent: cat_to_prep_id[0],
|
||||
});
|
||||
|
||||
desc += '`' + info + '` ' + loc.get('c_prep5') + '\n';
|
||||
desc += "`" + info + "` " + loc.get("c_prep5") + "\n";
|
||||
}
|
||||
|
||||
if (desc == '') {
|
||||
desc = loc.get('c_prep6');
|
||||
if (desc == "") {
|
||||
desc = loc.get("c_prep6");
|
||||
}
|
||||
|
||||
return interaction.reply({
|
||||
embeds: [
|
||||
new EmbedBuilder()
|
||||
.setColor(Colors.Blurple)
|
||||
.setTitle(loc.get('c_prep4') + cat_to_prep_name)
|
||||
.setDescription(
|
||||
desc,
|
||||
),
|
||||
.setTitle(loc.get("c_prep4") + cat_to_prep_name)
|
||||
.setDescription(desc),
|
||||
],
|
||||
});
|
||||
});
|
||||
|
|
|
@ -1,10 +1,28 @@
|
|||
import { ModalActionRowComponentBuilder, SlashCommandBuilder } from '@discordjs/builders';
|
||||
import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChatInputCommandInteraction, Client, ModalBuilder, TextInputBuilder, TextInputStyle } from 'discord.js';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { collect } from '../../buttons/loader';
|
||||
import { getLocale, getLocalizations } from '../../utils/locales';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import { checkOwnershipReminder, deleteReminder, embedListReminders, getReminderInfo, newReminder } from '../../utils/reminder';
|
||||
import {
|
||||
ModalActionRowComponentBuilder,
|
||||
SlashCommandBuilder,
|
||||
} from "@discordjs/builders";
|
||||
import {
|
||||
ActionRowBuilder,
|
||||
ButtonBuilder,
|
||||
ButtonStyle,
|
||||
ChatInputCommandInteraction,
|
||||
Client,
|
||||
ModalBuilder,
|
||||
TextInputBuilder,
|
||||
TextInputStyle,
|
||||
} from "discord.js";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
import { collect } from "../../buttons/loader";
|
||||
import { getLocale, getLocalizations } from "../../utils/locales";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
import {
|
||||
checkOwnershipReminder,
|
||||
deleteReminder,
|
||||
embedListReminders,
|
||||
getReminderInfo,
|
||||
newReminder,
|
||||
} from "../../utils/reminder";
|
||||
|
||||
export default {
|
||||
scope: () => [],
|
||||
|
@ -16,150 +34,165 @@ export default {
|
|||
return;
|
||||
}
|
||||
|
||||
return new SlashCommandBuilder()
|
||||
return (
|
||||
new SlashCommandBuilder()
|
||||
// Command
|
||||
.setName(filename.toLowerCase())
|
||||
.setDescription(loc_default.get(`c_${filename}_desc`) ?? '')
|
||||
.setDescription(loc_default.get(`c_${filename}_desc`) ?? "")
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_name`, true)
|
||||
).setDescriptionLocalizations(
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_desc`)
|
||||
)
|
||||
|
||||
// New reminder
|
||||
.addSubcommand(subcommand => subcommand
|
||||
.addSubcommand((subcommand) =>
|
||||
subcommand
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub1_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub1_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
loc_default.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? ""
|
||||
)
|
||||
.setDescription(loc_default.get(`c_${filename}_sub1_desc`) ?? "")
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub1_name`, true)
|
||||
).setDescriptionLocalizations(
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub1_desc`)
|
||||
)
|
||||
|
||||
// Specified Time
|
||||
.addStringOption(option => option
|
||||
.addStringOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub1_opt1_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub1_opt1_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
getLocalizations(
|
||||
client,
|
||||
`c_${filename}_sub1_opt1_name`,
|
||||
true
|
||||
loc_default
|
||||
.get(`c_${filename}_sub1_opt1_name`)
|
||||
?.toLowerCase() ?? ""
|
||||
)
|
||||
).setDescriptionLocalizations(
|
||||
.setDescription(
|
||||
loc_default.get(`c_${filename}_sub1_opt1_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub1_opt1_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub1_opt1_desc`)
|
||||
)
|
||||
)
|
||||
|
||||
// Specified message (not required)
|
||||
.addStringOption(option => option
|
||||
.addStringOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub1_opt2_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub1_opt2_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
getLocalizations(
|
||||
client,
|
||||
`c_${filename}_sub1_opt2_name`,
|
||||
true
|
||||
loc_default
|
||||
.get(`c_${filename}_sub1_opt2_name`)
|
||||
?.toLowerCase() ?? ""
|
||||
)
|
||||
).setDescriptionLocalizations(
|
||||
.setDescription(
|
||||
loc_default.get(`c_${filename}_sub1_opt2_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub1_opt2_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub1_opt2_desc`)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
// List reminders
|
||||
.addSubcommand(subcommand => subcommand
|
||||
.addSubcommand((subcommand) =>
|
||||
subcommand
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub2_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub2_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
loc_default.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? ""
|
||||
)
|
||||
.setDescription(loc_default.get(`c_${filename}_sub2_desc`) ?? "")
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub2_name`, true)
|
||||
).setDescriptionLocalizations(
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub2_desc`)
|
||||
)
|
||||
|
||||
// User
|
||||
.addUserOption(option => option
|
||||
.addUserOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub2_opt1_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub2_opt1_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
getLocalizations(
|
||||
client,
|
||||
`c_${filename}_sub2_opt1_name`,
|
||||
true
|
||||
loc_default
|
||||
.get(`c_${filename}_sub2_opt1_name`)
|
||||
?.toLowerCase() ?? ""
|
||||
)
|
||||
).setDescriptionLocalizations(
|
||||
.setDescription(
|
||||
loc_default.get(`c_${filename}_sub2_opt1_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub2_opt1_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub2_opt1_desc`)
|
||||
)
|
||||
)
|
||||
|
||||
// Page
|
||||
.addIntegerOption(option => option
|
||||
.addIntegerOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub2_opt2_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub2_opt2_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
getLocalizations(
|
||||
client,
|
||||
`c_${filename}_sub2_opt2_name`,
|
||||
true
|
||||
loc_default
|
||||
.get(`c_${filename}_sub2_opt2_name`)
|
||||
?.toLowerCase() ?? ""
|
||||
)
|
||||
).setDescriptionLocalizations(
|
||||
.setDescription(
|
||||
loc_default.get(`c_${filename}_sub2_opt2_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub2_opt2_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub2_opt2_desc`)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
// Delete a reminder
|
||||
.addSubcommand(subcommand => subcommand
|
||||
.addSubcommand((subcommand) =>
|
||||
subcommand
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub3_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub3_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
loc_default.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? ""
|
||||
)
|
||||
.setDescription(loc_default.get(`c_${filename}_sub3_desc`) ?? "")
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub3_name`, true)
|
||||
).setDescriptionLocalizations(
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub3_desc`)
|
||||
)
|
||||
|
||||
// ID
|
||||
.addIntegerOption(option => option
|
||||
.addIntegerOption((option) =>
|
||||
option
|
||||
.setName(
|
||||
loc_default.get(`c_${filename}_sub3_opt1_name`)
|
||||
?.toLowerCase() ?? ''
|
||||
).setDescription(
|
||||
loc_default.get(`c_${filename}_sub3_opt1_desc`) ?? ''
|
||||
).setNameLocalizations(
|
||||
getLocalizations(
|
||||
client,
|
||||
`c_${filename}_sub3_opt1_name`,
|
||||
true
|
||||
loc_default
|
||||
.get(`c_${filename}_sub3_opt1_name`)
|
||||
?.toLowerCase() ?? ""
|
||||
)
|
||||
).setDescriptionLocalizations(
|
||||
.setDescription(
|
||||
loc_default.get(`c_${filename}_sub3_opt1_desc`) ?? ""
|
||||
)
|
||||
.setNameLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub3_opt1_name`, true)
|
||||
)
|
||||
.setDescriptionLocalizations(
|
||||
getLocalizations(client, `c_${filename}_sub3_opt1_desc`)
|
||||
).setRequired(true)
|
||||
),
|
||||
)
|
||||
.setRequired(true)
|
||||
)
|
||||
)
|
||||
);
|
||||
},
|
||||
|
||||
interaction: async (interaction: ChatInputCommandInteraction, client: Client) => {
|
||||
interaction: async (
|
||||
interaction: ChatInputCommandInteraction,
|
||||
client: Client
|
||||
) => {
|
||||
const loc_default = client.locales.get(client.config.default_lang);
|
||||
const filename = getFilename(__filename);
|
||||
const loc = getLocale(client, interaction.locale);
|
||||
|
@ -167,96 +200,133 @@ export default {
|
|||
const subcommand = interaction.options.getSubcommand();
|
||||
switch (subcommand) {
|
||||
// New reminder
|
||||
case loc_default?.get(`c_${filename}_sub1_name`)
|
||||
?.toLowerCase() ?? '': {
|
||||
|
||||
case loc_default?.get(`c_${filename}_sub1_name`)?.toLowerCase() ?? "": {
|
||||
// If time is already renseigned
|
||||
const time = interaction.options.getString(loc_default?.get(`c_${filename}_sub1_opt1_name`) as string);
|
||||
const time = interaction.options.getString(
|
||||
loc_default?.get(`c_${filename}_sub1_opt1_name`) as string
|
||||
);
|
||||
if (time != null) {
|
||||
// Use the cli because we already have enough data
|
||||
return newReminder(client, time, {
|
||||
locale: interaction.locale,
|
||||
message: interaction.options.getString(loc_default?.get(`c_${filename}_sub1_opt2_name`) as string),
|
||||
message: interaction.options.getString(
|
||||
loc_default?.get(`c_${filename}_sub1_opt2_name`) as string
|
||||
),
|
||||
createdAt: interaction.createdAt.getTime(),
|
||||
channelId: interaction.channelId,
|
||||
userId: interaction.user.id,
|
||||
guildId: interaction.guildId,
|
||||
}).then((msg) => interaction.reply({
|
||||
}).then((msg) =>
|
||||
interaction.reply({
|
||||
content: msg as string,
|
||||
ephemeral: true,
|
||||
}));
|
||||
})
|
||||
);
|
||||
} else {
|
||||
// Show modal to user to get at least the time
|
||||
const modal = new ModalBuilder()
|
||||
.setCustomId('reminderGUI')
|
||||
.setCustomId("reminderGUI")
|
||||
.setTitle(loc.get(`c_${filename}_name`).capitalize());
|
||||
|
||||
const timeGUI = new TextInputBuilder()
|
||||
.setCustomId('reminderGUI-time')
|
||||
.setCustomId("reminderGUI-time")
|
||||
.setLabel(loc.get(`c_${filename}_sub1_opt1_name`).capitalize())
|
||||
.setStyle(TextInputStyle.Short)
|
||||
.setPlaceholder('1h')
|
||||
.setPlaceholder("1h")
|
||||
.setRequired(true);
|
||||
|
||||
const messageGUI = new TextInputBuilder()
|
||||
.setCustomId('reminderGUI-message')
|
||||
.setCustomId("reminderGUI-message")
|
||||
.setLabel(loc.get(`c_${filename}_sub1_opt2_name`).capitalize())
|
||||
.setStyle(TextInputStyle.Paragraph)
|
||||
.setPlaceholder(loc.get(`c_${filename}_sub1_opt2_desc`))
|
||||
.setRequired(false);
|
||||
|
||||
modal.addComponents(
|
||||
new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(timeGUI),
|
||||
new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(messageGUI)
|
||||
new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
|
||||
timeGUI
|
||||
),
|
||||
new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
|
||||
messageGUI
|
||||
)
|
||||
);
|
||||
|
||||
return interaction.showModal(modal);
|
||||
}
|
||||
}
|
||||
// List reminders
|
||||
case loc_default?.get(`c_${filename}_sub2_name`)
|
||||
?.toLowerCase() ?? '': {
|
||||
case loc_default?.get(`c_${filename}_sub2_name`)?.toLowerCase() ?? "": {
|
||||
// Which user to show
|
||||
let user = interaction.options.getUser(loc_default?.get(`c_${filename}_sub2_opt1_name`) as string);
|
||||
let user = interaction.options.getUser(
|
||||
loc_default?.get(`c_${filename}_sub2_opt1_name`) as string
|
||||
);
|
||||
if (user == null) {
|
||||
user = interaction.user;
|
||||
}
|
||||
|
||||
const page = interaction.options.getInteger(loc_default?.get(`c_${filename}_sub2_opt2_name`) as string) ?? 1;
|
||||
const list = await embedListReminders(client, user, interaction.guildId, page, interaction.locale);
|
||||
const page =
|
||||
interaction.options.getInteger(
|
||||
loc_default?.get(`c_${filename}_sub2_opt2_name`) as string
|
||||
) ?? 1;
|
||||
const list = await embedListReminders(
|
||||
client,
|
||||
user,
|
||||
interaction.guildId,
|
||||
page,
|
||||
interaction.locale
|
||||
);
|
||||
|
||||
const idPrec = 'reminderList-prec_' + uuidv4();
|
||||
const idNext = 'reminderList-next_' + uuidv4();
|
||||
const idPrec = "reminderList-prec_" + uuidv4();
|
||||
const idNext = "reminderList-next_" + uuidv4();
|
||||
const row = new ActionRowBuilder<ButtonBuilder>()
|
||||
.addComponents(
|
||||
new ButtonBuilder()
|
||||
.setCustomId(idPrec)
|
||||
.setLabel(loc.get(`c_${filename}12`))
|
||||
.setStyle(ButtonStyle.Primary))
|
||||
.setStyle(ButtonStyle.Primary)
|
||||
)
|
||||
.addComponents(
|
||||
new ButtonBuilder()
|
||||
.setCustomId(idNext)
|
||||
.setLabel(loc.get(`c_${filename}13`))
|
||||
.setStyle(ButtonStyle.Primary),
|
||||
.setStyle(ButtonStyle.Primary)
|
||||
);
|
||||
|
||||
// Buttons interactions
|
||||
collect(client, interaction, idPrec);
|
||||
collect(client, interaction, idNext);
|
||||
|
||||
return await interaction.reply({ ephemeral: true, embeds: [list], components: [row] });
|
||||
return await interaction.reply({
|
||||
ephemeral: true,
|
||||
embeds: [list],
|
||||
components: [row],
|
||||
});
|
||||
}
|
||||
// Delete a reminder
|
||||
case loc_default?.get(`c_${filename}_sub3_name`)
|
||||
?.toLowerCase() ?? '': {
|
||||
const id = interaction.options.getInteger(loc_default?.get(`c_${filename}_sub3_opt1_name`) as string);
|
||||
case loc_default?.get(`c_${filename}_sub3_name`)?.toLowerCase() ?? "": {
|
||||
const id = interaction.options.getInteger(
|
||||
loc_default?.get(`c_${filename}_sub3_opt1_name`) as string
|
||||
);
|
||||
if (id === null) {
|
||||
return interaction.reply({ content: loc.get(`c_${filename}2`), ephemeral: true });
|
||||
return interaction.reply({
|
||||
content: loc.get(`c_${filename}2`),
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
||||
// Check if the ID exists and belongs to the user
|
||||
if (await checkOwnershipReminder(client, id, interaction.user.id, interaction.guildId ?? '0')) {
|
||||
return interaction.reply({ content: loc.get(`c_${filename}3`), ephemeral: true });
|
||||
if (
|
||||
await checkOwnershipReminder(
|
||||
client,
|
||||
id,
|
||||
interaction.user.id,
|
||||
interaction.guildId ?? "0"
|
||||
)
|
||||
) {
|
||||
return interaction.reply({
|
||||
content: loc.get(`c_${filename}3`),
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
||||
// Stop timeout
|
||||
|
@ -264,9 +334,16 @@ export default {
|
|||
clearTimeout(reminderInfo.timeout_id);
|
||||
|
||||
// Delete from database
|
||||
return deleteReminder(client, reminderInfo.creation_date, reminderInfo.user_id)
|
||||
.then(() => interaction.reply({ content: `Reminder **#${id}** supprimé !`, ephemeral: true }));
|
||||
|
||||
return deleteReminder(
|
||||
client,
|
||||
reminderInfo.creation_date,
|
||||
reminderInfo.user_id
|
||||
).then(() =>
|
||||
interaction.reply({
|
||||
content: `Reminder **#${id}** supprimé !`,
|
||||
ephemeral: true,
|
||||
})
|
||||
);
|
||||
}
|
||||
default: {
|
||||
console.error(`${__filename}: unknown subcommand (${subcommand})`);
|
||||
|
|
|
@ -1,17 +1,25 @@
|
|||
import { Client } from 'discord.js';
|
||||
import { logStart } from '../../utils/misc';
|
||||
import { dbReminder, deleteReminder, infoReminder, OptionReminder, sendReminder, setTimeoutReminder, updateReminder } from '../../utils/reminder';
|
||||
import { Client } from "discord.js";
|
||||
import { logStart } from "../../utils/misc";
|
||||
import {
|
||||
dbReminder,
|
||||
deleteReminder,
|
||||
infoReminder,
|
||||
OptionReminder,
|
||||
sendReminder,
|
||||
setTimeoutReminder,
|
||||
updateReminder,
|
||||
} from "../../utils/reminder";
|
||||
|
||||
export const once = true;
|
||||
|
||||
/** https://discord.js.org/#/docs/discord.js/main/class/Client?scrollTo=e-ready */
|
||||
export default async (client: Client) => {
|
||||
console.log(logStart('Connection', true));
|
||||
console.log(logStart("Connection", true));
|
||||
|
||||
// Restart all the timeout about reminders here
|
||||
new Promise((ok, ko) => {
|
||||
// Fetch all reminders
|
||||
client.db.all('SELECT * FROM reminder', [], (err, row) => {
|
||||
client.db.all("SELECT * FROM reminder", [], (err, row) => {
|
||||
if (err) {
|
||||
ko(err);
|
||||
}
|
||||
|
@ -19,7 +27,8 @@ export default async (client: Client) => {
|
|||
// Send all the current reminders
|
||||
ok(row);
|
||||
});
|
||||
}).then((data) => {
|
||||
})
|
||||
.then((data) => {
|
||||
const now = Date.now();
|
||||
(data as dbReminder[]).forEach((element) => {
|
||||
const info = {
|
||||
|
@ -33,7 +42,11 @@ export default async (client: Client) => {
|
|||
|
||||
if (element.expiration_date <= now) {
|
||||
// Reminder expired
|
||||
deleteReminder(client, element.creation_date, `${element.user_id}`).then((res) => {
|
||||
deleteReminder(
|
||||
client,
|
||||
element.creation_date,
|
||||
`${element.user_id}`
|
||||
).then((res) => {
|
||||
if (res != true) {
|
||||
throw res;
|
||||
}
|
||||
|
@ -42,7 +55,12 @@ export default async (client: Client) => {
|
|||
sendReminder(client, info, element.option_id as OptionReminder);
|
||||
} else {
|
||||
// Restart timeout
|
||||
const timeoutId = setTimeoutReminder(client, info, element.option_id, (element.expiration_date - now) / 1000);
|
||||
const timeoutId = setTimeoutReminder(
|
||||
client,
|
||||
info,
|
||||
element.option_id,
|
||||
(element.expiration_date - now) / 1000
|
||||
);
|
||||
|
||||
// Update timeout in database
|
||||
element.timeout_id = String(timeoutId);
|
||||
|
@ -53,7 +71,8 @@ export default async (client: Client) => {
|
|||
});
|
||||
}
|
||||
});
|
||||
}).catch(err => {
|
||||
})
|
||||
.catch((err) => {
|
||||
throw err;
|
||||
});
|
||||
};
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { Client, Interaction, InteractionType } from 'discord.js';
|
||||
import { getLocale } from '../../utils/locales';
|
||||
import { Client, Interaction, InteractionType } from "discord.js";
|
||||
import { getLocale } from "../../utils/locales";
|
||||
|
||||
/** https://discord.js.org/#/docs/discord.js/main/class/Client?scrollTo=e-interactionCreate */
|
||||
export default (interaction: Interaction, client: Client) => {
|
||||
|
@ -9,7 +9,7 @@ export default (interaction: Interaction, client: Client) => {
|
|||
const command = client.commands.list.get(interaction.commandName);
|
||||
if (!command) {
|
||||
return interaction.reply({
|
||||
content: loc.get('e_interacreate_no_command'),
|
||||
content: loc.get("e_interacreate_no_command"),
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ export default (interaction: Interaction, client: Client) => {
|
|||
const modal = client.modals.list.get(interaction.customId);
|
||||
if (!modal) {
|
||||
return interaction.reply({
|
||||
content: loc.get('e_interacreate_no_modal'),
|
||||
content: loc.get("e_interacreate_no_modal"),
|
||||
ephemeral: true,
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,30 +1,31 @@
|
|||
import { Client } from 'discord.js';
|
||||
import { readdir } from 'fs/promises';
|
||||
import { Client } from "discord.js";
|
||||
import { readdir } from "fs/promises";
|
||||
|
||||
/** Load all the events. */
|
||||
export default async (client: Client) => {
|
||||
const events_categories = (await readdir(__dirname))
|
||||
.filter(element => !element.endsWith('.js') && !element.endsWith('.ts'));
|
||||
const events_categories = (await readdir(__dirname)).filter(
|
||||
(element) => !element.endsWith(".js") && !element.endsWith(".ts")
|
||||
);
|
||||
|
||||
events_categories.forEach(async event_category => {
|
||||
events_categories.forEach(async (event_category) => {
|
||||
// Retrieve events
|
||||
const events = await readdir(`${__dirname}/${event_category}`);
|
||||
|
||||
// Load them into the client
|
||||
Promise.all(
|
||||
events.map(async event_file => {
|
||||
events.map(async (event_file) => {
|
||||
const { once, default: execute } = await import(
|
||||
`../events/${event_category}/${event_file}`
|
||||
);
|
||||
|
||||
// Remove extension
|
||||
// TODO: use utils functions
|
||||
const event_type_ext = event_file.split('.');
|
||||
const event_type_ext = event_file.split(".");
|
||||
const ext = event_type_ext.pop();
|
||||
if (!(ext === 'js' || ext === 'ts')) {
|
||||
if (!(ext === "js" || ext === "ts")) {
|
||||
throw `Unknown file in ${event_category}: ${event_file}`;
|
||||
}
|
||||
const event_type = event_type_ext.join('.');
|
||||
const event_type = event_type_ext.join(".");
|
||||
|
||||
if (once) {
|
||||
return client.once(event_type, (...args) => {
|
||||
|
@ -34,7 +35,7 @@ export default async (client: Client) => {
|
|||
return client.on(event_type, (...args) => {
|
||||
execute(...args, client);
|
||||
});
|
||||
}),
|
||||
})
|
||||
);
|
||||
});
|
||||
};
|
||||
|
|
|
@ -1,7 +1,13 @@
|
|||
import { Client, GuildMember, Message, TextBasedChannel, EmbedBuilder } from 'discord.js';
|
||||
import { getLocale } from '../../utils/locales';
|
||||
import { isImage, userWithNickname } from '../../utils/misc';
|
||||
import { showDate } from '../../utils/time';
|
||||
import {
|
||||
Client,
|
||||
GuildMember,
|
||||
Message,
|
||||
TextBasedChannel,
|
||||
EmbedBuilder,
|
||||
} from "discord.js";
|
||||
import { getLocale } from "../../utils/locales";
|
||||
import { isImage, userWithNickname } from "../../utils/misc";
|
||||
import { showDate } from "../../utils/time";
|
||||
|
||||
/** https://discord.js.org/#/docs/discord.js/main/class/Client?scrollTo=e-messageCreate */
|
||||
export default async (message: Message, client: Client) => {
|
||||
|
@ -22,8 +28,9 @@ export default async (message: Message, client: Client) => {
|
|||
}
|
||||
|
||||
/* Citation */
|
||||
const regex = 'https://(?:canary\\.|ptb\\.)?discord(?:app)?\\.com/channels/(\\d{17,19})/(\\d{17,19})/(\\d{17,19})';
|
||||
const urls = message.content.match(new RegExp(regex, 'g'));
|
||||
const regex =
|
||||
"https://(?:canary\\.|ptb\\.)?discord(?:app)?\\.com/channels/(\\d{17,19})/(\\d{17,19})/(\\d{17,19})";
|
||||
const urls = message.content.match(new RegExp(regex, "g"));
|
||||
|
||||
// Ignore message if there is no URLs
|
||||
if (!urls) {
|
||||
|
@ -32,24 +39,27 @@ export default async (message: Message, client: Client) => {
|
|||
|
||||
const messages = (
|
||||
await Promise.all(
|
||||
urls.reduce(
|
||||
(data: {
|
||||
urls
|
||||
.reduce(
|
||||
(
|
||||
data: {
|
||||
message_id: string;
|
||||
channel: TextBasedChannel;
|
||||
}[] = [], match) => {
|
||||
const [,
|
||||
guild_id,
|
||||
channel_id,
|
||||
message_id,
|
||||
] = new RegExp(regex).exec(match) as RegExpExecArray;
|
||||
}[] = [],
|
||||
match
|
||||
) => {
|
||||
const [, guild_id, channel_id, message_id] = new RegExp(regex).exec(
|
||||
match
|
||||
) as RegExpExecArray;
|
||||
|
||||
// If message posted in another guild
|
||||
if (guild_id !== message.guild?.id) {
|
||||
return data;
|
||||
}
|
||||
|
||||
const channel =
|
||||
message.guild.channels.cache.get(channel_id) as TextBasedChannel;
|
||||
const channel = message.guild.channels.cache.get(
|
||||
channel_id
|
||||
) as TextBasedChannel;
|
||||
|
||||
// If channel doesn't exist in the guild and isn't text
|
||||
if (!channel) {
|
||||
|
@ -59,16 +69,18 @@ export default async (message: Message, client: Client) => {
|
|||
data.push({ message_id, channel });
|
||||
|
||||
return data;
|
||||
}, []
|
||||
).map(async ({ message_id, channel }) => {
|
||||
},
|
||||
[]
|
||||
)
|
||||
.map(async ({ message_id, channel }) => {
|
||||
const quoted_message = await channel.messages
|
||||
.fetch(message_id)
|
||||
.catch(() => undefined);
|
||||
|
||||
// If message doesn't exist or empty
|
||||
if (!quoted_message || (
|
||||
!quoted_message.content &&
|
||||
quoted_message.attachments.size == 0)
|
||||
if (
|
||||
!quoted_message ||
|
||||
(!quoted_message.content && quoted_message.attachments.size == 0)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
@ -76,37 +88,37 @@ export default async (message: Message, client: Client) => {
|
|||
return quoted_message;
|
||||
})
|
||||
)
|
||||
)
|
||||
// Remove undefined elements
|
||||
).filter(Boolean);
|
||||
.filter(Boolean);
|
||||
|
||||
const loc = getLocale(client, client.config.default_lang);
|
||||
|
||||
// Remove duplicates then map the quoted posts
|
||||
[...new Set(messages)].map(quoted_post => {
|
||||
const embed = new EmbedBuilder()
|
||||
.setColor('#2f3136')
|
||||
.setAuthor({
|
||||
name: 'Citation',
|
||||
[...new Set(messages)].map((quoted_post) => {
|
||||
const embed = new EmbedBuilder().setColor("#2f3136").setAuthor({
|
||||
name: "Citation",
|
||||
iconURL: quoted_post?.author.displayAvatarURL(),
|
||||
});
|
||||
|
||||
// Handle attachments
|
||||
if (quoted_post?.attachments.size !== 0) {
|
||||
if (quoted_post?.attachments.size === 1 && isImage(
|
||||
quoted_post.attachments.first()?.name as string
|
||||
)) {
|
||||
if (
|
||||
quoted_post?.attachments.size === 1 &&
|
||||
isImage(quoted_post.attachments.first()?.name as string)
|
||||
) {
|
||||
// Only contains one image
|
||||
embed.setImage(quoted_post.attachments.first()?.url as string);
|
||||
} else {
|
||||
// Contains more than one image and/or other files
|
||||
let files = '';
|
||||
quoted_post?.attachments.forEach(file => files +=
|
||||
`[${file.name}](${file.url}), `
|
||||
let files = "";
|
||||
quoted_post?.attachments.forEach(
|
||||
(file) => (files += `[${file.name}](${file.url}), `)
|
||||
);
|
||||
embed.addFields({
|
||||
// TODO: Don't pluralize when there is only one file.
|
||||
// TODO: Locales
|
||||
name: 'Fichiers joints',
|
||||
name: "Fichiers joints",
|
||||
// TODO: Check if don't exceed char limit, if yes, split
|
||||
// files into multiples field.
|
||||
value: `${files.slice(0, -2)}.`,
|
||||
|
@ -115,7 +127,7 @@ export default async (message: Message, client: Client) => {
|
|||
}
|
||||
|
||||
// Description as post content
|
||||
embed.setDescription(quoted_post?.content ?? '');
|
||||
embed.setDescription(quoted_post?.content ?? "");
|
||||
|
||||
// Footer
|
||||
let footer = `Posté le ${showDate(
|
||||
|
@ -131,17 +143,13 @@ export default async (message: Message, client: Client) => {
|
|||
)}`;
|
||||
}
|
||||
|
||||
let author = 'Auteur';
|
||||
let author = "Auteur";
|
||||
if (message.author == quoted_post?.author) {
|
||||
author += ' & Citateur';
|
||||
author += " & Citateur";
|
||||
} else {
|
||||
footer += `\nCité par ${userWithNickname(
|
||||
message.member as GuildMember
|
||||
) ?? '?'} le ${showDate(
|
||||
client.config.default_lang,
|
||||
loc,
|
||||
message.createdAt
|
||||
)}`;
|
||||
footer += `\nCité par ${
|
||||
userWithNickname(message.member as GuildMember) ?? "?"
|
||||
} le ${showDate(client.config.default_lang, loc, message.createdAt)}`;
|
||||
}
|
||||
|
||||
embed.setFooter({
|
||||
|
@ -157,7 +165,7 @@ export default async (message: Message, client: Client) => {
|
|||
inline: true,
|
||||
},
|
||||
{
|
||||
name: 'Message',
|
||||
name: "Message",
|
||||
value: `${quoted_post?.channel} - [Lien Message](${quoted_post?.url})`,
|
||||
inline: true,
|
||||
}
|
||||
|
@ -165,7 +173,7 @@ export default async (message: Message, client: Client) => {
|
|||
|
||||
// Delete source message if no content when removing links
|
||||
if (
|
||||
!message.content.replace(new RegExp(regex, 'g'), '').trim() &&
|
||||
!message.content.replace(new RegExp(regex, "g"), "").trim() &&
|
||||
messages.length === urls.length &&
|
||||
!message.mentions.repliedUser
|
||||
) {
|
||||
|
|
40
src/index.ts
40
src/index.ts
|
@ -1,28 +1,28 @@
|
|||
import loadClient, { quit } from './utils/client';
|
||||
import loadEvents from './events/loader';
|
||||
import loadModals from './modals/loader';
|
||||
import loadButtons from './buttons/loader';
|
||||
import loadCommands from './commands/loader';
|
||||
import loadClient, { quit } from "./utils/client";
|
||||
import loadEvents from "./events/loader";
|
||||
import loadModals from "./modals/loader";
|
||||
import loadButtons from "./buttons/loader";
|
||||
import loadCommands from "./commands/loader";
|
||||
|
||||
import { logStart } from './utils/misc';
|
||||
import { logStart } from "./utils/misc";
|
||||
|
||||
/** Run the bot. */
|
||||
const run = async () => {
|
||||
console.log('Starting Botanique...');
|
||||
console.log("Starting Botanique...");
|
||||
|
||||
// Load .env if not in prod
|
||||
if (process.env.NODE_ENV !== 'production') {
|
||||
if (process.env.NODE_ENV !== "production") {
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
(await import('dotenv')).config({ path: './config/.env' });
|
||||
(await import("dotenv")).config({ path: "./config/.env" });
|
||||
}
|
||||
|
||||
// Client Discord.JS
|
||||
const client_name = 'Client';
|
||||
const client_name = "Client";
|
||||
await loadClient()
|
||||
.then(async client => {
|
||||
.then(async (client) => {
|
||||
// Events Discord.JS
|
||||
const events_name = 'Events';
|
||||
const events_name = "Events";
|
||||
await loadEvents(client)
|
||||
.then(() => console.log(logStart(events_name, true)))
|
||||
.catch((err) => {
|
||||
|
@ -34,7 +34,7 @@ const run = async () => {
|
|||
await client.login(client.config.token_discord);
|
||||
|
||||
// Modals Discord.JS
|
||||
const modals_name = 'Modals';
|
||||
const modals_name = "Modals";
|
||||
await loadModals(client)
|
||||
.then(() => console.log(logStart(modals_name, true)))
|
||||
.catch((err) => {
|
||||
|
@ -43,7 +43,7 @@ const run = async () => {
|
|||
});
|
||||
|
||||
// Buttons Discord.JS
|
||||
const buttons_name = 'Buttons';
|
||||
const buttons_name = "Buttons";
|
||||
await loadButtons(client)
|
||||
.then(() => console.log(logStart(buttons_name, true)))
|
||||
.catch((err) => {
|
||||
|
@ -52,7 +52,7 @@ const run = async () => {
|
|||
});
|
||||
|
||||
// Commands Slash Discord.JS
|
||||
const commands_name = 'Commands';
|
||||
const commands_name = "Commands";
|
||||
await loadCommands(client)
|
||||
.then(() => console.log(logStart(commands_name, true)))
|
||||
.catch((err) => {
|
||||
|
@ -61,13 +61,15 @@ const run = async () => {
|
|||
});
|
||||
|
||||
console.log(logStart(client_name, true));
|
||||
console.log(`Botanique "${client.user?.username}" v${client.config.version} started!`);
|
||||
console.log(
|
||||
`Botanique "${client.user?.username}" v${client.config.version} started!`
|
||||
);
|
||||
|
||||
// ^C
|
||||
process.on('SIGINT', () => quit(client));
|
||||
process.on("SIGINT", () => quit(client));
|
||||
|
||||
// Container force closed
|
||||
process.on('SIGTERM', () => quit(client));
|
||||
process.on("SIGTERM", () => quit(client));
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err);
|
||||
|
@ -75,4 +77,4 @@ const run = async () => {
|
|||
});
|
||||
};
|
||||
|
||||
run().catch(error => console.error(error));
|
||||
run().catch((error) => console.error(error));
|
||||
|
|
|
@ -1,27 +1,28 @@
|
|||
import { readdir } from 'fs/promises';
|
||||
import { removeExtension } from '../utils/misc';
|
||||
import { Client } from 'discord.js';
|
||||
import { readdir } from "fs/promises";
|
||||
import { removeExtension } from "../utils/misc";
|
||||
import { Client } from "discord.js";
|
||||
|
||||
export default async (client: Client) => {
|
||||
// Dossier des modals
|
||||
const modals_categories = (await readdir(__dirname))
|
||||
.filter(element => !element.endsWith('.js') && !element.endsWith('.ts'));
|
||||
const modals_categories = (await readdir(__dirname)).filter(
|
||||
(element) => !element.endsWith(".js") && !element.endsWith(".ts")
|
||||
);
|
||||
|
||||
await Promise.all(
|
||||
// For each categorie
|
||||
modals_categories.map(async modals_category => {
|
||||
modals_categories.map(async (modals_category) => {
|
||||
// Retrieve all the commands
|
||||
const modal_files = await readdir(`${__dirname}/${modals_category}`);
|
||||
|
||||
// Add the category to the collection for the help command
|
||||
client.modals.categories.set(
|
||||
modals_category,
|
||||
modal_files.map(removeExtension),
|
||||
modal_files.map(removeExtension)
|
||||
);
|
||||
|
||||
// Add the modal
|
||||
return Promise.all(
|
||||
modal_files.map(async modal_file => {
|
||||
modal_files.map(async (modal_file) => {
|
||||
const modal = (
|
||||
await import(`../modals/${modals_category}/${modal_file}`)
|
||||
).default;
|
||||
|
@ -29,8 +30,8 @@ export default async (client: Client) => {
|
|||
// Add it to the collection so the interaction will work
|
||||
client.modals.list.set(modal.data.name, modal);
|
||||
return modal.data;
|
||||
}),
|
||||
})
|
||||
);
|
||||
}),
|
||||
})
|
||||
);
|
||||
};
|
||||
|
|
|
@ -1,21 +1,28 @@
|
|||
import { Client, ModalSubmitInteraction } from 'discord.js';
|
||||
import { getFilename } from '../../utils/misc';
|
||||
import { newReminder } from '../../utils/reminder';
|
||||
import { Client, ModalSubmitInteraction } from "discord.js";
|
||||
import { getFilename } from "../../utils/misc";
|
||||
import { newReminder } from "../../utils/reminder";
|
||||
|
||||
export default {
|
||||
data: {
|
||||
name: getFilename(__filename),
|
||||
},
|
||||
interaction: async (interaction: ModalSubmitInteraction, client: Client) =>
|
||||
newReminder(client, interaction.fields.fields.get('reminderGUI-time')?.value as string, {
|
||||
newReminder(
|
||||
client,
|
||||
interaction.fields.fields.get("reminderGUI-time")?.value as string,
|
||||
{
|
||||
locale: interaction.locale,
|
||||
message: interaction.fields.fields.get('reminderGUI-message')?.value ?? null,
|
||||
message:
|
||||
interaction.fields.fields.get("reminderGUI-message")?.value ?? null,
|
||||
createdAt: interaction.createdAt.getTime(),
|
||||
channelId: interaction.channelId,
|
||||
userId: interaction.user.id,
|
||||
guildId: interaction.guildId,
|
||||
}).then((msg) => interaction.reply({
|
||||
}
|
||||
).then((msg) =>
|
||||
interaction.reply({
|
||||
content: msg as string,
|
||||
ephemeral: true,
|
||||
})),
|
||||
})
|
||||
),
|
||||
};
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
import { Collection } from 'discord.js';
|
||||
import { SlashCommandBuilder } from '@discordjs/builders';
|
||||
import { Database } from 'sqlite3';
|
||||
import { Collection } from "discord.js";
|
||||
import { SlashCommandBuilder } from "@discordjs/builders";
|
||||
import { Database } from "sqlite3";
|
||||
|
||||
export { };
|
||||
export {};
|
||||
|
||||
declare module 'discord.js' {
|
||||
declare module "discord.js" {
|
||||
// eslint-disable-next-line no-shadow
|
||||
export interface Client {
|
||||
/** Store the configuration */
|
||||
config: {
|
||||
/** Bot version */
|
||||
version: string,
|
||||
version: string;
|
||||
/** Bot token from env variable */
|
||||
token_discord: string | undefined,
|
||||
token_discord: string | undefined;
|
||||
/** Default lang used */
|
||||
default_lang: string
|
||||
},
|
||||
default_lang: string;
|
||||
};
|
||||
/** Store all the modals */
|
||||
modals: {
|
||||
categories: Collection<
|
||||
|
@ -23,7 +23,7 @@ declare module 'discord.js' {
|
|||
string,
|
||||
/** Name of the modals in the category */
|
||||
string[]
|
||||
>,
|
||||
>;
|
||||
list: Collection<
|
||||
/** Modal name */
|
||||
string,
|
||||
|
@ -31,13 +31,16 @@ declare module 'discord.js' {
|
|||
{
|
||||
/** Data about the modal */
|
||||
data: {
|
||||
name: string
|
||||
},
|
||||
name: string;
|
||||
};
|
||||
/** How the modal interact */
|
||||
interaction: (interaction: ModalSubmitInteraction, client: Client) => unknown
|
||||
interaction: (
|
||||
interaction: ModalSubmitInteraction,
|
||||
client: Client
|
||||
) => unknown;
|
||||
}
|
||||
>,
|
||||
},
|
||||
>;
|
||||
};
|
||||
/** Store all the buttons */
|
||||
buttons: {
|
||||
categories: Collection<
|
||||
|
@ -45,7 +48,7 @@ declare module 'discord.js' {
|
|||
string,
|
||||
/** Name of the buttons in the category */
|
||||
string[]
|
||||
>,
|
||||
>;
|
||||
list: Collection<
|
||||
/** Button name */
|
||||
string,
|
||||
|
@ -53,13 +56,16 @@ declare module 'discord.js' {
|
|||
{
|
||||
/** Data about the button */
|
||||
data: {
|
||||
name: string
|
||||
},
|
||||
name: string;
|
||||
};
|
||||
/** How the button interact */
|
||||
interaction: (interaction: MessageComponentInteraction, client: Client) => Promise<InteractionUpdateOptions>
|
||||
interaction: (
|
||||
interaction: MessageComponentInteraction,
|
||||
client: Client
|
||||
) => Promise<InteractionUpdateOptions>;
|
||||
}
|
||||
>,
|
||||
},
|
||||
>;
|
||||
};
|
||||
/** Store all the slash commands */
|
||||
commands: {
|
||||
categories: Collection<
|
||||
|
@ -67,21 +73,24 @@ declare module 'discord.js' {
|
|||
string,
|
||||
/** Name of the commands in the category */
|
||||
string[]
|
||||
>,
|
||||
>;
|
||||
list: Collection<
|
||||
/** Command name */
|
||||
string,
|
||||
/** Command itself */
|
||||
{
|
||||
/** Data about the command */
|
||||
data: SlashCommandBuilder,
|
||||
data: SlashCommandBuilder;
|
||||
/** How the command interact */
|
||||
interaction: (interaction: CommandInteraction, client: Client) => unknown
|
||||
interaction: (
|
||||
interaction: CommandInteraction,
|
||||
client: Client
|
||||
) => unknown;
|
||||
}
|
||||
>,
|
||||
},
|
||||
>;
|
||||
};
|
||||
/** Store all the localizations */
|
||||
locales: Map<string, Map<string, string>>,
|
||||
db: Database,
|
||||
locales: Map<string, Map<string, string>>;
|
||||
db: Database;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,11 +6,11 @@ declare global {
|
|||
/**
|
||||
* Returns a copy of the string with the first letter capitalized.
|
||||
*/
|
||||
capitalize(): string,
|
||||
capitalize(): string;
|
||||
}
|
||||
}
|
||||
|
||||
/** Capitalize definition */
|
||||
String.prototype.capitalize = function(this: string) {
|
||||
String.prototype.capitalize = function (this: string) {
|
||||
return this[0].toUpperCase() + this.substring(1);
|
||||
};
|
||||
|
|
|
@ -1,22 +1,19 @@
|
|||
import { Client, Collection, GatewayIntentBits } from 'discord.js';
|
||||
import { readFileSync } from 'fs';
|
||||
import { loadLocales } from './locales';
|
||||
import '../modules/client';
|
||||
import { Database } from 'sqlite3';
|
||||
import { Client, Collection, GatewayIntentBits } from "discord.js";
|
||||
import { readFileSync } from "fs";
|
||||
import { loadLocales } from "./locales";
|
||||
import "../modules/client";
|
||||
import { Database } from "sqlite3";
|
||||
|
||||
/** Creation of the client and definition of its properties. */
|
||||
export default async () => {
|
||||
const client: Client = new Client({
|
||||
intents: [
|
||||
GatewayIntentBits.Guilds,
|
||||
GatewayIntentBits.GuildMessages,
|
||||
],
|
||||
intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages],
|
||||
});
|
||||
|
||||
client.config = {
|
||||
version: JSON.parse(readFileSync('./package.json').toString()).version,
|
||||
version: JSON.parse(readFileSync("./package.json").toString()).version,
|
||||
token_discord: process.env.TOKEN_DISCORD,
|
||||
default_lang: process.env.DEFAULT_LANG ?? 'fr',
|
||||
default_lang: process.env.DEFAULT_LANG ?? "fr",
|
||||
};
|
||||
|
||||
client.modals = {
|
||||
|
@ -34,10 +31,12 @@ export default async () => {
|
|||
list: new Collection(),
|
||||
};
|
||||
|
||||
console.log('Translations progression :');
|
||||
console.log("Translations progression :");
|
||||
client.locales = await loadLocales(client.config.default_lang);
|
||||
|
||||
client.db = new Database(`${process.env.DOCKERIZED === '1' ? '/config' : './config'}/db.sqlite3`);
|
||||
client.db = new Database(
|
||||
`${process.env.DOCKERIZED === "1" ? "/config" : "./config"}/db.sqlite3`
|
||||
);
|
||||
|
||||
initDatabase(client.db);
|
||||
|
||||
|
@ -62,7 +61,8 @@ export const quit = (client: Client) => {
|
|||
*/
|
||||
const initDatabase = (db: Database) => {
|
||||
// Table for reminders
|
||||
db.run('CREATE TABLE IF NOT EXISTS reminder ( \
|
||||
db.run(
|
||||
"CREATE TABLE IF NOT EXISTS reminder ( \
|
||||
id INTEGER PRIMARY KEY, \
|
||||
data TEXT, \
|
||||
expiration_date TEXT, \
|
||||
|
@ -73,5 +73,6 @@ const initDatabase = (db: Database) => {
|
|||
guild_id TEXT, \
|
||||
locale TEXT, \
|
||||
timeout_id TEXT \
|
||||
);');
|
||||
);"
|
||||
);
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { Client } from 'discord.js';
|
||||
import { readdir } from 'fs/promises';
|
||||
import { removeExtension } from './misc';
|
||||
import { Client } from "discord.js";
|
||||
import { readdir } from "fs/promises";
|
||||
import { removeExtension } from "./misc";
|
||||
|
||||
/**
|
||||
* Load the localizations files into memory.
|
||||
|
@ -11,30 +11,29 @@ import { removeExtension } from './misc';
|
|||
*/
|
||||
export const loadLocales = async (default_lang: string) => {
|
||||
// Get files from locales/ directory
|
||||
const old_path = __dirname.split('/');
|
||||
const old_path = __dirname.split("/");
|
||||
old_path.pop();
|
||||
const files = await readdir(`${old_path.join('/')}/locales`);
|
||||
const files = await readdir(`${old_path.join("/")}/locales`);
|
||||
|
||||
// Read JSON files content and load it into the memory
|
||||
const locales = new Map<string, Map<string, string>>();
|
||||
await Promise.all(
|
||||
files.map(async lang => {
|
||||
files.map(async (lang) => {
|
||||
// Import file
|
||||
const content: {
|
||||
[key: string]: string
|
||||
} = await import(
|
||||
`../locales/${lang}`
|
||||
);
|
||||
[key: string]: string;
|
||||
} = await import(`../locales/${lang}`);
|
||||
|
||||
// Add it to the memory
|
||||
locales.set(
|
||||
removeExtension(lang),
|
||||
new Map(Object.keys(content)
|
||||
new Map(
|
||||
Object.keys(content)
|
||||
// Ignore the default key
|
||||
.filter(str => str !== 'default')
|
||||
.map(str => {
|
||||
.filter((str) => str !== "default")
|
||||
.map((str) => {
|
||||
return [str, content[str]];
|
||||
}),
|
||||
})
|
||||
)
|
||||
);
|
||||
})
|
||||
|
@ -53,15 +52,20 @@ export const loadLocales = async (default_lang: string) => {
|
|||
* @param text Name of string to fetch
|
||||
* @returns the dictionary
|
||||
*/
|
||||
export const getLocalizations = (client: Client, text: string, lowercase = false) => {
|
||||
export const getLocalizations = (
|
||||
client: Client,
|
||||
text: string,
|
||||
lowercase = false
|
||||
) => {
|
||||
const data: Record<string, string> = {};
|
||||
|
||||
// Load all the localizations
|
||||
client.locales.forEach((locale, lang) => {
|
||||
// Fetch the text and fallback to default lang if needed
|
||||
// See getLocale for more info on why we *can* fallback
|
||||
let str = locale.get(text)
|
||||
?? client.locales.get(client.config.default_lang)?.get(text);
|
||||
let str =
|
||||
locale.get(text) ??
|
||||
client.locales.get(client.config.default_lang)?.get(text);
|
||||
|
||||
// Store it if defined
|
||||
if (str !== undefined) {
|
||||
|
@ -110,8 +114,10 @@ export const getLocale = (client: Client, lang: string) => {
|
|||
* @param default_lang default lang
|
||||
* @returns void
|
||||
*/
|
||||
const checkLocales =
|
||||
async (locales: Map<string, Map<string, string>>, default_lang: string) => {
|
||||
const checkLocales = async (
|
||||
locales: Map<string, Map<string, string>>,
|
||||
default_lang: string
|
||||
) => {
|
||||
// Associate each lang with the number of locale it has
|
||||
let locales_size = new Map<string, number>();
|
||||
locales.forEach((locales_data, lang) => {
|
||||
|
@ -119,8 +125,9 @@ async (locales: Map<string, Map<string, string>>, default_lang: string) => {
|
|||
});
|
||||
|
||||
// Sort the map
|
||||
locales_size = new Map([...locales_size.entries()]
|
||||
.sort((a, b) => b[1] - a[1]));
|
||||
locales_size = new Map(
|
||||
[...locales_size.entries()].sort((a, b) => b[1] - a[1])
|
||||
);
|
||||
|
||||
// Check if default lang is 100%
|
||||
const [max_size_name] = locales_size.keys();
|
||||
|
@ -132,8 +139,8 @@ async (locales: Map<string, Map<string, string>>, default_lang: string) => {
|
|||
// However, it is possible that this condition is true
|
||||
// and the security is poor, but it's better than nothing.
|
||||
throw new Error(
|
||||
`The default locale (${default_lang} = ${default_lang_size}) isn't complete `
|
||||
+ `(${max_size_name} = ${max_size}).`
|
||||
`The default locale (${default_lang} = ${default_lang_size}) isn't complete ` +
|
||||
`(${max_size_name} = ${max_size}).`
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -146,29 +153,33 @@ async (locales: Map<string, Map<string, string>>, default_lang: string) => {
|
|||
locales_size.forEach((size, lang) => {
|
||||
const percentage = (size / max_size) * 100;
|
||||
// Colored bar part
|
||||
const blocks = ' '.repeat(Math.floor(percentage / bar_size));
|
||||
const blocks = " ".repeat(Math.floor(percentage / bar_size));
|
||||
// Blank bar part
|
||||
const blank = ' '.repeat(Math.ceil((100 - percentage) / bar_size));
|
||||
const blank = " ".repeat(Math.ceil((100 - percentage) / bar_size));
|
||||
const color = () => {
|
||||
switch (true) {
|
||||
case percentage <= 25:
|
||||
// Red
|
||||
return '\x1b[41m';
|
||||
return "\x1b[41m";
|
||||
case percentage <= 50:
|
||||
// Mangeta
|
||||
return '\x1b[45m';
|
||||
return "\x1b[45m";
|
||||
case percentage <= 75:
|
||||
// Cyan
|
||||
return '\x1b[46m';
|
||||
return "\x1b[46m";
|
||||
case percentage <= 100:
|
||||
// Green
|
||||
return '\x1b[42m';
|
||||
return "\x1b[42m";
|
||||
default:
|
||||
return '';
|
||||
return "";
|
||||
}
|
||||
};
|
||||
const padding = ' '.repeat(lang.length === 5 ? 1 : 4);
|
||||
const padding = " ".repeat(lang.length === 5 ? 1 : 4);
|
||||
|
||||
console.log(`${padding}${lang} | ${color()}${blocks}\x1b[0m${blank} | ${percentage.toPrecision(3)}%`);
|
||||
console.log(
|
||||
`${padding}${lang} | ${color()}${blocks}\x1b[0m${blank} | ${percentage.toPrecision(
|
||||
3
|
||||
)}%`
|
||||
);
|
||||
});
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { GuildMember } from 'discord.js';
|
||||
import { GuildMember } from "discord.js";
|
||||
|
||||
/**
|
||||
* Log module status.
|
||||
|
@ -8,7 +8,7 @@ import { GuildMember } from 'discord.js';
|
|||
*/
|
||||
export const logStart = (name: string, status: boolean) => {
|
||||
// TODO Handle precision about the error if status is false
|
||||
return `> ${name}\t${status === true ? '✅' : '❌'}`;
|
||||
return `> ${name}\t${status === true ? "✅" : "❌"}`;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -17,7 +17,7 @@ export const logStart = (name: string, status: boolean) => {
|
|||
* @returns string
|
||||
*/
|
||||
export const getFilename = (path: string) => {
|
||||
const path_list = path.split('/');
|
||||
const path_list = path.split("/");
|
||||
|
||||
// Check if filename exist
|
||||
const filename_with_ext = path_list.pop();
|
||||
|
@ -34,10 +34,10 @@ export const getFilename = (path: string) => {
|
|||
* @returns string of the filename without an extension
|
||||
*/
|
||||
export const removeExtension = (filename: string) => {
|
||||
const array = filename.split('.');
|
||||
const array = filename.split(".");
|
||||
array.pop();
|
||||
|
||||
return array.join('.');
|
||||
return array.join(".");
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -46,7 +46,7 @@ export const removeExtension = (filename: string) => {
|
|||
* @returns string of the extension if it exists
|
||||
*/
|
||||
export const getExtension = (filename: string) => {
|
||||
const array = filename.split('.');
|
||||
const array = filename.split(".");
|
||||
|
||||
return array.pop();
|
||||
};
|
||||
|
@ -57,9 +57,7 @@ export const getExtension = (filename: string) => {
|
|||
* @returns true is file is a media
|
||||
*/
|
||||
export const isImage = (filename: string) => {
|
||||
return Boolean(getExtension(filename)?.match(
|
||||
/jpg|jpeg|png|webp|gif/
|
||||
));
|
||||
return Boolean(getExtension(filename)?.match(/jpg|jpeg|png|webp|gif/));
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -87,17 +85,20 @@ export const cleanCodeBlock = (text: string) => {
|
|||
text = `\`${text.trim()}\``;
|
||||
|
||||
// Keep mentions
|
||||
text = text.replace(/(<@\d+>)/g, function(mention: string) {
|
||||
text = text.replace(/(<@\d+>)/g, function (mention: string) {
|
||||
return `\`${mention}\``;
|
||||
});
|
||||
|
||||
// Keep links
|
||||
text = text.replace(/(http[s]?:\/\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*(),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)/g, function(url: string) {
|
||||
text = text.replace(
|
||||
/(http[s]?:\/\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*(),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)/g,
|
||||
function (url: string) {
|
||||
return `\`${url}\``;
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
// Fix issues
|
||||
text = text.replace('``', '');
|
||||
text = text.replace("``", "");
|
||||
|
||||
return text;
|
||||
};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { Client, Colors, EmbedBuilder, User } from 'discord.js';
|
||||
import { getLocale } from './locales';
|
||||
import { cleanCodeBlock } from './misc';
|
||||
import { showDate, strToSeconds, timeDeltaToString } from './time';
|
||||
import { Client, Colors, EmbedBuilder, User } from "discord.js";
|
||||
import { getLocale } from "./locales";
|
||||
import { cleanCodeBlock } from "./misc";
|
||||
import { showDate, strToSeconds, timeDeltaToString } from "./time";
|
||||
|
||||
/**
|
||||
* Option possible for reminders
|
||||
|
@ -19,26 +19,26 @@ export enum OptionReminder {
|
|||
* Store data about the remidner
|
||||
*/
|
||||
export type infoReminder = {
|
||||
locale: string,
|
||||
message: string | null,
|
||||
createdAt: number,
|
||||
channelId: string | null,
|
||||
userId: string,
|
||||
guildId: string | null
|
||||
}
|
||||
locale: string;
|
||||
message: string | null;
|
||||
createdAt: number;
|
||||
channelId: string | null;
|
||||
userId: string;
|
||||
guildId: string | null;
|
||||
};
|
||||
|
||||
export type dbReminder = {
|
||||
id: number,
|
||||
data: string | null,
|
||||
expiration_date: number,
|
||||
option_id: OptionReminder,
|
||||
channel_id: string | null,
|
||||
creation_date: string,
|
||||
user_id: string,
|
||||
guild_id: string | null,
|
||||
locale: string,
|
||||
timeout_id: string
|
||||
}
|
||||
id: number;
|
||||
data: string | null;
|
||||
expiration_date: number;
|
||||
option_id: OptionReminder;
|
||||
channel_id: string | null;
|
||||
creation_date: string;
|
||||
user_id: string;
|
||||
guild_id: string | null;
|
||||
locale: string;
|
||||
timeout_id: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* Split the time and the extra args `p` and `@`
|
||||
|
@ -46,9 +46,9 @@ export type dbReminder = {
|
|||
* @returns An object with the time and the option
|
||||
*/
|
||||
const splitTime = (time: string) => {
|
||||
if (time?.endsWith('@')) {
|
||||
if (time?.endsWith("@")) {
|
||||
return { time: time.slice(0, -1), option: OptionReminder.Mention };
|
||||
} else if (time?.toLowerCase().endsWith('p')) {
|
||||
} else if (time?.toLowerCase().endsWith("p")) {
|
||||
return { time: time.slice(0, -1), option: OptionReminder.DirectMessage };
|
||||
}
|
||||
|
||||
|
@ -62,33 +62,42 @@ const splitTime = (time: string) => {
|
|||
* @param info data about the context of the reminder
|
||||
* @returns Promise resolution of the sql request
|
||||
*/
|
||||
export const newReminder = async (client: Client, time: string, info: infoReminder) =>
|
||||
export const newReminder = async (
|
||||
client: Client,
|
||||
time: string,
|
||||
info: infoReminder
|
||||
) =>
|
||||
new Promise((ok, ko) => {
|
||||
const data = splitTime(time);
|
||||
const timeout = strToSeconds(data.time);
|
||||
const timeoutId = setTimeoutReminder(client, info, data.option, timeout);
|
||||
|
||||
// Add the remind to the db
|
||||
client.db.run('INSERT INTO reminder ( \
|
||||
client.db.run(
|
||||
"INSERT INTO reminder ( \
|
||||
data, expiration_date, option_id, channel_id, creation_date, user_id, guild_id, locale, timeout_id \
|
||||
) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? );', [
|
||||
) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? );",
|
||||
[
|
||||
info.message,
|
||||
`${info.createdAt + (timeout * 1000)}`,
|
||||
`${info.createdAt + timeout * 1000}`,
|
||||
data.option.valueOf(),
|
||||
info.channelId,
|
||||
`${info.createdAt}`,
|
||||
info.userId,
|
||||
info.guildId,
|
||||
info.locale,
|
||||
timeoutId], (err) => {
|
||||
timeoutId,
|
||||
],
|
||||
(err) => {
|
||||
if (err) {
|
||||
ko(err);
|
||||
}
|
||||
|
||||
// Send confirmation to user
|
||||
const loc = getLocale(client, info.locale);
|
||||
ok(`${loc.get('c_reminder1')} ${data.time}.`);
|
||||
});
|
||||
ok(`${loc.get("c_reminder1")} ${data.time}.`);
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
|
@ -98,33 +107,45 @@ export const newReminder = async (client: Client, time: string, info: infoRemind
|
|||
* @param userId User ID who created the reminder
|
||||
* @returns what the SQlite request sended
|
||||
*/
|
||||
export const deleteReminder = (client: Client, createdAt: string, userId: string) => {
|
||||
export const deleteReminder = (
|
||||
client: Client,
|
||||
createdAt: string,
|
||||
userId: string
|
||||
) => {
|
||||
// Delete the reminder for the database
|
||||
return new Promise((ok, ko) => {
|
||||
// Add the remind to the db
|
||||
client.db.run('DELETE FROM reminder WHERE creation_date = ? AND user_id = ?', [createdAt, userId], (err) => {
|
||||
client.db.run(
|
||||
"DELETE FROM reminder WHERE creation_date = ? AND user_id = ?",
|
||||
[createdAt, userId],
|
||||
(err) => {
|
||||
if (err) {
|
||||
ko(err);
|
||||
}
|
||||
|
||||
// Send confirmation to user
|
||||
ok(true);
|
||||
});
|
||||
}
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
export const sendReminder = (client: Client, info: infoReminder, option: OptionReminder) => {
|
||||
export const sendReminder = (
|
||||
client: Client,
|
||||
info: infoReminder,
|
||||
option: OptionReminder
|
||||
) => {
|
||||
const loc = getLocale(client, info.locale);
|
||||
// Send the message in the appropriate channel
|
||||
// TODO: Embed
|
||||
let message: string;
|
||||
if (info.message === null) {
|
||||
message = loc.get('c_reminder18');
|
||||
message = loc.get("c_reminder18");
|
||||
} else {
|
||||
message = cleanCodeBlock(info.message);
|
||||
}
|
||||
const embed = new EmbedBuilder()
|
||||
.setColor('Random')
|
||||
.setColor("Random")
|
||||
.setDescription(message)
|
||||
.setTimestamp(info.createdAt);
|
||||
|
||||
|
@ -133,7 +154,7 @@ export const sendReminder = (client: Client, info: infoReminder, option: OptionR
|
|||
if (client.channels.cache.get(info.channelId) !== undefined) {
|
||||
channelOk = true;
|
||||
} else {
|
||||
embed.setFooter({ text: loc.get('c_reminder14') });
|
||||
embed.setFooter({ text: loc.get("c_reminder14") });
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -144,10 +165,10 @@ export const sendReminder = (client: Client, info: infoReminder, option: OptionR
|
|||
if (guild.members.cache.get(info.userId) !== undefined) {
|
||||
guildOk = true;
|
||||
} else {
|
||||
embed.setFooter({ text: `${loc.get('c_reminder15')} ${guild.name}.` });
|
||||
embed.setFooter({ text: `${loc.get("c_reminder15")} ${guild.name}.` });
|
||||
}
|
||||
} else {
|
||||
embed.setFooter({ text: loc.get('c_reminder16') });
|
||||
embed.setFooter({ text: loc.get("c_reminder16") });
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -159,15 +180,19 @@ export const sendReminder = (client: Client, info: infoReminder, option: OptionR
|
|||
}
|
||||
} else {
|
||||
// Channel
|
||||
client.channels.fetch(info.channelId ?? '').then((channel) => {
|
||||
client.channels.fetch(info.channelId ?? "").then((channel) => {
|
||||
if (channel?.isTextBased()) {
|
||||
let content = `<@${info.userId}>`;
|
||||
embed.setFooter({ text: `${loc.get('c_reminder17')} ${timeDeltaToString(info.createdAt)}` });
|
||||
embed.setFooter({
|
||||
text: `${loc.get("c_reminder17")} ${timeDeltaToString(
|
||||
info.createdAt
|
||||
)}`,
|
||||
});
|
||||
|
||||
// Mention everybody if needed
|
||||
if (option == OptionReminder.Mention) {
|
||||
(info.message?.match(/<@\d+>/g) ?? []).forEach(mention => {
|
||||
content += ' ' + mention;
|
||||
(info.message?.match(/<@\d+>/g) ?? []).forEach((mention) => {
|
||||
content += " " + mention;
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -185,16 +210,25 @@ export const sendReminder = (client: Client, info: infoReminder, option: OptionR
|
|||
* @param timeout Amout of time before the reminder ends
|
||||
* @returns Timeout's ID
|
||||
*/
|
||||
export const setTimeoutReminder = (client: Client, info: infoReminder, option: OptionReminder, timeout: number) => {
|
||||
return Number(setTimeout(() => {
|
||||
deleteReminder(client, String(info.createdAt), info.userId).then((val) => {
|
||||
export const setTimeoutReminder = (
|
||||
client: Client,
|
||||
info: infoReminder,
|
||||
option: OptionReminder,
|
||||
timeout: number
|
||||
) => {
|
||||
return Number(
|
||||
setTimeout(() => {
|
||||
deleteReminder(client, String(info.createdAt), info.userId).then(
|
||||
(val) => {
|
||||
if (val != true) {
|
||||
throw val;
|
||||
}
|
||||
|
||||
sendReminder(client, info, option);
|
||||
});
|
||||
}, timeout * 1000));
|
||||
}
|
||||
);
|
||||
}, timeout * 1000)
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -204,25 +238,32 @@ export const setTimeoutReminder = (client: Client, info: infoReminder, option: O
|
|||
* @param userId user ID to check
|
||||
* @param guildId guild ID where the ownership request as been send, 0 if DM
|
||||
*/
|
||||
export const checkOwnershipReminder = async (client: Client, id: number, userId: string, guildId: string) => {
|
||||
const data = await new Promise((ok, ko) => {
|
||||
export const checkOwnershipReminder = async (
|
||||
client: Client,
|
||||
id: number,
|
||||
userId: string,
|
||||
guildId: string
|
||||
) => {
|
||||
const data = (await new Promise((ok, ko) => {
|
||||
// Check the ownership
|
||||
client.db.all('SELECT EXISTS ( \
|
||||
client.db.all(
|
||||
"SELECT EXISTS ( \
|
||||
SELECT 1 FROM reminder \
|
||||
WHERE id = ? \
|
||||
AND user_id = ? \
|
||||
AND (guild_id = ? OR guild_id = 0) \
|
||||
)', [
|
||||
id, userId, guildId,
|
||||
], (err, row) => {
|
||||
)",
|
||||
[id, userId, guildId],
|
||||
(err, row) => {
|
||||
if (err) {
|
||||
ko(err);
|
||||
}
|
||||
|
||||
// Send all the current reminders
|
||||
ok(row[0]);
|
||||
});
|
||||
}) as { [key: string]: number };
|
||||
}
|
||||
);
|
||||
})) as { [key: string]: number };
|
||||
return Object.keys(data).map((key) => data[key])[0] === 0 ? true : false;
|
||||
};
|
||||
|
||||
|
@ -232,19 +273,22 @@ export const checkOwnershipReminder = async (client: Client, id: number, userId:
|
|||
* @param id Reminder's ID
|
||||
*/
|
||||
export const getReminderInfo = async (client: Client, id: number) => {
|
||||
return await new Promise((ok, ko) => {
|
||||
return (await new Promise((ok, ko) => {
|
||||
// Check the ownership
|
||||
client.db.all('SELECT * FROM reminder \
|
||||
WHERE id = ?', [
|
||||
id], (err, row) => {
|
||||
client.db.all(
|
||||
"SELECT * FROM reminder \
|
||||
WHERE id = ?",
|
||||
[id],
|
||||
(err, row) => {
|
||||
if (err) {
|
||||
ko(err);
|
||||
}
|
||||
|
||||
// Send all the current reminders
|
||||
ok(row[0]);
|
||||
});
|
||||
}) as dbReminder;
|
||||
}
|
||||
);
|
||||
})) as dbReminder;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -256,7 +300,8 @@ export const updateReminder = (client: Client, data: dbReminder) => {
|
|||
// Delete the reminder for the database
|
||||
return new Promise((ok, ko) => {
|
||||
// Update the db
|
||||
client.db.run('UPDATE reminder \
|
||||
client.db.run(
|
||||
"UPDATE reminder \
|
||||
SET data = ?, \
|
||||
expiration_date = ?, \
|
||||
option_id = ?, \
|
||||
|
@ -266,7 +311,8 @@ export const updateReminder = (client: Client, data: dbReminder) => {
|
|||
guild_id = ?, \
|
||||
locale = ?, \
|
||||
timeout_id = ? \
|
||||
WHERE ID = ?', [
|
||||
WHERE ID = ?",
|
||||
[
|
||||
data.data,
|
||||
data.expiration_date,
|
||||
data.option_id,
|
||||
|
@ -276,13 +322,16 @@ export const updateReminder = (client: Client, data: dbReminder) => {
|
|||
data.guild_id,
|
||||
data.locale,
|
||||
data.timeout_id,
|
||||
data.id], (err) => {
|
||||
data.id,
|
||||
],
|
||||
(err) => {
|
||||
if (err) {
|
||||
ko(err);
|
||||
}
|
||||
|
||||
ok(true);
|
||||
});
|
||||
}
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -293,20 +342,27 @@ export const updateReminder = (client: Client, data: dbReminder) => {
|
|||
* @param guildId guild ID
|
||||
* @returns List of reminders of a user in a guild
|
||||
*/
|
||||
const listReminders = async (client: Client, userId: string, guildId: string | null) => {
|
||||
return await new Promise((ok, ko) => {
|
||||
const listReminders = async (
|
||||
client: Client,
|
||||
userId: string,
|
||||
guildId: string | null
|
||||
) => {
|
||||
return (await new Promise((ok, ko) => {
|
||||
// Check the ownership
|
||||
client.db.all('SELECT data, creation_date, expiration_date, id FROM reminder \
|
||||
WHERE user_id = ? AND (guild_id = ? OR guild_id = 0)', [
|
||||
userId, guildId ?? 0], (err, row) => {
|
||||
client.db.all(
|
||||
"SELECT data, creation_date, expiration_date, id FROM reminder \
|
||||
WHERE user_id = ? AND (guild_id = ? OR guild_id = 0)",
|
||||
[userId, guildId ?? 0],
|
||||
(err, row) => {
|
||||
if (err) {
|
||||
ko(err);
|
||||
}
|
||||
|
||||
// Send all the current reminders
|
||||
ok(row);
|
||||
});
|
||||
}) as dbReminder[];
|
||||
}
|
||||
);
|
||||
})) as dbReminder[];
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -318,7 +374,13 @@ const listReminders = async (client: Client, userId: string, guildId: string | n
|
|||
* @param local Lang
|
||||
* @returns Pretty embed who list reminders
|
||||
*/
|
||||
export const embedListReminders = async (client: Client, user: User, guildId: string | null, page: number, local: string) => {
|
||||
export const embedListReminders = async (
|
||||
client: Client,
|
||||
user: User,
|
||||
guildId: string | null,
|
||||
page: number,
|
||||
local: string
|
||||
) => {
|
||||
const loc = getLocale(client, local);
|
||||
const reminders = await listReminders(client, user.id, guildId);
|
||||
|
||||
|
@ -331,7 +393,11 @@ export const embedListReminders = async (client: Client, user: User, guildId: st
|
|||
// TODO: Use Random color or force a color from args
|
||||
const embed = new EmbedBuilder()
|
||||
.setColor(Colors.DarkGrey)
|
||||
.setDescription(`${loc.get('c_reminder5')} ${user} • ${loc.get('c_reminder6')} ${page}/${pageMax}`)
|
||||
.setDescription(
|
||||
`${loc.get("c_reminder5")} ${user} • ${loc.get(
|
||||
"c_reminder6"
|
||||
)} ${page}/${pageMax}`
|
||||
)
|
||||
.setThumbnail(user.displayAvatarURL());
|
||||
|
||||
const limit = elementPerPage * page;
|
||||
|
@ -341,13 +407,19 @@ export const embedListReminders = async (client: Client, user: User, guildId: st
|
|||
reminders.splice(0, limit - elementPerPage);
|
||||
reminders.forEach((remind) => {
|
||||
if (curseur < limit) {
|
||||
let text = remind.data ?? loc.get('c_reminder7');
|
||||
let text = remind.data ?? loc.get("c_reminder7");
|
||||
if (text.length > 1024) {
|
||||
text = `${text.substring(0, 1021)}...`;
|
||||
}
|
||||
const expiration = `${loc.get('c_reminder8')} ${timeDeltaToString(remind.expiration_date)}`;
|
||||
const expiration = `${loc.get("c_reminder8")} ${timeDeltaToString(
|
||||
remind.expiration_date
|
||||
)}`;
|
||||
embed.addFields({
|
||||
name: `#${remind.id} • ${loc.get('c_reminder9')} ${showDate(local, loc, new Date(Number(remind.creation_date)))}\n${expiration}`,
|
||||
name: `#${remind.id} • ${loc.get("c_reminder9")} ${showDate(
|
||||
local,
|
||||
loc,
|
||||
new Date(Number(remind.creation_date))
|
||||
)}\n${expiration}`,
|
||||
value: text,
|
||||
inline: false,
|
||||
});
|
||||
|
@ -356,7 +428,10 @@ export const embedListReminders = async (client: Client, user: User, guildId: st
|
|||
}
|
||||
});
|
||||
} else {
|
||||
embed.addFields({ name: '\u200b', value: `${loc.get('c_reminder10')}${page} ${loc.get('c_reminder11')}.` });
|
||||
embed.addFields({
|
||||
name: "\u200b",
|
||||
value: `${loc.get("c_reminder10")}${page} ${loc.get("c_reminder11")}.`,
|
||||
});
|
||||
}
|
||||
|
||||
return embed;
|
||||
|
|
|
@ -10,7 +10,7 @@ export const showDate = (
|
|||
locale: Map<string, unknown>,
|
||||
date: Date
|
||||
) => {
|
||||
return date.toLocaleString(tz).replace(' ', ` ${locale.get('u_time_at')} `);
|
||||
return date.toLocaleString(tz).replace(" ", ` ${locale.get("u_time_at")} `);
|
||||
};
|
||||
|
||||
enum TimeSecond {
|
||||
|
@ -19,7 +19,7 @@ enum TimeSecond {
|
|||
Day = 86400,
|
||||
Hour = 3600,
|
||||
Minute = 60,
|
||||
Second = 1
|
||||
Second = 1,
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -28,7 +28,15 @@ enum TimeSecond {
|
|||
* @returns time in seconds
|
||||
*/
|
||||
export const strToSeconds = (time: string) => {
|
||||
const regex = new RegExp(`(?<${TimeSecond[TimeSecond.Year]}>[0-9]+(?=[y|a]))|(?<${TimeSecond[TimeSecond.Week]}>[0-9]+(?=[w]))|(?<${TimeSecond[TimeSecond.Day]}>[0-9]+(?=[d|j]))|(?<${TimeSecond[TimeSecond.Hour]}>[0-9]+(?=[h]))|(?<${TimeSecond[TimeSecond.Minute]}>[0-9]+(?=[m]))|(?<${TimeSecond[TimeSecond.Second]}>[0-9]+(?=[s]?))`);
|
||||
const regex = new RegExp(
|
||||
`(?<${TimeSecond[TimeSecond.Year]}>[0-9]+(?=[y|a]))|(?<${
|
||||
TimeSecond[TimeSecond.Week]
|
||||
}>[0-9]+(?=[w]))|(?<${TimeSecond[TimeSecond.Day]}>[0-9]+(?=[d|j]))|(?<${
|
||||
TimeSecond[TimeSecond.Hour]
|
||||
}>[0-9]+(?=[h]))|(?<${TimeSecond[TimeSecond.Minute]}>[0-9]+(?=[m]))|(?<${
|
||||
TimeSecond[TimeSecond.Second]
|
||||
}>[0-9]+(?=[s]?))`
|
||||
);
|
||||
|
||||
const data = Object.assign({}, regex.exec(time)?.groups);
|
||||
|
||||
|
|
|
@ -11,10 +11,10 @@
|
|||
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
|
||||
|
||||
/* Language and Environment */
|
||||
"target": "es6", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
||||
"target": "es6" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
|
||||
"lib": [
|
||||
"ES2021.String"
|
||||
], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
||||
] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
|
||||
// "jsx": "preserve", /* Specify what JSX code is generated. */
|
||||
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
|
||||
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
|
||||
|
@ -27,8 +27,8 @@
|
|||
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
|
||||
|
||||
/* Modules */
|
||||
"module": "commonjs", /* Specify what module code is generated. */
|
||||
"rootDir": "./src", /* Specify the root folder within your source files. */
|
||||
"module": "commonjs" /* Specify what module code is generated. */,
|
||||
"rootDir": "./src" /* Specify the root folder within your source files. */,
|
||||
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
|
||||
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
|
||||
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
|
||||
|
@ -37,7 +37,7 @@
|
|||
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
|
||||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
||||
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
|
||||
"resolveJsonModule": true, /* Enable importing .json files. */
|
||||
"resolveJsonModule": true /* Enable importing .json files. */,
|
||||
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
|
||||
|
||||
/* JavaScript Support */
|
||||
|
@ -51,7 +51,7 @@
|
|||
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
|
||||
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
|
||||
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
|
||||
"outDir": "./dist", /* Specify an output folder for all emitted files. */
|
||||
"outDir": "./dist" /* Specify an output folder for all emitted files. */,
|
||||
// "removeComments": true, /* Disable emitting comments. */
|
||||
// "noEmit": true, /* Disable emitting files from a compilation. */
|
||||
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
|
||||
|
@ -73,12 +73,12 @@
|
|||
/* Interop Constraints */
|
||||
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
|
||||
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
|
||||
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
|
||||
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
|
||||
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
|
||||
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
|
||||
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
|
||||
|
||||
/* Type Checking */
|
||||
"strict": true, /* Enable all strict type-checking options. */
|
||||
"strict": true /* Enable all strict type-checking options. */,
|
||||
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
|
||||
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
|
||||
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
|
||||
|
@ -102,8 +102,5 @@
|
|||
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
|
||||
"skipLibCheck": true /* Skip type checking all .d.ts files. */
|
||||
},
|
||||
"include": [
|
||||
"./**/*.ts",
|
||||
"./src/locales/*.json"
|
||||
]
|
||||
"include": ["./**/*.ts", "./src/locales/*.json"]
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue