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

epic

Browse source
This commit is contained in:
Neko Life 2021-06-28 17:02:53 +09:00
parent 204442b126
commit 13f8a4d43a
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmds/fun/chat.js
View file

@ -15,15 +15,14 @@ module.exports = class chat extends commando.Command {
}
async run(msg, args) {
if (!args) {
return trySend("Ask me somethin?");
return trySend(msg.client, msg, "Ask me somethin?");
}
return msg.channel.startTyping()
.then(
trySend(this.client, msg, await chatAnswer(
msg.cleanContent.slice((msg.guild.commandPrefix + msg.command.name).length + 1)
))).then(r => {
return r;
}).catch(() => { })
msg.cleanContent.slice((msg.guild.commandPrefix + msg.command.name).length).trim()
)).then(r => r)
).catch(() => { })
.finally(msg.channel.stopTyping());
}
};

24
resources/eventsLogger/message.js
View file

@ -7,27 +7,25 @@ const { chatAnswer } = require("../shaChat");
function giveNickHeart(msg) {
if (/(?<!(remove|dont|don't|no|neve).*)(giv|put).*(heart|nick).*(nick|heart)/i.test(msg.content) && !msg.member.displayName?.endsWith("<3")) {
return msg.member.setNickname(msg.member.displayName + " <3")
.then(r => {
if (r) return trySend(msg.client, msg, "YES! <3 <3");
})
.catch(e => noPerm(msg));
.then(r => {
if (r) return trySend(msg.client, msg, "YES! <3 <3");
})
.catch(e => noPerm(msg));
}
if (/(dont|don't|no|neve|remove).*(giv|put)?.*(heart|nick).*(nick|heart)/i.test(msg.content) && msg.member.displayName?.endsWith(" <3")) {
return msg.member.setNickname(msg.member.displayName.slice(0, -3))
.then(r => {
if (r) return trySend(msg.client, msg, "okay <3");
})
.catch(e => noPerm(msg));
.then(r => {
if (r) return trySend(msg.client, msg, "okay <3");
})
.catch(e => noPerm(msg));
}
}
async function letsChat(msg) {
if (msg.channel.id === configFile.chatChannel && !msg.author.bot && !msg.isCommand && msg.cleanContent.length > 0) {
return msg.channel.startTyping().then(trySend(msg.client, msg, await chatAnswer(msg.cleanContent))
).then(r => {
return r;
}).catch(() => {})
.finally(msg.channel.stopTyping());
return msg.channel.startTyping().then(trySend(msg.client, msg, await chatAnswer(msg.cleanContent)).then(r => r)
).catch(() => { })
.finally(msg.channel.stopTyping());
}
}