mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-05-10 12:25:02 +00:00
Merge master
This commit is contained in:
commit
1518d58e25
53 changed files with 289 additions and 320 deletions
|
@ -10,7 +10,7 @@ import moment from "moment-timezone";
|
|||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { humanizeDurationShort } from "../../../humanizeDurationShort";
|
||||
import { getBaseUrl } from "../../../pluginUtils";
|
||||
import { DBDateFormat, MINUTES, renderUserUsername, resolveMember } from "../../../utils";
|
||||
import { DBDateFormat, MINUTES, renderUsername, resolveMember } from "../../../utils";
|
||||
import { IMuteWithDetails, mutesCmd } from "../types";
|
||||
|
||||
export const MutesCmd = mutesCmd({
|
||||
|
@ -74,7 +74,7 @@ export const MutesCmd = mutesCmd({
|
|||
totalMutes = manuallyMutedMembers.length;
|
||||
|
||||
lines = manuallyMutedMembers.map((member) => {
|
||||
return `<@!${member.id}> (**${renderUserUsername(member.user)}**, \`${member.id}\`) 🔧 Manual mute`;
|
||||
return `<@!${member.id}> (**${renderUsername(member)}**, \`${member.id}\`) 🔧 Manual mute`;
|
||||
});
|
||||
} else {
|
||||
// Show filtered active mutes (but not manual mutes)
|
||||
|
@ -123,7 +123,7 @@ export const MutesCmd = mutesCmd({
|
|||
|
||||
lines = filteredMutes.map((mute) => {
|
||||
const user = pluginData.client.users.resolve(mute.user_id as Snowflake);
|
||||
const username = user ? renderUserUsername(user) : "Unknown#0000";
|
||||
const username = user ? renderUsername(user) : "Unknown#0000";
|
||||
const theCase = muteCasesById.get(mute.case_id);
|
||||
const caseName = theCase ? `Case #${theCase.case_number}` : "No case";
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue