From e212bade7ba6133556186c72a603250b0e4a80bc Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Thu, 3 Aug 2023 20:18:08 -0600 Subject: [PATCH 1/2] anonradio: null checks --- src/modules/anonradio.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/anonradio.js b/src/modules/anonradio.js index b280342..364c14b 100644 --- a/src/modules/anonradio.js +++ b/src/modules/anonradio.js @@ -68,9 +68,14 @@ async function updateNowPlaying() { } else if (playing.startsWith("Coming up")) { title = playing; } else { - const [_, current, peakDay, peakMonth, dj, metadata] = playing.match( + const metadataLine = playing.match( /\[(\d+)\/(\d+)\/(\d+)\] \((.+?)\): (.+)/ ); + const current = metadataLine?.[1] ?? "??"; + const peakDay = metadataLine?.[2] ?? "??"; + const peakMonth = metadataLine?.[3] ?? "??"; + const dj = metadataLine?.[4] ?? "unknown"; + const metadata = metadataLine?.[5] ?? "unknown"; if ( metadata == "https://archives.anonradio.net" || From 932d24d6a41976fff3e8c6f5548c3ba4bfbc27bb Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Thu, 3 Aug 2023 20:24:01 -0600 Subject: [PATCH 2/2] codePreviews: ignore markdown, limit full to 20 line files, fix reactions (hopefully) --- src/modules/codePreviews.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/modules/codePreviews.js b/src/modules/codePreviews.js index 0c1625e..7a560bc 100644 --- a/src/modules/codePreviews.js +++ b/src/modules/codePreviews.js @@ -36,6 +36,8 @@ async function processFile(link) { ? "" : fileName.substring(fileName.lastIndexOf(".") + 1); + if (fileType == "md") return ""; + const lineStr = link.match(/#L\d+(-L?\d+)?/)?.[0]; let startLine, endLine; let entireFile = false; @@ -60,21 +62,15 @@ async function processFile(link) { ? "Line " + startLine : "Lines " + startLine + "-" + endLine; + if (entireFile && lines.length > 20) return ""; + const targetLines = ( - entireFile - ? lines.length > 30 - ? lines.slice(0, 30) - : lines - : lines.slice(startLine - 1, endLine) + entireFile ? lines : lines.slice(startLine - 1, endLine) ).join("\n"); return `**${fileName}: **${whichLines}\n\`\`\`${fileType}\n${unindent( targetLines - )}${ - entireFile && lines.length > 30 - ? `\n... (${lines.length - 30} lines left)` - : "" - }\n\`\`\``; + )}\n\`\`\``; } events.add("messageCreate", "codePreviews", async function (msg) { @@ -168,7 +164,7 @@ events.add( const ref = await channel.getMessage(msg.messageReference.messageID); if (!ref) return; if ( - ref.author.id != reactor.id || + ref.author.id != reactor.id && !channel.permissionsOf(reactor.id).has("manageMessages") ) return;