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

almeida review.mp4

Browse source 
Signed-off-by: GitHub <noreply@github.com>
This commit is contained in:
Tiago R 2023-11-26 17:02:54 +00:00
parent e0637a206f
commit 2b5a5e636a
18 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ export const AvatarCmd = utilityCmd({
},
async run({ message: msg, args, pluginData }) {
const user = args.user || msg.member || msg.author;
const user = args.user ?? msg.member ?? msg.author;
if (!(user instanceof UnknownUser)) {
const embed: APIEmbed = {
image: {

2
backend/src/plugins/Utility/commands/LevelCmd.ts
View file

@ -18,6 +18,6 @@ export const LevelCmd = utilityCmd({
run({ message, args, pluginData }) {
const member = args.member || message.member;
const level = getMemberLevel(pluginData, member);
message.channel.send(`The permission level of ${renderUsername(member.user)} is **${level}**`);
message.channel.send(`The permission level of ${renderUsername(member)} is **${level}**`);
},
});

2
backend/src/plugins/Utility/commands/VcdisconnectCmd.ts
View file

@ -43,7 +43,7 @@ export const VcdisconnectCmd = utilityCmd({
sendSuccessMessage(
pluginData,
msg.channel,
`**${renderUsername(args.member.user)}** disconnected from **${channel.name}**`,
`**${renderUsername(args.member)}** disconnected from **${channel.name}**`,
);
},
});

10
backend/src/plugins/Utility/commands/VcmoveCmd.ts
View file

@ -80,7 +80,7 @@ export const VcmoveCmd = utilityCmd({
newChannel: channel,
});
sendSuccessMessage(pluginData, msg.channel, `**${renderUsername(args.member.user)}** moved to **${channel.name}**`);
sendSuccessMessage(pluginData, msg.channel, `**${renderUsername(args.member)}** moved to **${channel.name}**`);
},
});
@ -153,7 +153,7 @@ export const VcmoveAllCmd = utilityCmd({
sendErrorMessage(
pluginData,
msg.channel,
`Failed to move ${renderUsername(currMember.user)} (${currMember.id}): You cannot act on this member`,
`Failed to move ${renderUsername(currMember)} (${currMember.id}): You cannot act on this member`,
);
errAmt++;
continue;
@ -168,11 +168,7 @@ export const VcmoveAllCmd = utilityCmd({
sendErrorMessage(pluginData, msg.channel, "Unknown error when trying to move members");
return;
}
sendErrorMessage(
pluginData,
msg.channel,
`Failed to move ${renderUsername(currMember.user)} (${currMember.id})`,
);
sendErrorMessage(pluginData, msg.channel, `Failed to move ${renderUsername(currMember)} (${currMember.id})`);
errAmt++;
continue;
}

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

@ -43,7 +43,7 @@ export async function getUserInfoEmbed(
name: `${user.bot ? "Bot" : "User"}: ${renderUsername(user)}`,
};
const avatarURL = (member || user).displayAvatarURL();
const avatarURL = (member ?? user).displayAvatarURL();
embed.author.icon_url = avatarURL;
if (compact) {

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

@ -381,7 +381,7 @@ async function performMemberSearch(
return true;
}
const fullUsername = renderUsername(member.user);
const fullUsername = renderUsername(member);
if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
return false;
@ -492,7 +492,7 @@ function formatSearchResultList(members: Array<GuildMember | User>): string {
const paddedId = member.id.padEnd(longestId, " ");
let line;
if (member instanceof GuildMember) {
line = `${paddedId} ${renderUsername(member.user)}`;
line = `${paddedId} ${renderUsername(member)}`;
if (member.nickname) line += ` (${member.nickname})`;
} else {
line = `${paddedId} ${renderUsername(member)}`;