From ca36b235a65e3eb12f1becb596cbafa723f287f1 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 20 Apr 2026 22:53:05 -0400 Subject: tweaks --- api/index.ts | 4 ---- bot/index.ts | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/api/index.ts b/api/index.ts index a2a1378..925fa09 100644 --- a/api/index.ts +++ b/api/index.ts @@ -20,8 +20,6 @@ app.get('/attachments/:slug', (req, res) => { const query = db.prepare(`SELECT * FROM announcements_attachments WHERE msg_id = (?)`); const result = query.all(req.params.slug); res.send(result); - } else { - res.send('Unknown message id.'); } }); @@ -30,8 +28,6 @@ app.get('/reactions/:slug', (req, res) => { const query = db.prepare(`SELECT * FROM announcements_reactions WHERE msg_id = (?)`); const result = query.all(req.params.slug); res.send(result); - } else { - res.send('Unknown message id.'); } }); diff --git a/bot/index.ts b/bot/index.ts index fd1f9f5..13a428c 100644 --- a/bot/index.ts +++ b/bot/index.ts @@ -43,17 +43,17 @@ client.on(Events.ClientReady, bot => { file_name TEXT )`); - db.run(`CREATE TABLE IF NOT EXISTS exclude_person ( - id INTEGER PRIMARY KEY, - user_id INTERGER - )`); - db.run(`CREATE TABLE IF NOT EXISTS announcements_reactions ( id INTEGER PRIMARY KEY, msg_id INTERGER, user_id INTERGER, reaction TEXT )`); + + db.run(`CREATE TABLE IF NOT EXISTS exclude_person ( + id INTEGER PRIMARY KEY, + user_id INTERGER + )`); } catch (e) { console.error(e); } @@ -121,18 +121,21 @@ client.on(Events.MessageUpdate, async (msg, msgnew) => { const { title, author, message } = parseMessage(msgnew.content); if (!title || !author || !message) return; - try { - const removedAttachments = msg.attachments.filter(a => !msgnew.attachments.has(a.id)); + if (msg.attachments.size > 0) { + try { + const removedAttachments = msg.attachments.filter(a => !msgnew.attachments.has(a.id)); - for (const a of removedAttachments.values()) { - const deleteAttachment = db.prepare(`DELETE FROM announcements_attachments WHERE msg_id = ($msg_id) AND file_name = ($file_name)`); - deleteAttachment.run({ - $msg_id: msg.id, - $file_name: a.name - }); + for (const a of removedAttachments.values()) { + const deleteAttachment = db.prepare(`DELETE FROM announcements_attachments WHERE msg_id = ($msg_id) AND file_name = ($file_name)`); + deleteAttachment.run({ + $msg_id: msg.id, + $file_name: a.name + }); + } + } catch (e) { + console.error(e); } - } catch (e) { - console.error(e); + } try { @@ -163,12 +166,14 @@ client.on(Events.MessageDelete, async (msg) => { $msg_id: msg.id }) - const deleteAnnouncementReactions = db.prepare(`DELETE FROM announcements_reactions WHERE msg_id = ($msg_id)`); - deleteAnnouncementReactions.run({ - $msg_id: msg.id - }) + if (msg.reactions) { + const deleteAnnouncementReactions = db.prepare(`DELETE FROM announcements_reactions WHERE msg_id = ($msg_id)`); + deleteAnnouncementReactions.run({ + $msg_id: msg.id + }) + } - if (msg.attachments.size > 0) { + if (msg.attachments) { const deleteAttachment = db.prepare(`DELETE FROM announcements_attachments WHERE msg_id = ($msg_id)`); deleteAttachment.run({ $msg_id: msg.id -- cgit v1.2.3