tpl: Alias tweet shortode to twitter - hugo - [fork] hugo port for 9front
 (HTM) git clone git@git.drkhsh.at/hugo.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 3bfe8f4be653f44674293685cb5750d90668b2f6
 (DIR) parent 6aa2c38507aa1c2246222684717b4d69d26b03d7
 (HTM) Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
       Date:   Thu, 24 May 2018 11:24:38 +0200
       
       tpl: Alias tweet shortode to twitter
       
       See #4765
       
       Diffstat:
         M config/privacy/privacyConfig.go     |       6 +++---
         M config/privacy/privacyConfig_test.… |       4 ++--
         M tpl/tplimpl/embedded/templates.aut… |       2 +-
         D tpl/tplimpl/embedded/templates/sho… |       5 -----
         A tpl/tplimpl/embedded/templates/sho… |       5 +++++
         M tpl/tplimpl/template.go             |      13 ++++++++++++-
       
       6 files changed, 23 insertions(+), 12 deletions(-)
       ---
 (DIR) diff --git 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"`
        }
        
 (DIR) diff --git 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)
 (DIR) diff --git 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 -}}
        <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 -}}`},
 (DIR) diff --git a/tpl/tplimpl/embedded/templates/shortcodes/tweet.html b/tpl/tplimpl/embedded/templates/shortcodes/tweet.html
       @@ -1,4 +0,0 @@
       -{{- $pc := .Page.Site.Config.Privacy.Tweet -}}
       -{{- 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
 (DIR) diff --git a/tpl/tplimpl/embedded/templates/shortcodes/twitter.html b/tpl/tplimpl/embedded/templates/shortcodes/twitter.html
       @@ -0,0 +1,4 @@
       +{{- $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
 (DIR) diff --git 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)
       +                        }
       +
       +                }
                }
        
        }