From eec2973ed34a719f2dd708a14b012e4f9415ded1 Mon Sep 17 00:00:00 2001 From: walcutt Date: Sun, 13 Oct 2024 16:05:03 -0400 Subject: [PATCH 1/6] Add shame edit method --- asher/src/index.js | 4 ++-- asher/src/routines/message-update/shame-edit.js | 11 +++++++++++ asher/src/routines/routineManifest.js | 7 +++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 asher/src/routines/message-update/shame-edit.js diff --git a/asher/src/index.js b/asher/src/index.js index f5834b6..1d5da6a 100644 --- a/asher/src/index.js +++ b/asher/src/index.js @@ -15,9 +15,9 @@ const client = new Client({ intents: [ routineManifest.forEach( (eventClass) => { - client.on(eventClass.event, (event) => { + client.on(eventClass.event, (...eventArgs) => { eventClass.routines.forEach( - (routine) => routine(event) + (routine) => routine(...eventArgs) ) }); } diff --git a/asher/src/routines/message-update/shame-edit.js b/asher/src/routines/message-update/shame-edit.js new file mode 100644 index 0000000..a2fe210 --- /dev/null +++ b/asher/src/routines/message-update/shame-edit.js @@ -0,0 +1,11 @@ +export function shameEdit(oldMessage, newMessage) { + const oldContent = oldMessage.content; + const newContent = newMessage.content; + + const user = oldMessage.author.displayName; + const timestamp = newMessage.createdTimestamp; + + const messageToSend = `${user} edited this message at . It used to say:\n${oldContent}`; + + newMessage.reply(messageToSend).then((m) => m.pin()); +} \ No newline at end of file diff --git a/asher/src/routines/routineManifest.js b/asher/src/routines/routineManifest.js index a41472c..104ab8b 100644 --- a/asher/src/routines/routineManifest.js +++ b/asher/src/routines/routineManifest.js @@ -3,6 +3,7 @@ import { Events } from "discord.js"; import { startupHeartbeat } from "./client-ready/startup-heartbeat/startupHeartbeat.js"; import { startupSendMessage } from "./client-ready/startup-send-message/startupSendMessage.js"; import { shame } from "./message-delete/shame/shame.js"; +import { shameEdit } from "./message-update/shame-edit.js"; /* * All bot actions are "routines" that fire off of some trigger. @@ -28,4 +29,10 @@ export const routineManifest = [ shame, ], }, + { + event: Events.MessageUpdate, + routines: [ + shameEdit, + ], + } ]; \ No newline at end of file From d1beb6cfbfba1bcf67c24f2d2c7bd47c13020792 Mon Sep 17 00:00:00 2001 From: walcutt Date: Sun, 13 Oct 2024 16:07:38 -0400 Subject: [PATCH 2/6] Remove annoying startup message --- asher/src/routines/routineManifest.js | 1 - 1 file changed, 1 deletion(-) diff --git a/asher/src/routines/routineManifest.js b/asher/src/routines/routineManifest.js index 104ab8b..b7f705d 100644 --- a/asher/src/routines/routineManifest.js +++ b/asher/src/routines/routineManifest.js @@ -20,7 +20,6 @@ export const routineManifest = [ event: Events.ClientReady, routines: [ startupHeartbeat, - startupSendMessage, ], }, { From 8573c14ed5fdb3b31fccaa6a3324fe725567d4a6 Mon Sep 17 00:00:00 2001 From: walcutt Date: Sun, 13 Oct 2024 16:24:06 -0400 Subject: [PATCH 3/6] Hush + debug --- asher/src/routines/message-update/shame-edit.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/asher/src/routines/message-update/shame-edit.js b/asher/src/routines/message-update/shame-edit.js index a2fe210..cd1ad3a 100644 --- a/asher/src/routines/message-update/shame-edit.js +++ b/asher/src/routines/message-update/shame-edit.js @@ -3,9 +3,23 @@ export function shameEdit(oldMessage, newMessage) { const newContent = newMessage.content; const user = oldMessage.author.displayName; + + const self = oldMessage.client.user; + const timestamp = newMessage.createdTimestamp; const messageToSend = `${user} edited this message at . It used to say:\n${oldContent}`; - newMessage.reply(messageToSend).then((m) => m.pin()); + console.log("Received message update event!"); + console.log(oldMessage); + console.log("---------------"); + console.log(newMessage); + console.log("---------------"); + console.log(self); + + if(oldMessage.user.id == self.id || newMessage.user.id === self.id) { + return; + } + + // newMessage.reply(messageToSend).then((m) => m.pin()); } \ No newline at end of file From d9db5579f2e1ec39a693a9bfefff13677b9b0250 Mon Sep 17 00:00:00 2001 From: walcutt Date: Sun, 13 Oct 2024 16:27:59 -0400 Subject: [PATCH 4/6] debug --- asher/src/routines/message-update/shame-edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asher/src/routines/message-update/shame-edit.js b/asher/src/routines/message-update/shame-edit.js index cd1ad3a..c770786 100644 --- a/asher/src/routines/message-update/shame-edit.js +++ b/asher/src/routines/message-update/shame-edit.js @@ -17,7 +17,7 @@ export function shameEdit(oldMessage, newMessage) { console.log("---------------"); console.log(self); - if(oldMessage.user.id == self.id || newMessage.user.id === self.id) { + if(oldMessage.author.id == self.id || newMessage.author.id === self.id) { return; } From 363ce439595f387dd7434f4bea575f391320fcad Mon Sep 17 00:00:00 2001 From: walcutt Date: Sun, 13 Oct 2024 16:36:38 -0400 Subject: [PATCH 5/6] Add content sanity check --- asher/src/routines/message-update/shame-edit.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/asher/src/routines/message-update/shame-edit.js b/asher/src/routines/message-update/shame-edit.js index c770786..326929f 100644 --- a/asher/src/routines/message-update/shame-edit.js +++ b/asher/src/routines/message-update/shame-edit.js @@ -4,22 +4,13 @@ export function shameEdit(oldMessage, newMessage) { const user = oldMessage.author.displayName; - const self = oldMessage.client.user; - const timestamp = newMessage.createdTimestamp; const messageToSend = `${user} edited this message at . It used to say:\n${oldContent}`; - console.log("Received message update event!"); - console.log(oldMessage); - console.log("---------------"); - console.log(newMessage); - console.log("---------------"); - console.log(self); + const didTextContentChange = oldContent !== newContent; - if(oldMessage.author.id == self.id || newMessage.author.id === self.id) { - return; - } + console.log(`Messages do${didTextContentChange ? " not" : ""} match.`); // newMessage.reply(messageToSend).then((m) => m.pin()); } \ No newline at end of file From f7dfd9c1b23b4cc5852fb9c09942fdb148cdb889 Mon Sep 17 00:00:00 2001 From: walcutt Date: Sun, 13 Oct 2024 16:39:50 -0400 Subject: [PATCH 6/6] Unhushed --- asher/src/routines/message-update/shame-edit.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/asher/src/routines/message-update/shame-edit.js b/asher/src/routines/message-update/shame-edit.js index 326929f..9c731ad 100644 --- a/asher/src/routines/message-update/shame-edit.js +++ b/asher/src/routines/message-update/shame-edit.js @@ -10,7 +10,9 @@ export function shameEdit(oldMessage, newMessage) { const didTextContentChange = oldContent !== newContent; - console.log(`Messages do${didTextContentChange ? " not" : ""} match.`); + if(!didTextContentChange) { + return; + } - // newMessage.reply(messageToSend).then((m) => m.pin()); + newMessage.reply(messageToSend).then((m) => m.pin()); } \ No newline at end of file