Skip to content

Commit 8de4ffb

Browse files
jmooringbep
jmooring
authored and
bep
committed
tpl/tplimpl: Fix context in shortcode error messages
Fixes #13279
1 parent 1f5a15a commit 8de4ffb

9 files changed

+347
-243
lines changed

‎tpl/tplimpl/embedded/templates/shortcodes/qr.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@param {string} [class] The class attribute of the img element.
1010
@param {string} [id] The id attribute of the img element.
1111
@param {string} [title] The title attribute of the img element.
12-
@param {string} [loading] The loading attribute of the img element, one of lazy, or eager.
12+
@param {string} [loading] The loading attribute of the img element, one of lazy or eager.
1313

1414
@returns {template.HTML}
1515

@@ -49,7 +49,6 @@
4949
{{- $title := or (.Get "title") "" }}
5050
{{- $loading := or (.Get "loading") "" }}
5151

52-
5352
{{- /* Validate arguments. */}}
5453
{{- $errors := false}}
5554
{{- if not $text }}

‎tpl/tplimpl/embedded/templates/shortcodes/twitter.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{{- warnf "The \"twitter\", \"tweet\", and \"twitter_simple\" shortcodes were deprecated in v0.142.0 and will be removed in a future release. Please use the \"x\" shortcode instead." }}
2-
{{- $pc := .Page.Site.Config.Privacy.Twitter -}}
2+
{{- $pc := site.Config.Privacy.Twitter -}}
33
{{- if not $pc.Disable -}}
44
{{- if $pc.Simple -}}
55
{{- template "_internal/shortcodes/twitter_simple.html" . -}}
66
{{- else -}}
77
{{- $id := or (.Get "id") "" -}}
88
{{- $user := or (.Get "user") "" -}}
99
{{- if and $id $user -}}
10-
{{- template "render-tweet" (dict "id" $id "user" $user "dnt" $pc.EnableDNT "name" .Name "position" .Position) -}}
10+
{{- template "render-tweet" (dict "id" $id "user" $user "dnt" $pc.EnableDNT "ctx" .) -}}
1111
{{- else -}}
1212
{{- errorf "The %q shortcode requires two named parameters: user and id. See %s" .Name .Position -}}
1313
{{- end -}}
@@ -24,7 +24,7 @@
2424
{{- else with .Value -}}
2525
{{- (. | transform.Unmarshal).html | safeHTML -}}
2626
{{- else -}}
27-
{{- warnidf "shortcode-twitter-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" .name .position -}}
27+
{{- warnidf "shortcode-twitter-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" $.ctx.Name $.ctx.Position -}}
2828
{{- end -}}
2929
{{- end -}}
3030
{{- end -}}

‎tpl/tplimpl/embedded/templates/shortcodes/twitter_simple.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{{- end }}
2424
{{- (. | transform.Unmarshal).html | safeHTML -}}
2525
{{- else -}}
26-
{{- warnidf "shortcode-twitter-simple-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" .ctx.Name .ctx.Position -}}
26+
{{- warnidf "shortcode-twitter-simple-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" $.ctx.Name $.ctx.Position -}}
2727
{{- end -}}
2828
{{- end -}}
2929
{{- end -}}

‎tpl/tplimpl/embedded/templates/shortcodes/vimeo.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- $pc := .Page.Site.Config.Privacy.Vimeo -}}
1+
{{- $pc := site.Config.Privacy.Vimeo -}}
22
{{- if not $pc.Disable -}}
33
{{- if $pc.Simple -}}
44
{{ template "_internal/shortcodes/vimeo_simple.html" . }}
@@ -11,4 +11,4 @@
1111
</div>
1212
{{ end }}
1313
{{- end -}}
14-
{{- end -}}
14+
{{- end -}}

‎tpl/tplimpl/embedded/templates/shortcodes/vimeo_simple.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{{- $pc := .Page.Site.Config.Privacy.Vimeo -}}
1+
{{- $pc := site.Config.Privacy.Vimeo -}}
22
{{- if not $pc.Disable -}}
3-
{{- $ctx := dict "page" .Page "pc" $pc "name" .Name "position" .Position }}
3+
{{- $ctx := dict "ctx" . }}
44
{{- if .IsNamedParams -}}
55
{{- with .Get "id" -}}
66
{{- $ctx = merge $ctx (dict "id" . "class" ($.Get "class")) -}}
@@ -19,7 +19,7 @@
1919
{{- end -}}
2020

