dan/Shasha
1
0
Fork 0
mirror of https://github.com/danbulant/Shasha synced 2026-07-05 19:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: trySend return array

Browse source
This commit is contained in:
Neko-Life 2021-08-06 00:20:19 +07:00
parent 6475584fab
commit 3592cf5953
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/functions.js
View file

@ -97,7 +97,7 @@ function execCB(error, stdout, stderr) {
* @param {string} addition * @param {string} addition
*/ */
async function ranLog(msg, addition) { async function ranLog(msg, addition) {
if (typeof addition != "string") return console.log(`[RANLOG] Not a string:`, addition); if (typeof addition !== "string") return console.error(`[RANLOG] Not a string:`, addition);
const channel = msg.client.channels.cache.get(ranLogger), const channel = msg.client.channels.cache.get(ranLogger),
ifCode = addition?.startsWith("```") && addition.endsWith("```"); ifCode = addition?.startsWith("```") && addition.endsWith("```");
const addSplit = splitOnLength((addition?.substr(ifCode ? 2045 : 2049)).split(","), 1010, ","); const addSplit = splitOnLength((addition?.substr(ifCode ? 2045 : 2049)).split(","), 1010, ",");
@ -200,7 +200,11 @@ async function trySend(client, msgOrChannel, content, checkAd = true) {
} }
} }
if (!((msgOrChannel instanceof Message) || (msgOrChannel instanceof TextChannel) || (msgOrChannel instanceof DMChannel))) return errLog(e, null, client, false, "[TRYSEND] Invalid {msgOrChannel} type.```js\n" + JSON.stringify(msgOrChannel, (k, v) => v ?? undefined, 2) + "```"); if (!((msgOrChannel instanceof Message) || (msgOrChannel instanceof TextChannel) || (msgOrChannel instanceof DMChannel))) return errLog(e, null, client, false, "[TRYSEND] Invalid {msgOrChannel} type.```js\n" + JSON.stringify(msgOrChannel, (k, v) => v ?? undefined, 2) + "```");
const ret = await (msgOrChannel.channel || msgOrChannel).send(content).catch(/*msgOrChannel.channel ? noPerm(msgOrChannel) :*/ e => errLog(e, msgOrChannel, client)); let ret = await (msgOrChannel.channel || msgOrChannel).send(content).catch(/*msgOrChannel.channel ? noPerm(msgOrChannel) :*/ e => errLog(e, msgOrChannel, client));
if (ret?.[0] instanceof Message) {
// console.log(ret, typeof ret);
ret = ret[0];
}
await (msgOrChannel.channel || msgOrChannel).stopTyping(); await (msgOrChannel.channel || msgOrChannel).stopTyping();
setTimeout(() => { setTimeout(() => {
if (client.user.typingIn(msgOrChannel.channel || msgOrChannel)) { if (client.user.typingIn(msgOrChannel.channel || msgOrChannel)) {