diff --git a/src/commands/admin.ts b/src/commands/admin.ts index 35c3ff2..f174750 100644 --- a/src/commands/admin.ts +++ b/src/commands/admin.ts @@ -158,8 +158,7 @@ export default new Command({ permission: Command.PERMISSIONS.BOT_SUPPORT, async run($: CommonLibrary): Promise { const nickName = $.args.join(" "); - const trav = $.guild?.members.cache.find((member) => member.id === $.client.user?.id); - await trav?.setNickname(nickName); + await $.guild?.me?.setNickname(nickName); if (botHasPermission($.guild, Permissions.FLAGS.MANAGE_MESSAGES)) $.message.delete({timeout: 5000}).catch($.handler.bind($)); $.channel.send(`Nickname set to \`${nickName}\``).then((m) => m.delete({timeout: 5000})); diff --git a/src/commands/info.ts b/src/commands/info.ts index 56b5277..9b7b71a 100644 --- a/src/commands/info.ts +++ b/src/commands/info.ts @@ -76,10 +76,13 @@ export default new Command({ description: "Displays info about the current guild.", async run($: CommonLibrary): Promise { if ($.guild) { + const members = await $.guild.members.fetch({ + withPresences: true, + force: true + }); const roles = $.guild.roles.cache .sort((a, b) => b.position - a.position) .map((role) => role.toString()); - const members = $.guild.members.cache; const channels = $.guild.channels.cache; const emojis = $.guild.emojis.cache; const iconURL = $.guild.iconURL({dynamic: true}); diff --git a/src/core/lib.ts b/src/core/lib.ts index 0f5f193..4cadf4d 100644 --- a/src/core/lib.ts +++ b/src/core/lib.ts @@ -172,7 +172,7 @@ export function formatUTCTimestamp(now = new Date()) { } export function botHasPermission(guild: Guild | null, permission: number): boolean { - return !!(guild?.me?.hasPermission(permission)); + return !!guild?.me?.hasPermission(permission); } export function updateGlobalEmoteRegistry(): void { @@ -216,20 +216,22 @@ $.paginate = async ( callback(page); }; + const BACKWARDS_EMOJI = "⬅️"; + const FORWARDS_EMOJI = "➡️"; const handle = (emote: string, reacterID: string) => { switch (emote) { - case "⬅️": + case BACKWARDS_EMOJI: turn(-1); break; - case "➡️": + case FORWARDS_EMOJI: turn(1); break; } }; // Listen for reactions and call the handler. - await message.react("⬅️"); - await message.react("➡️"); + let backwardsReaction = await message.react(BACKWARDS_EMOJI); + let forwardsReaction = await message.react(FORWARDS_EMOJI); eventListeners.set(message.id, handle); await message.awaitReactions( (reaction, user) => { @@ -248,8 +250,8 @@ $.paginate = async ( ); // When time's up, remove the bot's own reactions. eventListeners.delete(message.id); - message.reactions.cache.get("⬅️")?.users.remove(message.author); - message.reactions.cache.get("➡️")?.users.remove(message.author); + backwardsReaction.users.remove(message.author); + forwardsReaction.users.remove(message.author); }; // Waits for the sender to either confirm an action or let it pass (and delete the message).