experiments
/
cloudtube_fork
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly set filter referrer everywhere

This commit is contained in:
Cadence Ember 2021-05-12 00:43:53 +12:00
parent db7ccabb3b
commit cebc4331bc
No known key found for this signature in database
GPG Key ID: BC1C2C61CF521B17
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/channels.js
View File

@ -6,7 +6,7 @@ const converters = require("../utils/converters")
module.exports = [ module.exports = [
{ {
route: `/channel/(${constants.regex.ucid})`, methods: ["GET"], code: async ({req, fill}) => { route: `/channel/(${constants.regex.ucid})`, methods: ["GET"], code: async ({req, fill, url}) => {
const id = fill[0] const id = fill[0]
const user = getUser(req) const user = getUser(req)
const settings = user.getSettingsOrDefaults() const settings = user.getSettingsOrDefaults()
@ -24,7 +24,7 @@ module.exports = [
video.watched = watchedVideos.includes(video.videoId) video.watched = watchedVideos.includes(video.videoId)
}) })
} }
return render(200, "pug/channel.pug", {data, subscribed, instanceOrigin}) return render(200, "pug/channel.pug", {url, data, subscribed, instanceOrigin})
} }
} }
] ]

2
api/search.js
View File

@ -26,7 +26,7 @@ module.exports = [
const filters = user.getFilters() const filters = user.getFilters()
results = converters.applyVideoFilters(results, filters).videos results = converters.applyVideoFilters(results, filters).videos
return render(200, "pug/search.pug", {query, results, instanceOrigin}) return render(200, "pug/search.pug", {url, query, results, instanceOrigin})
} }
} }
] ]

2
api/video.js
View File

@ -175,7 +175,7 @@ module.exports = [
video.descriptionHtml = converters.rewriteVideoDescription(video.descriptionHtml, id) video.descriptionHtml = converters.rewriteVideoDescription(video.descriptionHtml, id)
return render(200, "pug/video.pug", { return render(200, "pug/video.pug", {
video, formats, subscribed, instanceOrigin, mediaFragment, autoplay, continuous, url, video, formats, subscribed, instanceOrigin, mediaFragment, autoplay, continuous,
sessionWatched, sessionWatchedNext sessionWatched, sessionWatchedNext
}) })

2
pug/includes/video-list-item.pug
View File

@ -13,7 +13,7 @@ mixin video_list_item(className, video, instanceOrigin, options = {})
.thumbnail__options-container .thumbnail__options-container
.thumbnail__options-list .thumbnail__options-list
- const paramsBase = {} - const paramsBase = {}
- if (url) paramsBase.referrer = url.pathname + (url.search && "?" + url.search) - if (url) paramsBase.referrer = url.pathname + url.search
a(href=`/filters?${new URLSearchParams({"channel-id": video.authorId, label: video.author, ...paramsBase})}`).menu-look Hide this channel a(href=`/filters?${new URLSearchParams({"channel-id": video.authorId, label: video.author, ...paramsBase})}`).menu-look Hide this channel
a(href=`/filters?${new URLSearchParams({title: video.title, ...paramsBase})}`).menu-look Hide by title a(href=`/filters?${new URLSearchParams({title: video.title, ...paramsBase})}`).menu-look Hide by title
a(href="/filters").menu-look Edit all filters a(href="/filters").menu-look Edit all filters