Merge branch 'main' into dev
Some checks failed
NodBot Production Dockerization / build (pull_request) Has been cancelled
Some checks failed
NodBot Production Dockerization / build (pull_request) Has been cancelled
This commit is contained in:
commit
41a55319a2
@ -10,9 +10,21 @@ module.exports = {
|
||||
// message.reply(fn.spongebob(commandData)).then(() => {
|
||||
// message.delete();
|
||||
// });
|
||||
if (message.reference != undefined) {
|
||||
const repliedMessageId = message.reference.messageId;
|
||||
message.channel.messages.fetch(repliedMessageId)
|
||||
if (message.reference != undefined) { // message.reference is undefined if the message isn't a reply to another message
|
||||
if (commandData.args !== "") { // If the replying message isn't just .sb
|
||||
const repliedMessageId = message.reference.messageId; // grab the message Id of the replied-to msg
|
||||
message.channel.messages.fetch(repliedMessageId) // Fetch the message because with our luck it isn't in the cache
|
||||
.then(repliedMessage => {
|
||||
repliedMessage.reply(fn.spongebob({ args: commandData.args })).then(() => { // Use the pre-command text of the replying message to sb-ify
|
||||
if (message.deletable) message.delete(); // If the initiating message is deletable, delete it.
|
||||
});
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
});
|
||||
} else { // We're working with a basic ".sb" and can proceed as we did before...
|
||||
const repliedMessageId = message.reference.messageId; // grab the message Id of the replied-to msg
|
||||
message.channel.messages.fetch(repliedMessageId) // Fetch the message because with our luck it isn't in the cache
|
||||
.then(repliedMessage => {
|
||||
repliedMessage.reply(fn.spongebob({ args: repliedMessage.content })).then(() => {
|
||||
if (message.deletable) message.delete();
|
||||
@ -21,9 +33,10 @@ module.exports = {
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
});
|
||||
} else {
|
||||
}
|
||||
} else { // The message isn't a reply, so just sb it like we did from the very beginning
|
||||
message.channel.send(fn.spongebob(commandData)).then(() => {
|
||||
if (message.deletable) message.delete();
|
||||
if (message.deletable) message.delete(); // If the initiating message is deletable, delete it.
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -182,7 +182,7 @@ const functions = {
|
||||
// Get the first part of the message, everything leading up to the final period
|
||||
commandData.args = message.content.slice(0,finalPeriod).toLowerCase();
|
||||
// Get the last part of the message, everything after the final period
|
||||
commandData.command = message.content.slice(finalPeriod).replace('.','').toLowerCase();
|
||||
commandData.command = message.content.slice(finalPeriod + 1).toLowerCase();
|
||||
commandData.author = `${message.author.username}`;
|
||||
return this.checkCommand(commandData);
|
||||
},
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nodbot",
|
||||
"version": "3.2.1",
|
||||
"version": "3.2.2",
|
||||
"description": "Nods and Nod Accessories, now with ChatGPT!",
|
||||
"main": "main.js",
|
||||
"dependencies": {
|
||||
|
Loading…
Reference in New Issue
Block a user