Lomanic/cloudtube
1
0
Fork 0
mirror of https://git.sr.ht/~cadence/cloudtube synced 2026-03-02 10:41:36 +00:00
Code Issues Releases Wiki Activity

Proxy video thumbnails through selected instance

Browse source
This commit is contained in:
Cadence Ember 2020-10-18 21:51:09 +13:00
parent 2030f623a0
commit a96d97c9d8
No known key found for this signature in database
GPG key ID: BC1C2C61CF521B17
9 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/channels.js
View file

@ -11,7 +11,8 @@ module.exports = [
const settings = user.getSettingsOrDefaults()
const data = await fetchChannel(id, settings.instance)
const subscribed = user.isSubscribed(id)
return render(200, "pug/channel.pug", {data, subscribed})
const instanceOrigin = settings.instance
return render(200, "pug/channel.pug", {data, subscribed, instanceOrigin})
}
}
]

6
api/search.js
View file

@ -1,14 +1,16 @@
const fetch = require("node-fetch")
const {render} = require("pinski/plugins")
const {getUser} = require("../utils/getuser")
module.exports = [
{
route: "/(?:search|results)", methods: ["GET"], code: async ({url}) => {
route: "/(?:search|results)", methods: ["GET"], code: async ({req, url}) => {
const query = url.searchParams.get("q") || url.searchParams.get("search_query")
const fetchURL = new URL("http://localhost:3000/api/v1/search")
fetchURL.searchParams.set("q", query)
const results = await fetch(fetchURL.toString()).then(res => res.json())
return render(200, "pug/search.pug", {query, results})
const instanceOrigin = getUser(req).getSettingsOrDefaults().instance
return render(200, "pug/search.pug", {query, results, instanceOrigin})
}
}
]

3
api/subscriptions.js
View file

@ -33,7 +33,8 @@ module.exports = [
})
}
}
return render(200, "pug/subscriptions.pug", {hasSubscriptions, videos, channels, refreshed, timeToPastText})
const instanceOrigin = user.getSettingsOrDefaults().instance
return render(200, "pug/subscriptions.pug", {hasSubscriptions, videos, channels, refreshed, timeToPastText, instanceOrigin})
}
}
]

13
api/video.js
View file

@ -41,7 +41,8 @@ module.exports = [
const id = url.searchParams.get("v")
const user = getUser(req)
const settings = user.getSettingsOrDefaults()
const outURL = `${settings.instance}/api/v1/videos/${id}`
const instanceOrigin = settings.instance
const outURL = `${instanceOrigin}/api/v1/videos/${id}`
try {
const video = await fetch(outURL).then(res => res.json())
if (!video) throw new Error("The instance returned null.")
@ -57,23 +58,23 @@ module.exports = [
}
}
const subscribed = user.isSubscribed(video.authorId)
return render(200, "pug/video.pug", {video, subscribed})
return render(200, "pug/video.pug", {video, subscribed, instanceOrigin})
} catch (e) {
let message = pug.render("pre= error", {error: e.stack || e.toString()})
if (e instanceof fetch.FetchError) {
const template = `
p The selected instance, #[code= instance], did not respond correctly.
p The selected instance, #[code= instanceOrigin], did not respond correctly.
p Requested URL: #[a(href=url)= url]
`
message = pug.render(template, {instance: settings.instance, url: outURL})
message = pug.render(template, {instanceOrigin, url: outURL})
} else if (e instanceof InstanceError) {
const template = `
p #[strong= error.message]
if error.identifier
p #[code= error.identifier]
p That error was generated by #[code= instance].
p That error was generated by #[code= instanceOrigin].
`
message = pug.render(template, {instance: settings.instance, error: e})
message = pug.render(template, {instanceOrigin, error: e})
}
return render(500, "pug/video.pug", {video: {videoId: id}, error: true, message})
}