StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 14:11:50 +00:00
Code Releases Activity

roles: mention role and user in success messages

Browse source
This commit is contained in:
Dragory 2020-06-04 02:45:05 +03:00
parent ff9bcca350
commit d281996b44
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
backend/src/plugins/Roles.ts
View file

@ -1,6 +1,6 @@
import { trimPluginDescription, ZeppelinPlugin } from "./ZeppelinPlugin"; import { trimPluginDescription, ZeppelinPlugin } from "./ZeppelinPlugin";
import * as t from "io-ts"; import * as t from "io-ts";
import { resolveMember, stripObjectToScalars, successMessage } from "../utils"; import { resolveMember, stripObjectToScalars, successMessage, verboseUserMention } from "../utils";
import { decorators as d, IPluginOptions, logger } from "knub"; import { decorators as d, IPluginOptions, logger } from "knub";
import { GuildChannel, Member, Message } from "eris"; import { GuildChannel, Member, Message } from "eris";
import { GuildLogs } from "../data/GuildLogs"; import { GuildLogs } from "../data/GuildLogs";
@ -100,7 +100,7 @@ export class RolesPlugin extends ZeppelinPlugin<TConfigSchema> {
mod: stripObjectToScalars(msg.author), mod: stripObjectToScalars(msg.author),
}); });
this.sendSuccessMessage(msg.channel, "Role added to user!"); this.sendSuccessMessage(msg.channel, `Added role **${role.name}** to ${verboseUserMention(args.member.user)}!`);
} }
@d.command("massaddrole", "<role:string> <members:string...>") @d.command("massaddrole", "<role:string> <members:string...>")
@ -129,19 +129,30 @@ export class RolesPlugin extends ZeppelinPlugin<TConfigSchema> {
if (!roleId) { if (!roleId) {
return this.sendErrorMessage(msg.channel, "Invalid role id"); return this.sendErrorMessage(msg.channel, "Invalid role id");
} }
const role = this.guild.roles.get(roleId);
const config = this.getConfigForMsg(msg); const config = this.getConfigForMsg(msg);
if (!config.assignable_roles.includes(roleId)) { if (!config.assignable_roles.includes(roleId)) {
return this.sendErrorMessage(msg.channel, "You cannot assign that role"); return this.sendErrorMessage(msg.channel, "You cannot assign that role");
} }
const role = this.guild.roles.get(roleId);
if (!role) {
this.logs.log(LogType.BOT_ALERT, {
body: `Unknown role configured for 'roles' plugin: ${roleId}`,
});
return this.sendErrorMessage(msg.channel, "You cannot assign that role");
}
const membersWithoutTheRole = members.filter(m => !m.roles.includes(roleId)); const membersWithoutTheRole = members.filter(m => !m.roles.includes(roleId));
let assigned = 0; let assigned = 0;
const failed = []; const failed = [];
const alreadyHadRole = members.length - membersWithoutTheRole.length; const alreadyHadRole = members.length - membersWithoutTheRole.length;
msg.channel.createMessage(`Adding role to specified members...`); msg.channel.createMessage(
`Adding role **${role.name}** to ${membersWithoutTheRole.length} ${
membersWithoutTheRole.length === 1 ? "member" : "members"
}...`,
);
for (const member of membersWithoutTheRole) { for (const member of membersWithoutTheRole) {
try { try {
@ -159,7 +170,7 @@ export class RolesPlugin extends ZeppelinPlugin<TConfigSchema> {
} }
} }
let resultMessage = `Role added to ${assigned} ${assigned === 1 ? "member" : "members"}!`; let resultMessage = `Added role **${role.name}** to ${assigned} ${assigned === 1 ? "member" : "members"}!`;
if (alreadyHadRole) { if (alreadyHadRole) {
resultMessage += ` ${alreadyHadRole} ${alreadyHadRole === 1 ? "member" : "members"} already had the role.`; resultMessage += ` ${alreadyHadRole} ${alreadyHadRole === 1 ? "member" : "members"} already had the role.`;
} }
@ -221,7 +232,10 @@ export class RolesPlugin extends ZeppelinPlugin<TConfigSchema> {
mod: stripObjectToScalars(msg.author), mod: stripObjectToScalars(msg.author),
}); });
this.sendSuccessMessage(msg.channel, "Role removed from user!"); this.sendSuccessMessage(
msg.channel,
`Removed role **${role.name}** removed from ${verboseUserMention(args.member.user)}!`,
);
} }
@d.command("massremoverole", "<role:string> <members:string...>") @d.command("massremoverole", "<role:string> <members:string...>")
@ -248,19 +262,30 @@ export class RolesPlugin extends ZeppelinPlugin<TConfigSchema> {
if (!roleId) { if (!roleId) {
return this.sendErrorMessage(msg.channel, "Invalid role id"); return this.sendErrorMessage(msg.channel, "Invalid role id");
} }
const role = this.guild.roles.get(roleId);
const config = this.getConfigForMsg(msg); const config = this.getConfigForMsg(msg);
if (!config.assignable_roles.includes(roleId)) { if (!config.assignable_roles.includes(roleId)) {
return this.sendErrorMessage(msg.channel, "You cannot remove that role"); return this.sendErrorMessage(msg.channel, "You cannot remove that role");
} }
const role = this.guild.roles.get(roleId);
if (!role) {
this.logs.log(LogType.BOT_ALERT, {
body: `Unknown role configured for 'roles' plugin: ${roleId}`,
});
return this.sendErrorMessage(msg.channel, "You cannot remove that role");
}
const membersWithTheRole = members.filter(m => m.roles.includes(roleId)); const membersWithTheRole = members.filter(m => m.roles.includes(roleId));
let assigned = 0; let assigned = 0;
const failed = []; const failed = [];
const didNotHaveRole = members.length - membersWithTheRole.length; const didNotHaveRole = members.length - membersWithTheRole.length;
msg.channel.createMessage(`Removing role from specified members...`); msg.channel.createMessage(
`Removing role **${role.name}** from ${membersWithTheRole.length} ${
membersWithTheRole.length === 1 ? "member" : "members"
}...`,
);
for (const member of membersWithTheRole) { for (const member of membersWithTheRole) {
try { try {
@ -278,7 +303,7 @@ export class RolesPlugin extends ZeppelinPlugin<TConfigSchema> {
} }
} }
let resultMessage = `Role removed from ${assigned} ${assigned === 1 ? "member" : "members"}!`; let resultMessage = `Removed role **${role.name}** from ${assigned} ${assigned === 1 ? "member" : "members"}!`;
if (didNotHaveRole) { if (didNotHaveRole) {
resultMessage += ` ${didNotHaveRole} ${didNotHaveRole === 1 ? "member" : "members"} didn't have the role.`; resultMessage += ` ${didNotHaveRole} ${didNotHaveRole === 1 ? "member" : "members"} didn't have the role.`;
} }