mirror of
https://github.com/danbulant/Shasha
synced 2026-07-08 04:21:06 +00:00
more efficient (?)
This commit is contained in:
parent
2444e6263d
commit
799bc63966
1 changed files with 9 additions and 4 deletions
|
|
@ -156,7 +156,7 @@ function multipleMembersFound(msg, arr, key, max = 4, withID, withNick) {
|
||||||
function findMemberRegEx(base, key) {
|
function findMemberRegEx(base, key) {
|
||||||
if (!base || !key) return;
|
if (!base || !key) return;
|
||||||
const re = new RegExp(key, "i");
|
const re = new RegExp(key, "i");
|
||||||
return (base.guild ?? base).members.cache.map(r => r).filter(r => re.test(r.displayName) || re.test(r.user.tag));
|
return (base.guild ?? base).members.cache.filter(r => re.test(r.displayName) || re.test(r.user.tag)).map(r => r);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -301,13 +301,13 @@ function cleanMentionID(key) {
|
||||||
function findChannelRegEx(msg, name, exclude) {
|
function findChannelRegEx(msg, name, exclude) {
|
||||||
if (!msg || !name) return;
|
if (!msg || !name) return;
|
||||||
const re = new RegExp(name, "i");
|
const re = new RegExp(name, "i");
|
||||||
return (msg.guild || msg).channels.cache.map(r => r).filter(r => {
|
return (msg.guild || msg).channels.cache.filter(r => {
|
||||||
if (exclude?.includes(r.type)) {
|
if (exclude?.includes(r.type)) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return re.test(r.name);
|
return re.test(r.name);
|
||||||
}
|
}
|
||||||
});
|
}).map(r => r);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -319,7 +319,7 @@ function findChannelRegEx(msg, name, exclude) {
|
||||||
function findRoleRegEx(msg, name) {
|
function findRoleRegEx(msg, name) {
|
||||||
if (!msg || !name) return;
|
if (!msg || !name) return;
|
||||||
const re = new RegExp(name, "i");
|
const re = new RegExp(name, "i");
|
||||||
return (msg.guild || msg).roles.cache.map(r => r).filter(r => re.test(r.name));
|
return (msg.guild || msg).roles.cache.filter(r => re.test(r.name)).map(r => r);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -520,6 +520,11 @@ async function getUser(msg, key, inGuild = false) {
|
||||||
} else if (inGuild) return getMember(msg.guild, use)[0]?.user;
|
} else if (inGuild) return getMember(msg.guild, use)[0]?.user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {Guild} guild
|
||||||
|
* @param {string} key
|
||||||
|
* @returns {Role}
|
||||||
|
*/
|
||||||
function getRole(guild, key) {
|
function getRole(guild, key) {
|
||||||
if (!(guild || key)) return;
|
if (!(guild || key)) return;
|
||||||
const use = cleanMentionID(key);
|
const use = cleanMentionID(key);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue