Skip to content

Commit

Permalink
Added display functions to roles and channels and proper error messag…
Browse files Browse the repository at this point in the history 
…e on unset roles and channels
  • Loading branch information
@SayakMukhopadhyay
SayakMukhopadhyay committed Nov 19, 2017
1 parent d460863 commit cf6c5ca
Show file tree
Hide file tree
Showing 8 changed files with 1,060 additions and 643 deletions.
1,345 changes: 762 additions & 583 deletions package-lock.json
View file

Large diffs are not rendered by default.

52 changes: 24 additions & 28 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
{
"name": "bgsbot",
"version": "1.1.3",
"version": "1.2.0",
"license": "Apache-2.0",
"scripts": {
"start": "gulp scripts && cross-env PORT=4002 pm2 start process.json --env production",
"startdev": "cross-env NODE_ENV=development gulp"
},
"dependencies": {
"ajv": "^5.2.0",
"body-parser": "^1.17.2",
"body-parser": "^1.18.2",
"cookie-parser": "^1.4.3",
"debug": "^2.6.8",
"discord.js": "^11.1.0",
"express": "^4.15.3",
"moment": "^2.18.1",
"mongoose": "^4.11.1",
"mongoose-paginate": "^5.0.3",
"morgan": "^1.8.2",
"request": "^2.81.0",
"serve-favicon": "^2.4.3",
"zmq": "^2.15.3"
"debug": "^3.1.0",
"discord.js": "^11.2.1",
"express": "^4.16.2",
"moment": "^2.19.2",
"mongoose": "^4.13.4",
"morgan": "^1.9.0",
"request": "^2.83.0"
},
"devDependencies": {
"@types/body-parser": "^1.16.4",
"@types/cookie-parser": "^1.3.30",
"@types/debug": "0.0.29",
"@types/express": "^4.0.36",
"@types/mongoose": "^4.7.18",
"@types/body-parser": "^1.16.8",
"@types/cookie-parser": "^1.4.1",
"@types/debug": "0.0.30",
"@types/express": "^4.0.39",
"@types/mongoose": "^4.7.27",
"@types/mongoose-paginate": "^5.0.6",
"@types/morgan": "^1.7.32",
"@types/node": "^8.0.8",
"@types/request": "0.0.45",
"@types/serve-favicon": "^2.2.28",
"@types/zmq": "0.0.20",
"cross-env": "^5.0.1",
"@types/morgan": "^1.7.35",
"@types/node": "^8.0.53",
"@types/request": "^2.0.8",
"@types/serve-favicon": "^2.2.30",
"@types/zmq": "0.0.22",
"cross-env": "^5.1.1",
"gulp": "^3.9.1",
"gulp-nodemon": "^2.2.1",
"gulp-sourcemaps": "^2.6.0",
"gulp-typescript": "^3.1.7",
"pm2": "^2.5.0",
"typescript": "^2.4.1"
"gulp-sourcemaps": "^2.6.1",
"gulp-typescript": "^3.2.3",
"pm2": "^2.7.2",
"typescript": "^2.6.1"
}
}
57 changes: 57 additions & 0 deletions src/modules/discord/commands/adminRoles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,61 @@ export class AdminRoles {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}

list(message: discord.Message, argsArray: string[]) {
Access.has(message.member, [Access.ADMIN, Access.FORBIDDEN])
.then(() => {
if (argsArray.length === 1) {
let guildId = message.guild.id;

this.db.model.guild.findOne({ guild_id: guildId })
.then(guild => {
if (guild) {
if (guild.admin_roles_id && guild.admin_roles_id.length !== 0) {
let embed = new discord.RichEmbed();
embed.setTitle("Admin Roles");
embed.setColor([255, 0, 255]);
let idList = "";
guild.admin_roles_id.forEach(id => {
idList += `${id} - @${message.guild.roles.get(id).name}\n`;
});
embed.addField("Ids and Names", idList);
embed.setTimestamp(new Date());
message.channel.send({ embed })
.catch(err => {
console.log(err);
});
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("You don't have any admin roles set up");
})
.catch(err => {
console.log(err);
});
}
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("Your guild is not set yet");
})
.catch(err => {
console.log(err);
});
}
})
.catch(err => {
message.channel.send(Responses.getResponse(Responses.FAIL));
console.log(err);
})
} else if (argsArray.length > 1) {
message.channel.send(Responses.getResponse(Responses.TOOMANYPARAMS));
} else {
message.channel.send(Responses.getResponse(Responses.NOPARAMS));
}
})
.catch(() => {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}
}
54 changes: 54 additions & 0 deletions src/modules/discord/commands/bgsChannel.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,58 @@ export class BGSChannel {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}

