Support DNT in Twitter shortcode for GDPR

Fixes #4765

diff --git a/config/privacy/privacyConfig.go b/config/privacy/privacyConfig.go
index bcffec8af2a84c83c0c2f67f230d72a55692bfd1..9c2a8df66c9f55f1a51f05e2b3089db67b6504b6 100644 (file)
--- a/config/privacy/privacyConfig.go
+++ b/config/privacy/privacyConfig.go
@@ -67,6 +67,10 @@ type SpeakerDeck struct {
 // Twitter holds the privacy configuration settingsrelated to the Twitter shortcode.
 type Twitter struct {
        Service `mapstructure:",squash"`
+
+       // When set to true, the Tweet and its embedded page on your site are not used
+       // for purposes that include personalized suggestions and personalized ads.
+       EnableDNT bool
 }
 
 // Vimeo holds the privacy configuration settingsrelated to the Vimeo shortcode.

diff --git a/config/privacy/privacyConfig_test.go b/config/privacy/privacyConfig_test.go
index 0efc734db283e8ffb8c73953b2e0137005fd157c..6b07ef7e69a930fc420ee67af9aa07353d3e2417 100644 (file)
--- a/config/privacy/privacyConfig_test.go
+++ b/config/privacy/privacyConfig_test.go
@@ -41,6 +41,7 @@ simple = true
 disable = true
 [privacy.twitter]
 disable = true
+enableDNT = true
 [privacy.vimeo]
 disable = true
 [privacy.youtube]
@@ -62,6 +63,7 @@ simple = true
        assert.True(pc.Instagram.Simple)
        assert.True(pc.SpeakerDeck.Disable)
        assert.True(pc.Twitter.Disable)
+       assert.True(pc.Twitter.EnableDNT)
        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 94e4c33abfc7e520e059a47ec330a2bee09967ef..a64ff83bf2338af1e9a97d868db9adfa7225f922 100644 (file)
--- a/tpl/tplimpl/embedded/templates.autogen.go
+++ b/tpl/tplimpl/embedded/templates.autogen.go
@@ -365,7 +365,9 @@ 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
 {{- end -}}`},
        {`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 }}
+{{ $url := printf "https://api.twitter.com/1/statuses/oembed.json?id=%s&dnt=%t" (index .Params 0) $pc.EnableDNT }}
+{{ $json := getJSON $url }}
+{{ $json.html | safeHTML }}
 {{- end -}}`},
        {`shortcodes/vimeo.html`, `{{- $pc := .Page.Site.Config.Privacy.Vimeo -}}
 {{- if not $pc.Disable -}}

diff --git a/tpl/tplimpl/embedded/templates/shortcodes/twitter.html b/tpl/tplimpl/embedded/templates/shortcodes/twitter.html
index d9bef725ff2427470be7c5ff047efd46672fe8a9..62dd215924d95384f3643d336e7e081f13b9aac1 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/shortcodes/twitter.html
+++ b/tpl/tplimpl/embedded/templates/shortcodes/twitter.html
@@ -1,4 +1,6 @@
 {{- $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 }}
+{{ $url := printf "https://api.twitter.com/1/statuses/oembed.json?id=%s&dnt=%t" (index .Params 0) $pc.EnableDNT }}
+{{ $json := getJSON $url }}
+{{ $json.html | safeHTML }}
 {{- end -}}
\ No newline at end of file