diff --git a/api/channels.js b/api/channels.js index 0681d44..4751d5a 100644 --- a/api/channels.js +++ b/api/channels.js @@ -6,7 +6,7 @@ const converters = require("../utils/converters") 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 user = getUser(req) const settings = user.getSettingsOrDefaults() @@ -24,7 +24,7 @@ module.exports = [ 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}) } } ] diff --git a/api/search.js b/api/search.js index 5283ad3..223b3b6 100644 --- a/api/search.js +++ b/api/search.js @@ -26,7 +26,7 @@ module.exports = [ const filters = user.getFilters() 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}) } } ] diff --git a/api/video.js b/api/video.js index 78aa299..1e0445b 100644 --- a/api/video.js +++ b/api/video.js @@ -175,7 +175,7 @@ module.exports = [ video.descriptionHtml = converters.rewriteVideoDescription(video.descriptionHtml, id) return render(200, "pug/video.pug", { - video, formats, subscribed, instanceOrigin, mediaFragment, autoplay, continuous, + url, video, formats, subscribed, instanceOrigin, mediaFragment, autoplay, continuous, sessionWatched, sessionWatchedNext }) diff --git a/pug/includes/video-list-item.pug b/pug/includes/video-list-item.pug index d0b1fbf..84c4d76 100644 --- a/pug/includes/video-list-item.pug +++ b/pug/includes/video-list-item.pug @@ -13,7 +13,7 @@ mixin video_list_item(className, video, instanceOrigin, options = {}) .thumbnail__options-container .thumbnail__options-list - 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({title: video.title, ...paramsBase})}`).menu-look Hide by title a(href="/filters").menu-look Edit all filters