cadence/out-of-your-element
cadence/out-of-your-element
2
6
Fork 1
Code Issues 12 Pull requests Releases 17 Activity

Generate public urls for media.discordapp.net too

Browse source
This commit is contained in:
Cadence Ember 2024-09-15 00:34:53 +12:00
parent 6bc3eaf866
commit ae9acbcc52
3 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d2m/converters/message-to-event.js
View file

@ -366,7 +366,7 @@ async function messageToEvent(message, guild, options = {}, di) {
* Translate Discord attachment links into links that go via the bridge, so they last forever. * Translate Discord attachment links into links that go via the bridge, so they last forever.
*/ */
function transformAttachmentLinks(content) { function transformAttachmentLinks(content) {
return content.replace(/https:\/\/cdn\.discord(?:app)?\.com\/attachments\/([0-9]+)\/([0-9]+)\/([-A-Za-z0-9_.,]+)/g, url => dUtils.getPublicUrlForCdn(url)) return content.replace(/https:\/\/(cdn|media)\.discordapp\.(?:com|net)\/attachments\/([0-9]+)\/([0-9]+)\/([-A-Za-z0-9_.,]+)/g, url => dUtils.getPublicUrlForCdn(url))
} }
/** /**

4
src/discord/utils.js
View file

@ -121,9 +121,9 @@ function timestampToSnowflakeInexact(timestamp) {
/** @param {string} url */ /** @param {string} url */
function getPublicUrlForCdn(url) { function getPublicUrlForCdn(url) {
const match = url.match(/https:\/\/cdn.discordapp.com\/attachments\/([0-9]+)\/([0-9]+)\/([-A-Za-z0-9_.,]+)/) const match = url.match(/https:\/\/(cdn|media)\.discordapp\.(?:com|net)\/attachments\/([0-9]+)\/([0-9]+)\/([-A-Za-z0-9_.,]+)/)
if (!match) return url if (!match) return url
return `${reg.ooye.bridge_origin}/download/discordcdn/${match[1]}/${match[2]}/${match[3]}` return `${reg.ooye.bridge_origin}/download/discord${match[1]}/${match[2]}/${match[3]}/${match[4]}`
} }
module.exports.getPermissions = getPermissions module.exports.getPermissions = getPermissions

65
src/web/routes/download-discord.js
View file

@ -27,36 +27,41 @@ function timeUntilExpiry(url) {
return false return false
} }
as.router.get(`/download/discordcdn/:channel_id/:attachment_id/:file_name`, defineEventHandler(async event => { function defineMediaProxyHandler(domain) {
const params = await getValidatedRouterParams(event, schema.params.parse) return defineEventHandler(async event => {
const params = await getValidatedRouterParams(event, schema.params.parse)
const row = select("channel_room", "channel_id", {channel_id: params.channel_id}).get() const row = select("channel_room", "channel_id", {channel_id: params.channel_id}).get()
if (row == null) { if (row == null) {
throw createError({ throw createError({
status: 403, status: 403,
data: `The file you requested isn't permitted by this media proxy.` data: `The file you requested isn't permitted by this media proxy.`
}) })
} }
const url = `https://cdn.discordapp.com/attachments/${params.channel_id}/${params.attachment_id}/${params.file_name}` const url = `https://${domain}/attachments/${params.channel_id}/${params.attachment_id}/${params.file_name}`
let promise = cache.get(url) let promise = cache.get(url)
/** @type {string | undefined} */ /** @type {string | undefined} */
let refreshed let refreshed
if (promise) { if (promise) {
refreshed = await promise refreshed = await promise
if (!timeUntilExpiry(refreshed)) promise = undefined if (!timeUntilExpiry(refreshed)) promise = undefined
} }
if (!promise) { if (!promise) {
promise = discord.snow.channel.refreshAttachmentURLs([url]).then(x => x.refreshed_urls[0].refreshed) promise = discord.snow.channel.refreshAttachmentURLs([url]).then(x => x.refreshed_urls[0].refreshed)
cache.set(url, promise) cache.set(url, promise)
refreshed = await promise refreshed = await promise
const time = timeUntilExpiry(refreshed) const time = timeUntilExpiry(refreshed)
assert(time) // the just-refreshed URL will always be in the future assert(time) // the just-refreshed URL will always be in the future
setTimeout(() => { setTimeout(() => {
cache.delete(url) cache.delete(url)
}, time).unref() }, time).unref()
} }
assert(refreshed) // will have been assigned by one of the above branches assert(refreshed) // will have been assigned by one of the above branches
return sendRedirect(event, refreshed) return sendRedirect(event, refreshed)
})) })
}
as.router.get(`/download/discordcdn/:channel_id/:attachment_id/:file_name`, defineMediaProxyHandler("cdn.discordapp.com"))
as.router.get(`/download/discordmedia/:channel_id/:attachment_id/:file_name`, defineMediaProxyHandler("media.discordapp.net"))