From 3bfe8f4be653f44674293685cb5750d90668b2f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 24 May 2018 11:24:38 +0200 Subject: [PATCH] tpl: Alias tweet shortode to twitter See #4765 --- config/privacy/privacyConfig.go | 6 +++--- config/privacy/privacyConfig_test.go | 4 ++-- tpl/tplimpl/embedded/templates.autogen.go | 2 +- .../shortcodes/{tweet.html => twitter.html} | 2 +- tpl/tplimpl/template.go | 13 ++++++++++++- 5 files changed, 19 insertions(+), 8 deletions(-) rename tpl/tplimpl/embedded/templates/shortcodes/{tweet.html => twitter.html} (68%) diff --git a/config/privacy/privacyConfig.go b/config/privacy/privacyConfig.go index ee7b7be2..bcffec8a 100644 --- a/config/privacy/privacyConfig.go +++ b/config/privacy/privacyConfig.go @@ -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"` } diff --git a/config/privacy/privacyConfig_test.go b/config/privacy/privacyConfig_test.go index f945ac8c..0efc734d 100644 --- a/config/privacy/privacyConfig_test.go +++ b/config/privacy/privacyConfig_test.go @@ -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) diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go index ebed43a3..94e4c33a 100644 --- a/tpl/tplimpl/embedded/templates.autogen.go +++ b/tpl/tplimpl/embedded/templates.autogen.go @@ -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 -}} {{- 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 -}}`}, diff --git a/tpl/tplimpl/embedded/templates/shortcodes/tweet.html b/tpl/tplimpl/embedded/templates/shortcodes/twitter.html similarity index 68% rename from tpl/tplimpl/embedded/templates/shortcodes/tweet.html rename to tpl/tplimpl/embedded/templates/shortcodes/twitter.html index 09adaf7e..d9bef725 100755 --- a/tpl/tplimpl/embedded/templates/shortcodes/tweet.html +++ b/tpl/tplimpl/embedded/templates/shortcodes/twitter.html @@ -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 -}} \ No newline at end of file diff --git a/tpl/tplimpl/template.go b/tpl/tplimpl/template.go index 7c7d639f..74860b67 100644 --- a/tpl/tplimpl/template.go +++ b/tpl/tplimpl/template.go @@ -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) + } + + } } } -- 2.30.2