StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some more patches thanks to ruby

Browse source 
Signed-off-by: GitHub <noreply@github.com>
This commit is contained in:
Tiago R 2023-11-26 14:53:54 +00:00
parent ba4a2b45b8
commit 10bb0b67bc
18 changed files with 69 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/plugins/Utility/commands/AboutCmd.ts
View file

@ -100,8 +100,8 @@ export const AboutCmd = utilityCmd({
}
// Use the bot avatar as the embed image
if (pluginData.client.user!.avatarURL()) {
aboutEmbed.thumbnail = { url: pluginData.client.user!.avatarURL()! };
if (pluginData.client.user!.displayAvatarURL()) {
aboutEmbed.thumbnail = { url: pluginData.client.user!.displayAvatarURL()! };
}
msg.channel.send({ embeds: [aboutEmbed] });

8
backend/src/plugins/Utility/commands/AvatarCmd.ts
View file

@ -1,7 +1,7 @@
import { APIEmbed, ImageFormat } from "discord.js";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage } from "../../../pluginUtils";
import { UnknownUser, renderUserUsername } from "../../../utils";
import { UnknownUser, renderUsername } from "../../../utils";
import { utilityCmd } from "../types";
export const AvatarCmd = utilityCmd({
@ -10,17 +10,17 @@ export const AvatarCmd = utilityCmd({
permission: "can_avatar",
signature: {
user: ct.resolvedUserLoose({ required: false }),
user: ct.resolvedMember({ required: false }) || ct.resolvedUserLoose({ required: false }),
},
async run({ message: msg, args, pluginData }) {
const user = args.user || msg.author;
const user = args.user || msg.member || msg.author;
if (!(user instanceof UnknownUser)) {
const embed: APIEmbed = {
image: {
url: user.displayAvatarURL({ extension: ImageFormat.PNG, size: 2048 }),
},
title: `Avatar of ${renderUserUsername(user)}:`,
title: `Avatar of ${renderUsername(user)}:`,
};
msg.channel.send({ embeds: [embed] });
} else {

5
backend/src/plugins/Utility/functions/getUserInfoEmbed.ts
View file

@ -13,7 +13,6 @@ import {
trimLines,
UnknownUser,
} from "../../../utils";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
import { UtilityPluginType } from "../types";
const MAX_ROLES_TO_DISPLAY = 15;
@ -40,13 +39,11 @@ export async function getUserInfoEmbed(
fields: [],
};
const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin);
embed.author = {
name: `${user.bot ? "Bot" : "User"}: ${renderUsername(user)}`,
};
const avatarURL = user.displayAvatarURL();
const avatarURL = (member || user).displayAvatarURL();
embed.author.icon_url = avatarURL;
if (compact) {

10
backend/src/plugins/Utility/search.ts
View file

@ -14,7 +14,7 @@ import { ArgsFromSignatureOrArray, GuildPluginData } from "knub";
import moment from "moment-timezone";
import { RegExpRunner, allowTimeout } from "../../RegExpRunner";
import { getBaseUrl, sendErrorMessage } from "../../pluginUtils";
import { MINUTES, multiSorter, renderUserUsername, sorter, trimLines } from "../../utils";
import { MINUTES, multiSorter, renderUsername, sorter, trimLines } from "../../utils";
import { asyncFilter } from "../../utils/async";
import { hasDiscordPermissions } from "../../utils/hasDiscordPermissions";
import { InvalidRegexError, inputPatternToRegExp } from "../../validatorUtils";
@ -381,7 +381,7 @@ async function performMemberSearch(
return true;
}
const fullUsername = renderUserUsername(member.user);
const fullUsername = renderUsername(member.user);
if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
return false;
@ -448,7 +448,7 @@ async function performBanSearch(
const execRegExp = getOptimizedRegExpRunner(pluginData, isSafeRegex);
matchingBans = await asyncFilter(matchingBans, async (user) => {
const fullUsername = renderUserUsername(user);
const fullUsername = renderUsername(user);
if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
return false;
});
@ -492,10 +492,10 @@ function formatSearchResultList(members: Array<GuildMember | User>): string {
const paddedId = member.id.padEnd(longestId, " ");
let line;
if (member instanceof GuildMember) {
line = `${paddedId} ${renderUserUsername(member.user)}`;
line = `${paddedId} ${renderUsername(member.user)}`;
if (member.nickname) line += ` (${member.nickname})`;
} else {
line = `${paddedId} ${member.tag}`;
line = `${paddedId} ${renderUsername(member)}`;
}
return line;
});