From fbeb2a9c1fecf8b0ac2347645dfcae2bb64706c4 Mon Sep 17 00:00:00 2001 From: tdro Date: Sat, 25 Jun 2022 22:49:32 -0400 Subject: themes/default/layouts/partials/video-container: Forge a reliable slug variable To prevent subdirectory path (if in use) from leaking into immutable link. --- themes/default/layouts/partials/video-container.html | 2 +- themes/default/layouts/shortcodes/imgur-video.html | 2 +- themes/default/layouts/shortcodes/video.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/default/layouts/partials/video-container.html b/themes/default/layouts/partials/video-container.html index 79df910..73bbfad 100644 --- a/themes/default/layouts/partials/video-container.html +++ b/themes/default/layouts/partials/video-container.html @@ -2,7 +2,7 @@ {{- $caption := .Caption -}} {{- $public := print "public/" .Source -}} {{- $timestamp := print "#t=" .Start "," .End -}} -{{- $immutable := print (.RelURL | humanize | urlize) "-" (.Source | sha256 | truncate 8 "") -}} +{{- $immutable := print (.Slug | humanize | urlize) "-" (.Source | sha256 | truncate 8 "") -}} {{- $extension := path.Ext .Source -}} {{- $fileCache := print $.Author "/media/" $immutable $extension -}} diff --git a/themes/default/layouts/shortcodes/imgur-video.html b/themes/default/layouts/shortcodes/imgur-video.html index c60cbff..b4658ec 100644 --- a/themes/default/layouts/shortcodes/imgur-video.html +++ b/themes/default/layouts/shortcodes/imgur-video.html @@ -11,7 +11,7 @@ "Author" .Page.Section "Caption" $caption "Options" $options - "RelURL" .Page.RelPermalink + "Slug" (strings.TrimPrefix .Site.BaseURL .Page.Permalink) "Source" (print "https://i.imgur.com/" $id ".mp4") ) -}} diff --git a/themes/default/layouts/shortcodes/video.html b/themes/default/layouts/shortcodes/video.html index 3820db0..7fa1aa8 100644 --- a/themes/default/layouts/shortcodes/video.html +++ b/themes/default/layouts/shortcodes/video.html @@ -22,7 +22,7 @@ "Options" $options "Poster" $poster "Preload" $preload - "RelURL" .Page.RelPermalink + "Slug" (strings.TrimPrefix .Site.BaseURL .Page.Permalink) "Source" $source "Source" $source "Start" $start -- cgit v1.2.3