Skip to content

Commit

Permalink
Types for better autocompletion
Browse files Browse the repository at this point in the history
  • Loading branch information
Aerue committed Jul 5, 2020
1 parent eab8309 commit 71436cf
Show file tree
Hide file tree
Showing 72 changed files with 5,872 additions and 5,217 deletions.
35 changes: 17 additions & 18 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ require('core/MessageError');
require('core/Tools');
const Draftbot = require('core/DraftBot');

(async Drafbot => {

(async (Drafbot) => {
await Drafbot.init();

/**
Expand All @@ -19,21 +18,21 @@ const Draftbot = require('core/DraftBot');
});

await client.guilds.cache.get(JsonReader.app.MAIN_SERVER_ID)
.channels
.cache
.get(JsonReader.app.CONSOLE_CHANNEL_ID)
.send(JsonReader.bot.startStatus + JsonReader.package.version)
.catch(console.error);
.channels
.cache
.get(JsonReader.app.CONSOLE_CHANNEL_ID)
.send(JsonReader.bot.startStatus + JsonReader.package.version)
.catch(console.error);

await client.user
.setActivity(JsonReader.bot.activity)
.catch(console.error);
.setActivity(JsonReader.bot.activity)
.catch(console.error);
};

/**
* Will be executed each time the bot join a new server
*/
const onDiscordGuildCreate = async guilde => {
const onDiscordGuildCreate = async (guilde) => {
// let string = "";
// let serverManager = new ServerManager();
// let { validation, nbMembres, nbBot, ratio } = serverManager.getValidationInfos(guilde);
Expand All @@ -49,7 +48,7 @@ const Draftbot = require('core/DraftBot');
/**
* Will be executed each time the bot leave a server
*/
const onDiscordGuildDelete = async guilde => {
const onDiscordGuildDelete = async (guilde) => {
// let string = "";
// let serverManager = new ServerManager();
// let { validation, nbMembres, nbBot, ratio } = serverManager.getValidationInfos(guilde);
Expand All @@ -63,21 +62,22 @@ const Draftbot = require('core/DraftBot');
* @param {module:"discord.js".Message} message
* @return {Promise<void>}
*/
const onDiscordMessage = async message => {
const onDiscordMessage = async (message) => {
if (message.author.bot) return;
if (message.channel.type === 'dm')
if (message.channel.type === 'dm') {
await handlePrivateMessage(message);
else
} else {
await handleMessage(message);
}
};

/**
* Will be executed each time the bot see a reaction message
* @param {module:"discord.js".MessageReaction} reaction
* @return {Promise<void>}
*/
const onDiscordMessageReactionAdd = async reaction => {
//check if the user is a bot before doing anything
const onDiscordMessageReactionAdd = async (reaction) => {
// check if the user is a bot before doing anything
// if (reaction.users.last().bot) return;
//
// let Text = await chargeText(reaction);
Expand All @@ -97,7 +97,6 @@ const Draftbot = require('core/DraftBot');
client.on('messageReactionAdd', onDiscordMessageReactionAdd);

await client.login(JsonReader.app.DISCORD_CLIENT_TOKEN);

})(Draftbot);

// /**
Expand Down Expand Up @@ -203,4 +202,4 @@ const Draftbot = require('core/DraftBot');
// */
// function sendLeavingMessage(guilde) {
// guilde.owner.send(Console.departurMessage);
// }
// }
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
"config": "./config",
"core": "./src/core",
"commands": "./src/commands",
"entities": "./src/core/entities",
"repositories": "./src/core/repositories",
"models": "./src/core/models",
"ressources": "./ressources",
"data": "./data"
"ressources": "./ressources"
},
"dependencies": {
"chai": "^4.2.0",
Expand All @@ -31,5 +28,9 @@
"sequelize": "^5.21.7",
"sqlite": "^4.0.7",
"sqlite3": "^4.1.1"
},
"devDependencies": {
"eslint": "^7.4.0",
"eslint-config-google": "^0.14.0"
}
}
17 changes: 8 additions & 9 deletions src/commands/admin/ChangeLanguageCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
* @param {String[]} args=[] - Additional arguments sent with the command
*/

const changeLanguageCommand = async function (language, message, args) {
const changeLanguageCommand = async function(language, message, args) {
if ((await canPerformCommand(message, language,
PERMISSION.ROLE.ADMINISTRATOR)) !== true) {
PERMISSION.ROLE.ADMINISTRATOR)) !== true) {
return;
}
let embed = new discord.MessageEmbed();
const embed = new discord.MessageEmbed();
let server;

[server] = await Servers.getOrRegister(message.guild.id);
Expand All @@ -20,12 +20,12 @@ const changeLanguageCommand = async function (language, message, args) {
server.language = LANGUAGE.FRENCH;
}
embed.setColor(JsonReader.bot.embed.default)
.setAuthor(format(
JsonReader.commands.changeLanguage.getTranslation(language).title,
{ pseudo: message.author.username }),
.setAuthor(format(
JsonReader.commands.changeLanguage.getTranslation(language).title,
{pseudo: message.author.username}),
message.author.displayAvatarURL())
.setDescription(format(
JsonReader.commands.changeLanguage.getTranslation(language).desc));
.setDescription(format(
JsonReader.commands.changeLanguage.getTranslation(language).desc));
message.channel.send(embed);
await server.save();
};
Expand All @@ -35,4 +35,3 @@ module.exports = {
};



4 changes: 2 additions & 2 deletions src/commands/admin/ChangePointsCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const ChangePointsCommand = async function(language, message, args) {
return;
}

let embed = new discord.MessageEmbed();
const embed = new discord.MessageEmbed();
let entity;
let playerId = message.mentions.users.last().id;
const playerId = message.mentions.users.last().id;
[entity] = await Entities.getOrRegister(playerId);
await entity.Player.setPoints(args[1]);
await entity.Player.save();
Expand Down
4 changes: 2 additions & 2 deletions src/commands/admin/ChangePointsWeekCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const ChangePointsWeekCommand = async function(language, message, args) {
return;
}

let embed = new discord.MessageEmbed();
const embed = new discord.MessageEmbed();
let entity;
let playerId = message.mentions.users.last().id;
const playerId = message.mentions.users.last().id;
[entity] = await Entities.getOrRegister(playerId);
await entity.Player.setPointsWeek(args[1]);
await entity.Player.save();
Expand Down
46 changes: 22 additions & 24 deletions src/commands/admin/ChangePrefixCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,32 @@
* @param {String[]} args=[] - Additional arguments sent with the command
*/

const ChangePrefixCommand = async function (language, message, args) {

if ((await canPerformCommand(message,language,
PERMISSION.ROLE.ADMINISTRATOR)) !== true) {
return;
}

let embed = new discord.MessageEmbed();
let newPrefix = args[0];
if( newPrefix == undefined){
embed.setColor(JsonReader.bot.embed.error)
.setAuthor(format(JsonReader.commands.changePrefix.getTranslation(language).error, { pseudo: message.author.username }), message.author.displayAvatarURL())
const ChangePrefixCommand = async function(language, message, args) {
if ((await canPerformCommand(message, language,
PERMISSION.ROLE.ADMINISTRATOR)) !== true) {
return;
}

const embed = new discord.MessageEmbed();
const newPrefix = args[0];
if ( newPrefix == undefined) {
embed.setColor(JsonReader.bot.embed.error)
.setAuthor(format(JsonReader.commands.changePrefix.getTranslation(language).error, {pseudo: message.author.username}), message.author.displayAvatarURL())
.setDescription(JsonReader.commands.changePrefix.getTranslation(language).descError);
return await message.channel.send(embed);
}
let server;
[server] = await Servers.getOrRegister(message.guild.id);
server.prefix = newPrefix;
await server.save();
embed.setColor(JsonReader.bot.embed.default)
.setAuthor(format(JsonReader.commands.changePrefix.getTranslation(language).ok, { pseudo: message.author.username }), message.author.displayAvatarURL())
.setDescription(format(JsonReader.commands.changePrefix.getTranslation(language).descOk, {newPrefix: newPrefix }));
return await message.channel.send(embed);
}
let server;
[server] = await Servers.getOrRegister(message.guild.id);
server.prefix = newPrefix;
await server.save();
embed.setColor(JsonReader.bot.embed.default)
.setAuthor(format(JsonReader.commands.changePrefix.getTranslation(language).ok, {pseudo: message.author.username}), message.author.displayAvatarURL())
.setDescription(format(JsonReader.commands.changePrefix.getTranslation(language).descOk, {newPrefix: newPrefix}));
return await message.channel.send(embed);
};

module.exports = {
'prefix': ChangePrefixCommand,
};

'prefix': ChangePrefixCommand,
};


10 changes: 5 additions & 5 deletions src/commands/admin/GiveBadgeCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
* @param {module:"discord.js".Message} message - Message from the discord server
* @param {String[]} args=[] - Additional arguments sent with the command
*/
const giveBadgeCommand = async function (language, message, args) {
const giveBadgeCommand = async function(language, message, args) {
if ((await canPerformCommand(message, language, PERMISSION.ROLE.BADGEMANAGER)) !== true) {
return;
}
let embed = new discord.MessageEmbed();
const embed = new discord.MessageEmbed();
// the author of the command is the author of the bot
let playerId = message.mentions.users.last().id;
const playerId = message.mentions.users.last().id;
[entity] = await Entities.getOrRegister(playerId);

await entity.Player.addBadge(args[0]);
await entity.Player.save();

embed.setColor(JsonReader.bot.embed.default)
.setAuthor(format(JsonReader.commands.giveBadgeCommand.getTranslation(language).giveSuccess, { pseudo: message.author.username }), message.author.displayAvatarURL())
.setDescription(format(JsonReader.commands.giveBadgeCommand.getTranslation(language).descGive, { badge: args[0], player: message.mentions.users.last() }));
.setAuthor(format(JsonReader.commands.giveBadgeCommand.getTranslation(language).giveSuccess, {pseudo: message.author.username}), message.author.displayAvatarURL())
.setDescription(format(JsonReader.commands.giveBadgeCommand.getTranslation(language).descGive, {badge: args[0], player: message.mentions.users.last()}));
return await message.channel.send(embed);
};

Expand Down
55 changes: 27 additions & 28 deletions src/commands/admin/GiveCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,41 @@
* @param {String[]} args=[] - Additional arguments sent with the command
*/

const GiveCommand = async function (language, message, args) {
if ((await canPerformCommand(message, language,
PERMISSION.ROLE.BOTOWNER)) !== true) {
return;
}
let embed = new discord.MessageEmbed();
let entity;
let player = getUserFromMention(args[0]);
[entity] = await Entities.getOrRegister(player.id);
let itemType = args[1];
let itemId = args[2];
await entity.Player.Inventory.giveObject(itemId, itemType);
await entity.Player.Inventory.save();
embed.setColor(JsonReader.bot.embed.default)
.setAuthor(format(JsonReader.commands.giveCommand.getTranslation(language).giveSuccess, { pseudo: message.author.username }), message.author.displayAvatarURL())
.setDescription(format(JsonReader.commands.giveCommand.getTranslation(language).descGive, { type: itemType, id: itemId, player: player }));
return await message.channel.send(embed);
const GiveCommand = async function(language, message, args) {
if ((await canPerformCommand(message, language,
PERMISSION.ROLE.BOTOWNER)) !== true) {
return;
}
const embed = new discord.MessageEmbed();
let entity;
const player = getUserFromMention(args[0]);
[entity] = await Entities.getOrRegister(player.id);
const itemType = args[1];
const itemId = args[2];
await entity.Player.Inventory.giveObject(itemId, itemType);
await entity.Player.Inventory.save();
embed.setColor(JsonReader.bot.embed.default)
.setAuthor(format(JsonReader.commands.giveCommand.getTranslation(language).giveSuccess, {pseudo: message.author.username}), message.author.displayAvatarURL())
.setDescription(format(JsonReader.commands.giveCommand.getTranslation(language).descGive, {type: itemType, id: itemId, player: player}));
return await message.channel.send(embed);
};

function getUserFromMention(mention) {
if (!mention) return;
if (!mention) return;

if (mention.startsWith('<@') && mention.endsWith('>')) {
mention = mention.slice(2, -1);
if (mention.startsWith('<@') && mention.endsWith('>')) {
mention = mention.slice(2, -1);

if (mention.startsWith('!')) {
mention = mention.slice(1);
}
if (mention.startsWith('!')) {
mention = mention.slice(1);
}

return client.users.cache.get(mention);
}
return client.users.cache.get(mention);
}
}

module.exports = {
'give': GiveCommand,
};

'give': GiveCommand,
};


0 comments on commit 71436cf

Please sign in to comment.