2121
{{- define "render-vimeo" -}}
22-
{{- $dnt := cond .pc.EnableDNT 1 0 -}}
22+
{{- $dnt := cond site.Config.Privacy.Vimeo.EnableDNT 1 0 -}}
2323
{{- $url := urls.JoinPath "https://vimeo.com" .id -}}
2424
{{- $query := querify "url" $url "dnt" $dnt -}}
2525
{{- $request := printf "https://vimeo.com/api/oembed.json?%s" $query -}}
@@ -32,21 +32,21 @@
3232
{{- with $.class -}}
3333
{{- $class = printf "%s %s" "s_video_simple" . -}}
3434
{{- else -}}
35-
{{ template "__h_simple_css" $.page }}
35+
{{ template "__h_simple_css" $.ctx.Page }}
3636
{{- end -}}
3737
{{- $thumbnail := .thumbnail_url -}}
3838
{{- $original := $thumbnail | replaceRE "(_.*\\.)" "." -}}
3939
<div class="{{ $class }}">
4040
<a href="{{ .provider_url }}{{ .video_id }}" rel="noopener" target="_blank">
4141
<img src="{{ $thumbnail }}" srcset="{{ $thumbnail }} 1x, {{ $original }} 2x" alt="{{ .title }}">
4242
<div class="play">
43-
{{ template "__h_simple_icon_play" $.page }}
43+
{{ template "__h_simple_icon_play" $.ctx.Page }}
4444
</div>
4545
</a>
4646
</div>
4747
{{- end -}}
4848
{{- else -}}
49-
{{- warnidf "shortcode-vimeo-simple" "The %q shortcode was unable to retrieve the remote data. See %s" .name .position -}}
49+
{{- warnidf "shortcode-vimeo-simple" "The %q shortcode was unable to retrieve the remote data. See %s" $.ctx.Name $.ctx.Position -}}
5050
{{- end -}}
5151
{{- end -}}
5252
{{- end -}}

‎tpl/tplimpl/embedded/templates/shortcodes/x.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
{{- $pc := .Page.Site.Config.Privacy.X -}}
1+
{{- $pc := site.Config.Privacy.X -}}
22
{{- if not $pc.Disable -}}
33
{{- if $pc.Simple -}}
44
{{- template "_internal/shortcodes/x_simple.html" . -}}
55
{{- else -}}
66
{{- $id := or (.Get "id") "" -}}
77
{{- $user := or (.Get "user") "" -}}
88
{{- if and $id $user -}}
9-
{{- template "render-x" (dict "id" $id "user" $user "dnt" $pc.EnableDNT "name" .Name "position" .Position) -}}
9+
{{- template "render-x" (dict "id" $id "user" $user "dnt" $pc.EnableDNT "ctx" .) -}}
1010
{{- else -}}
1111
{{- errorf "The %q shortcode requires two named parameters: user and id. See %s" .Name .Position -}}
1212
{{- end -}}
@@ -23,7 +23,7 @@
2323
{{- else with .Value -}}
2424
{{- (. | transform.Unmarshal).html | safeHTML -}}
2525
{{- else -}}
26-
{{- warnidf "shortcode-x-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" .name .position -}}
26+
{{- warnidf "shortcode-x-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" $.ctx.Name $.ctx.Position -}}
2727
{{- end -}}
2828
{{- end -}}
2929
{{- end -}}

‎tpl/tplimpl/embedded/templates/shortcodes/x_simple.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{{- end }}
2323
{{- (. | transform.Unmarshal).html | safeHTML -}}
2424
{{- else -}}
25-
{{- warnidf "shortcode-x-simple-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" .ctx.Name .ctx.Position -}}
25+
{{- warnidf "shortcode-x-simple-getremote" "The %q shortcode was unable to retrieve the remote data. See %s" $.ctx.Name $.ctx.Position -}}
2626
{{- end -}}
2727
{{- end -}}
2828
{{- end -}}

0 commit comments

Comments
 (0)