3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 22:21:51 +00:00

More work on porting Utility commands

This commit is contained in:
Dragory 2020-07-06 00:53:28 +03:00
parent 9bb72e0ffd
commit 017fcd93cc
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
6 changed files with 187 additions and 45 deletions

View file

@ -8,15 +8,14 @@ import { Supporters } from "../../data/Supporters";
import { ServerCmd } from "./commands/ServerCmd"; import { ServerCmd } from "./commands/ServerCmd";
import { RolesCmd } from "./commands/RolesCmd"; import { RolesCmd } from "./commands/RolesCmd";
import { LevelCmd } from "./commands/LevelCmd"; import { LevelCmd } from "./commands/LevelCmd";
import { SearchCmd } from "./commands/SearchCmd";
import { BanSearchCmd } from "./commands/BanSearchCmd";
import { InfoCmd } from "./commands/InfoCmd";
export const UtilityPlugin = zeppelinPlugin<UtilityPluginType>()("utility", { export const UtilityPlugin = zeppelinPlugin<UtilityPluginType>()("utility", {
configSchema: ConfigSchema, configSchema: ConfigSchema,
commands: [ commands: [BanSearchCmd, InfoCmd, LevelCmd, RolesCmd, SearchCmd, ServerCmd],
LevelCmd,
RolesCmd,
ServerCmd,
],
onLoad({ state, guild }) { onLoad({ state, guild }) {
state.logs = new GuildLogs(guild.id); state.logs = new GuildLogs(guild.id);
@ -26,5 +25,5 @@ export const UtilityPlugin = zeppelinPlugin<UtilityPluginType>()("utility", {
state.supporters = new Supporters(); state.supporters = new Supporters();
state.lastReload = Date.now(); state.lastReload = Date.now();
} },
}); });

View file

@ -1,6 +1,6 @@
import { utilityCmd } from "../types"; import { utilityCmd } from "../types";
import { baseTypeHelpers as t } from "knub"; import { baseTypeHelpers as t } from "knub";
import { archiveSearch, displaySearch, SearchType } from "./search"; import { archiveSearch, displaySearch, SearchType } from "../search";
// Separate from BanSearchCmd to avoid a circular reference from ./search.ts // Separate from BanSearchCmd to avoid a circular reference from ./search.ts
export const banSearchSignature = { export const banSearchSignature = {

View file

@ -0,0 +1,143 @@
import { utilityCmd } from "../types";
import { baseTypeHelpers as t } from "knub";
import { customArgumentHelpers as ct } from "../../../customArgumentTypes";
import { embedPadding, resolveMember, trimLines, UnknownUser } from "../../../utils";
import { EmbedOptions, GuildTextableChannel } from "eris";
import moment from "moment-timezone";
import humanizeDuration from "humanize-duration";
import { CaseTypes } from "../../../data/CaseTypes";
export const InfoCmd = utilityCmd({
trigger: "info",
description: "Show basic information about a user",
usage: "!info 106391128718245888",
permission: "can_info",
signature: {
user: ct.resolvedUserLoose({ required: false }),
compact: t.switchOption({ shortcut: "c" }),
},
async run({ message: msg, args, pluginData }) {
const user = args.user || msg.author;
let member;
if (!(user instanceof UnknownUser)) {
member = await resolveMember(pluginData.client, (msg.channel as GuildTextableChannel).guild, user.id);
}
const embed: EmbedOptions = {
fields: [],
};
if (user && !(user instanceof UnknownUser)) {
const createdAt = moment(user.createdAt);
const accountAge = humanizeDuration(moment().valueOf() - user.createdAt, {
largest: 2,
round: true,
});
embed.title = `${user.username}#${user.discriminator}`;
embed.thumbnail = { url: user.avatarURL };
if (args.compact) {
embed.fields.push({
name: "User information",
value: trimLines(`
Profile: <@!${user.id}>
Created: **${accountAge} ago (${createdAt.format("YYYY-MM-DD[T]HH:mm:ss")})**
`),
});
if (member) {
const joinedAt = moment(member.joinedAt);
const joinAge = humanizeDuration(moment().valueOf() - member.joinedAt, {
largest: 2,
round: true,
});
embed.fields[0].value += `\nJoined: **${joinAge} ago (${joinedAt.format("YYYY-MM-DD[T]HH:mm:ss")})**`;
} else {
embed.fields.push({
name: "!! USER IS NOT ON THE SERVER !!",
value: embedPadding,
});
}
msg.channel.createMessage({ embed });
return;
} else {
embed.fields.push({
name: "User information",
value:
trimLines(`
ID: **${user.id}**
Profile: <@!${user.id}>
Created: **${accountAge} ago (${createdAt.format("YYYY-MM-DD[T]HH:mm:ss")})**
`) + embedPadding,
});
}
} else {
embed.title = `Unknown user`;
}
if (member) {
const joinedAt = moment(member.joinedAt);
const joinAge = humanizeDuration(moment().valueOf() - member.joinedAt, {
largest: 2,
round: true,
});
const roles = member.roles.map(id => pluginData.guild.roles.get(id)).filter(r => !!r);
embed.fields.push({
name: "Member information",
value:
trimLines(`
Joined: **${joinAge} ago (${joinedAt.format("YYYY-MM-DD[T]HH:mm:ss")})**
${roles.length > 0 ? "Roles: " + roles.map(r => r.name).join(", ") : ""}
`) + embedPadding,
});
const voiceChannel = member.voiceState.channelID
? pluginData.guild.channels.get(member.voiceState.channelID)
: null;
if (voiceChannel || member.voiceState.mute || member.voiceState.deaf) {
embed.fields.push({
name: "Voice information",
value:
trimLines(`
${voiceChannel ? `Current voice channel: **${voiceChannel ? voiceChannel.name : "None"}**` : ""}
${member.voiceState.mute ? "Server voice muted: **Yes**" : ""}
${member.voiceState.deaf ? "Server voice deafened: **Yes**" : ""}
`) + embedPadding,
});
}
} else {
embed.fields.push({
name: "!! USER IS NOT ON THE SERVER !!",
value: embedPadding,
});
}
const cases = (await pluginData.state.cases.getByUserId(user.id)).filter(c => !c.is_hidden);
if (cases.length > 0) {
cases.sort((a, b) => {
return a.created_at < b.created_at ? 1 : -1;
});
const caseSummary = cases.slice(0, 3).map(c => {
return `${CaseTypes[c.type]} (#${c.case_number})`;
});
const summaryText = cases.length > 3 ? "Last 3 cases" : "Summary";
embed.fields.push({
name: "Cases",
value: trimLines(`
Total cases: **${cases.length}**
${summaryText}: ${caseSummary.join(", ")}
`),
});
}
msg.channel.createMessage({ embed });
},
});

View file

@ -1,6 +1,6 @@
import { utilityCmd } from "../types"; import { utilityCmd } from "../types";
import { baseTypeHelpers as t } from "knub"; import { baseTypeHelpers as t } from "knub";
import { archiveSearch, displaySearch, SearchType } from "./search"; import { archiveSearch, displaySearch, SearchType } from "../search";
// Separate from SearchCmd to avoid a circular reference from ./search.ts // Separate from SearchCmd to avoid a circular reference from ./search.ts
export const searchCmdSignature = { export const searchCmdSignature = {

View file

@ -1,4 +1,4 @@
import { CategoryChannel, EmbedOptions, TextChannel, VoiceChannel } from "eris"; import { CategoryChannel, EmbedOptions, RESTChannelInvite, TextChannel, VoiceChannel } from "eris";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { embedPadding, formatNumber, memoize, MINUTES, trimLines } from "../../../utils"; import { embedPadding, formatNumber, memoize, MINUTES, trimLines } from "../../../utils";
import { utilityCmd } from "../types"; import { utilityCmd } from "../types";
@ -10,56 +10,56 @@ export const ServerCmd = utilityCmd({
usage: "!server", usage: "!server",
permission: "can_server", permission: "can_server",
async run({ message }) { async run({ message, pluginData }) {
const { guild } = pluginData;
const embed: EmbedOptions = { const embed: EmbedOptions = {
fields: [], fields: [],
color: parseInt("6b80cf", 16), color: parseInt("6b80cf", 16),
}; };
embed.thumbnail = { url: this.guild.iconURL }; embed.thumbnail = { url: guild.iconURL };
const createdAt = moment(this.guild.createdAt); const createdAt = moment(guild.createdAt);
const serverAge = humanizeDuration(moment().valueOf() - this.guild.createdAt, { const serverAge = humanizeDuration(moment().valueOf() - guild.createdAt, {
largest: 2, largest: 2,
round: true, round: true,
}); });
const owner = this.bot.users.get(this.guild.ownerID); const owner = pluginData.client.users.get(guild.ownerID);
const ownerName = owner ? `${owner.username}#${owner.discriminator}` : "Unknown#0000"; const ownerName = owner ? `${owner.username}#${owner.discriminator}` : "Unknown#0000";
embed.fields.push({ embed.fields.push({
name: `Server information - ${this.guild.name}`, name: `Server information - ${guild.name}`,
value: value:
trimLines(` trimLines(`
Created: **${serverAge} ago** (${createdAt.format("YYYY-MM-DD[T]HH:mm:ss")}) Created: **${serverAge} ago** (${createdAt.format("YYYY-MM-DD[T]HH:mm:ss")})
Owner: **${ownerName}** (${this.guild.ownerID}) Owner: **${ownerName}** (${guild.ownerID})
Voice region: **${this.guild.region}** Voice region: **${guild.region}**
${this.guild.features.length > 0 ? "Features: " + this.guild.features.join(", ") : ""} ${guild.features.length > 0 ? "Features: " + guild.features.join(", ") : ""}
`) + embedPadding, `) + embedPadding,
}); });
const restGuild = await memoize( const restGuild = await memoize(
() => this.bot.getRESTGuild(this.guildId), () => pluginData.client.getRESTGuild(guild.id),
`getRESTGuild_${this.guildId}`, `getRESTGuild_${guild.id}`,
10 * MINUTES, 10 * MINUTES,
); );
// For servers with a vanity URL, we can use the numbers from the invite for online count // For servers with a vanity URL, we can use the numbers from the invite for online count
// (which is nowadays usually more accurate for large servers) // (which is nowadays usually more accurate for large servers)
const invite = this.guild.vanityURL const invite = guild.vanityURL
? await memoize( ? ((await memoize(
() => this.bot.getInvite(this.guild.vanityURL, true), () => pluginData.client.getInvite(guild.vanityURL, true),
`getInvite_${this.guild.vanityURL}`, `getInvite_${guild.vanityURL}`,
10 * MINUTES, 10 * MINUTES,
) )) as RESTChannelInvite)
: null; : null;
const totalMembers = invite ? invite.memberCount : this.guild.memberCount; const totalMembers = invite?.memberCount || guild.memberCount;
const onlineMemberCount = invite const onlineMemberCount = invite ? invite.presenceCount : guild.members.filter(m => m.status !== "offline").length;
? invite.presenceCount const offlineMemberCount = guild.memberCount - onlineMemberCount;
: this.guild.members.filter(m => m.status !== "offline").length;
const offlineMemberCount = this.guild.memberCount - onlineMemberCount;
let memberCountTotalLines = `Total: **${formatNumber(totalMembers)}**`; let memberCountTotalLines = `Total: **${formatNumber(totalMembers)}**`;
if (restGuild.maxMembers) { if (restGuild.maxMembers) {
@ -81,10 +81,10 @@ export const ServerCmd = utilityCmd({
`), `),
}); });
const totalChannels = this.guild.channels.size; const totalChannels = guild.channels.size;
const categories = this.guild.channels.filter(channel => channel instanceof CategoryChannel); const categories = guild.channels.filter(channel => channel instanceof CategoryChannel);
const textChannels = this.guild.channels.filter(channel => channel instanceof TextChannel); const textChannels = guild.channels.filter(channel => channel instanceof TextChannel);
const voiceChannels = this.guild.channels.filter(channel => channel instanceof VoiceChannel); const voiceChannels = guild.channels.filter(channel => channel instanceof VoiceChannel);
embed.fields.push({ embed.fields.push({
name: "Channels", name: "Channels",
@ -104,16 +104,16 @@ export const ServerCmd = utilityCmd({
1: 100, 1: 100,
2: 150, 2: 150,
3: 250, 3: 250,
}[this.guild.premiumTier] || 50; }[guild.premiumTier] || 50;
embed.fields.push({ embed.fields.push({
name: "Other stats", name: "Other stats",
inline: true, inline: true,
value: value:
trimLines(` trimLines(`
Roles: **${this.guild.roles.size}** / 250 Roles: **${guild.roles.size}** / 250
Emojis: **${this.guild.emojis.length}** / ${maxEmojis} Emojis: **${guild.emojis.length}** / ${maxEmojis}
Boosts: **${this.guild.premiumSubscriptionCount ?? 0}** (level ${this.guild.premiumTier}) Boosts: **${guild.premiumSubscriptionCount ?? 0}** (level ${guild.premiumTier})
`) + embedPadding, `) + embedPadding,
}); });

View file

@ -2,14 +2,14 @@ import { Member, Message, User } from "eris";
import moment from "moment-timezone"; import moment from "moment-timezone";
import escapeStringRegexp from "escape-string-regexp"; import escapeStringRegexp from "escape-string-regexp";
import safeRegex from "safe-regex"; import safeRegex from "safe-regex";
import { isFullMessage, MINUTES, multiSorter, noop, sorter, trimLines } from "../../../utils"; import { isFullMessage, MINUTES, multiSorter, noop, sorter, trimLines } from "../../utils";
import { sendErrorMessage } from "../../../pluginUtils"; import { sendErrorMessage } from "../../pluginUtils";
import { PluginData } from "knub"; import { PluginData } from "knub";
import { ArgsFromSignatureOrArray } from "knub/dist/commands/commandUtils"; import { ArgsFromSignatureOrArray } from "knub/dist/commands/commandUtils";
import { searchCmdSignature } from "./SearchCmd"; import { searchCmdSignature } from "./commands/SearchCmd";
import { banSearchSignature } from "./BanSearchCmd"; import { banSearchSignature } from "./commands/BanSearchCmd";
import { UtilityPluginType } from "../types"; import { UtilityPluginType } from "./types";
import { refreshMembersIfNeeded } from "../refreshMembers"; import { refreshMembersIfNeeded } from "./refreshMembers";
const SEARCH_RESULTS_PER_PAGE = 15; const SEARCH_RESULTS_PER_PAGE = 15;
const SEARCH_ID_RESULTS_PER_PAGE = 50; const SEARCH_ID_RESULTS_PER_PAGE = 50;