From 3d7886ddcb6d8a19abafb09ab70189d05582c329 Mon Sep 17 00:00:00 2001 From: Ed Fletcher <edfletcher@discordrc.com> Date: Sat, 16 Nov 2024 22:13:31 -0800 Subject: [PATCH] Remove full URL inclusion --- discord/events/messageCreate.js | 3 +-- http.js | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/discord/events/messageCreate.js b/discord/events/messageCreate.js index 102a8a7..ba5fae7 100644 --- a/discord/events/messageCreate.js +++ b/discord/events/messageCreate.js @@ -89,8 +89,7 @@ module.exports = async (context, data) => { return cRes.attachmentURLShort ?? cRes.attachmentURL; } - const { cachedURLShort, cachedURL } = cRes; - return cachedURLShort ? `${cachedURLShort} (${cachedURL})` : cachedURL; + return cRes.cachedURLShort ?? cRes.cachedURL; }); if (failures.length) { diff --git a/http.js b/http.js index 92d87a3..5fc84e4 100644 --- a/http.js +++ b/http.js @@ -396,10 +396,7 @@ redisListener.subscribe(PREFIX, (err) => { await finished(Readable.fromWeb(fetchRes.body).pipe(outStream)); console.log(`Cached attachment ${newId} from source ${attachmentURL}`); data.cachedURL = config.http.proto + '://' + config.http.fqdn + '/attachments/' + newId; - - if (config.http.shrtnHost) { - data.cachedURLShort = await createShrtned(data.cachedURL); - } + data.cachedURLShort = await createShrtned(data.cachedURL); } catch (e) { console.error(`Fetching or persisting ${attachmentURL} failed:`, e.message); console.error(e);