show(message: discord.Message, argsArray: string[]) {
Access.has(message.member, [Access.ADMIN, Access.FORBIDDEN])
.then(() => {
if (argsArray.length === 1) {
let guildId = message.guild.id;

this.db.model.guild.findOne({ guild_id: guildId })
.then(guild => {
if (guild) {
if (guild.bgs_channel_id && guild.bgs_channel_id.length !== 0) {
let embed = new discord.RichEmbed();
embed.setTitle("BGS Channel");
embed.setColor([255, 0, 255]);
let id = `${guild.bgs_channel_id} - @${message.guild.roles.get(guild.bgs_channel_id).name}\n`;
embed.addField("Ids and Names", id);
embed.setTimestamp(new Date());
message.channel.send({ embed })
.catch(err => {
console.log(err);
});
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("You don't have a bgs channel set up");
})
.catch(err => {
console.log(err);
});
}
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("Your guild is not set yet");
})
.catch(err => {
console.log(err);
});
}
})
.catch(err => {
message.channel.send(Responses.getResponse(Responses.FAIL));
console.log(err);
})
} else if (argsArray.length > 1) {
message.channel.send(Responses.getResponse(Responses.TOOMANYPARAMS));
} else {
message.channel.send(Responses.getResponse(Responses.NOPARAMS));
}
})
.catch(() => {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}
}
54 changes: 54 additions & 0 deletions src/modules/discord/commands/bgsRole.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,58 @@ export class BGSRole {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}

show(message: discord.Message, argsArray: string[]) {
Access.has(message.member, [Access.ADMIN, Access.FORBIDDEN])
.then(() => {
if (argsArray.length === 1) {
let guildId = message.guild.id;

this.db.model.guild.findOne({ guild_id: guildId })
.then(guild => {
if (guild) {
if (guild.bgs_role_id && guild.bgs_role_id.length !== 0) {
let embed = new discord.RichEmbed();
embed.setTitle("BGS Role");
embed.setColor([255, 0, 255]);
let id = `${guild.bgs_role_id} - @${message.guild.roles.get(guild.bgs_role_id).name}\n`;
embed.addField("Ids and Names", id);
embed.setTimestamp(new Date());
message.channel.send({ embed })
.catch(err => {
console.log(err);
});
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("You don't have a bgs role set up");
})
.catch(err => {
console.log(err);
});
}
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("Your guild is not set yet");
})
.catch(err => {
console.log(err);
});
}
})
.catch(err => {
message.channel.send(Responses.getResponse(Responses.FAIL));
console.log(err);
})
} else if (argsArray.length > 1) {
message.channel.send(Responses.getResponse(Responses.TOOMANYPARAMS));
} else {
message.channel.send(Responses.getResponse(Responses.NOPARAMS));
}
})
.catch(() => {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}
}
57 changes: 57 additions & 0 deletions src/modules/discord/commands/forbiddenRoles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,61 @@ export class ForbiddenRoles {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}

list(message: discord.Message, argsArray: string[]) {
Access.has(message.member, [Access.ADMIN, Access.FORBIDDEN])
.then(() => {
if (argsArray.length === 1) {
let guildId = message.guild.id;

this.db.model.guild.findOne({ guild_id: guildId })
.then(guild => {
if (guild) {
if (guild.forbidden_roles_id && guild.forbidden_roles_id.length !== 0) {
let embed = new discord.RichEmbed();
embed.setTitle("Forbidden Roles");
embed.setColor([255, 0, 255]);
let idList = "";
guild.forbidden_roles_id.forEach(id => {
idList += `${id} - @${message.guild.roles.get(id).name}\n`;
});
embed.addField("Ids and Names", idList);
embed.setTimestamp(new Date());
message.channel.send({ embed })
.catch(err => {
console.log(err);
});
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("You don't have any forbidden roles set up");
})
.catch(err => {
console.log(err);
});
}
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("Your guild is not set yet");
})
.catch(err => {
console.log(err);
});
}
})
.catch(err => {
message.channel.send(Responses.getResponse(Responses.FAIL));
console.log(err);
})
} else if (argsArray.length > 1) {
message.channel.send(Responses.getResponse(Responses.TOOMANYPARAMS));
} else {
message.channel.send(Responses.getResponse(Responses.NOPARAMS));
}
})
.catch(() => {
message.channel.send(Responses.getResponse(Responses.INSUFFICIENTPERMS));
})
}
}
42 changes: 26 additions & 16 deletions src/modules/discord/commands/monitorFactions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,23 +170,33 @@ export class MonitorFactions {
this.db.model.guild.findOne({ guild_id: guildId })
.then(guild => {
if (guild) {
let embed = new discord.RichEmbed();
embed.setTitle("MONITORED FACTIONS");
embed.setColor([255, 0, 255]);
let factionList = "";
guild.monitor_factions.forEach(faction => {
factionList += `${faction.faction_name}`;
if (faction.primary) {
factionList += ` | PRIMARY`;
}
factionList += `\n`;
});
embed.addField("Factions", factionList);
embed.setTimestamp(new Date());
message.channel.send({ embed })
.catch(err => {
console.log(err);
if (guild.monitor_factions && guild.monitor_factions.length !== 0) {
let embed = new discord.RichEmbed();
embed.setTitle("MONITORED FACTIONS");
embed.setColor([255, 0, 255]);
let factionList = "";
guild.monitor_factions.forEach(faction => {
factionList += `${faction.faction_name}`;
if (faction.primary) {
factionList += ` | PRIMARY`;
}
factionList += `\n`;
});
embed.addField("Factions", factionList);
embed.setTimestamp(new Date());
message.channel.send({ embed })
.catch(err => {
console.log(err);
});
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
message.channel.send("You don't have any monitored faction set up");
})
.catch(err => {
console.log(err);
});
}
} else {
message.channel.send(Responses.getResponse(Responses.FAIL))
.then(() => {
Expand Down
Loading

0 comments on commit cf6c5ca

Please sign in to comment.