Permalink
Browse files

tpl: Alias tweet shortode to twitter

See #4765
  • Loading branch information...
bep committed May 24, 2018
1 parent 6aa2c38 commit 3bfe8f4be653f44674293685cb5750d90668b2f6
@@ -31,7 +31,7 @@ type Config struct {
GoogleAnalytics GoogleAnalytics
Instagram Instagram
SpeakerDeck SpeakerDeck
Tweet Tweet
Twitter Twitter
Vimeo Vimeo
YouTube YouTube
}
@@ -64,8 +64,8 @@ type SpeakerDeck struct {
Service `mapstructure:",squash"`
}
// Tweet holds the privacy configuration settingsrelated to the Tweet shortcode.
type Tweet struct {
// Twitter holds the privacy configuration settingsrelated to the Twitter shortcode.
type Twitter struct {
Service `mapstructure:",squash"`
}
@@ -39,7 +39,7 @@ disable = true
simple = true
[privacy.speakerDeck]
disable = true
[privacy.tweet]
[privacy.twitter]
disable = true
[privacy.vimeo]
disable = true
@@ -61,7 +61,7 @@ simple = true
assert.True(pc.Instagram.Disable)
assert.True(pc.Instagram.Simple)
assert.True(pc.SpeakerDeck.Disable)
assert.True(pc.Tweet.Disable)
assert.True(pc.Twitter.Disable)
assert.True(pc.Vimeo.Disable)
assert.True(pc.YouTube.PrivacyEnhanced)
@@ -363,7 +363,7 @@ M66.52,7.74c-0.78-2.93-2.49-5.41-5.42-6.19C55.79,.13,34,0,34,0S12.21,.13,6.9,1.5
{{- if not $pc.Disable -}}
<script async class='speakerdeck-embed' data-id='{{ index .Params 0 }}' data-ratio='1.33333333333333' src='//speakerdeck.com/assets/embed.js'></script>
{{- end -}}`},
{`shortcodes/tweet.html`, `{{- $pc := .Page.Site.Config.Privacy.Tweet -}}
{`shortcodes/twitter.html`, `{{- $pc := .Page.Site.Config.Privacy.Twitter -}}
{{- if not $pc.Disable -}}
{{ (getJSON "https://api.twitter.com/1/statuses/oembed.json?id=" (index .Params 0)).html | safeHTML }}
{{- end -}}`},
@@ -1,4 +1,4 @@
{{- $pc := .Page.Site.Config.Privacy.Tweet -}}
{{- $pc := .Page.Site.Config.Privacy.Twitter -}}
{{- if not $pc.Disable -}}
{{ (getJSON "https://api.twitter.com/1/statuses/oembed.json?id=" (index .Params 0)).html | safeHTML }}
{{- end -}}
@@ -686,10 +686,21 @@ func (t *templateHandler) addTemplateFile(name, baseTemplatePath, path string) e
}
}
var embeddedTemplatesAliases = map[string][]string{
"shortcodes/twitter.html": []string{"shortcodes/tweet.html"},
}
func (t *templateHandler) loadEmbedded() {
for _, kv := range embedded.EmbeddedTemplates {
// TODO(bep) error handling
t.addInternalTemplate(kv[0], kv[1])
name, templ := kv[0], kv[1]
t.addInternalTemplate(name, templ)
if aliases, found := embeddedTemplatesAliases[name]; found {
for _, alias := range aliases {
t.addInternalTemplate(alias, templ)
}
}
}
}

0 comments on commit 3bfe8f4

Please sign in to comment.