Merge pull request #22 from khusika/oembed

Update oEmbed Twitter
khusika · Jun 27, 2021 · 3a88126 · 3a88126
2 parents 1d70fd0 + b5a4de5
commit 3a88126
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 50 deletions.
diff --git a/assets/css/_partial/_single/_oembed.scss b/assets/css/_partial/_single/_oembed.scss
@@ -1,4 +1,4 @@
-iframe.instagram-media {
+iframe.instagram-media, #twitter-widget-0 {
   min-width: 100px !important;
   [theme=dark] & {
     border: none !important;

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -525,10 +525,13 @@ ignoreErrors = ["err-missing-comment-accesstoken", "err-missing-oembed-accesstok
 
   # oEmbed config for Facebook and Instagram
   [params.oembed]
-    # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
-    accessToken = ""
     # Privacy config (https://gohugo.io/about/hugo-and-gdpr/)
     privacy = false
+    [params.oembed.facebook]
+      # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
+      accessToken = ""
+    [params.oembed.twitter]
+      enableDNT = false
 
   # Page config
   # 文章页面配置

diff --git a/exampleSite/content/posts/theme-documentation-basics/index.en.md b/exampleSite/content/posts/theme-documentation-basics/index.en.md
@@ -340,12 +340,15 @@ Please open the code block below to view the complete sample configuration :(far
       # default behavior when you don't set "hiddenFromHomePage" in front matter
       defaultHiddenFromHomePage = false
 
-  # {{< version 1.0.1 changed >}} oEmbed config for Facebook and Instagram
+  # {{< version 1.0.1 changed >}} oEmbed config
   [params.oembed]
-    # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
-    accessToken = ""
     # Privacy config (https://gohugo.io/about/hugo-and-gdpr/)
     privacy = false
+    [params.oembed.facebook]
+      # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
+      accessToken = ""
+    [params.oembed.twitter]
+      enableDNT = false
 
   # Social config about the author
   [params.social]

diff --git a/exampleSite/content/posts/theme-documentation-basics/index.fr.md b/exampleSite/content/posts/theme-documentation-basics/index.fr.md
@@ -345,12 +345,15 @@ Please open the code block below to view the complete sample configuration :(far
       # default behavior when you don't set "hiddenFromHomePage" in front matter
       defaultHiddenFromHomePage = false
 
-  # {{< version 1.0.1 changed >}} oEmbed config for Facebook and Instagram
+  # {{< version 1.0.1 changed >}} oEmbed config
   [params.oembed]
-    # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
-    accessToken = ""
     # Privacy config (https://gohugo.io/about/hugo-and-gdpr/)
     privacy = false
+    [params.oembed.facebook]
+      # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
+      accessToken = ""
+    [params.oembed.twitter]
+      enableDNT = false
 
   # Social config about the author
   [params.social]

diff --git a/exampleSite/content/posts/theme-documentation-basics/index.zh-cn.md b/exampleSite/content/posts/theme-documentation-basics/index.zh-cn.md
@@ -343,12 +343,15 @@ hugo
       # 当你没有在文章前置参数中设置 "hiddenFromHomePage" 时的默认行为
       defaultHiddenFromHomePage = false
 
-  # {{< version 1.0.1 changed >}} oEmbed config for Facebook and Instagram
+  # {{< version 1.0.1 changed >}} oEmbed config
   [params.oembed]
-    # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
-    accessToken = ""
     # Privacy config (https://gohugo.io/about/hugo-and-gdpr/)
     privacy = false
+    [params.oembed.facebook]
+      # Facebook Aplication Identity and Client Token (<APPID>|<CLIENTTOKEN>)
+      accessToken = ""
+    [params.oembed.twitter]
+      enableDNT = false
 
   # 作者的社交信息设置
   [params.social]

diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.en.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.en.md
@@ -135,17 +135,9 @@ The rendered output looks like this:
 
 ## 7 tweet
 
-[Documentation of `tweet`](https://gohugo.io/content-management/shortcodes#tweet)
+{{< version 1.0.1 changed >}}
 
-Example `tweet` input:
-
-```markdown
-{{</* tweet 877500564405444608 */>}}
-```
-
-The rendered output looks like this:
-
-{{< tweet 877500564405444608 >}}
+This method was moved with the newest API in the [extended shortcode documentation](https://feelit.khusika.com/theme-documentation-extended-shortcodes/#123-oembed-twitter).
 
 ## 8 vimeo
 

diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.fr.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.fr.md
@@ -140,17 +140,9 @@ The rendered output looks like this:
 
 ## 7 tweet
 
-[Documentation of `tweet`](https://gohugo.io/content-management/shortcodes#tweet)
+{{< version 1.0.1 changed >}}
 
-Example `tweet` input:
-
-```markdown
-{{</* tweet 877500564405444608 */>}}
-```
-
-The rendered output looks like this:
-
-{{< tweet 877500564405444608 >}}
+This method was moved with the newest API in the [extended shortcode documentation](https://feelit.khusika.com/theme-documentation-extended-shortcodes/#123-oembed-twitter).
 
 ## 8 vimeo
 

diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.zh-cn.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.zh-cn.md
@@ -136,17 +136,9 @@ At the moment, Hugo using deprecated [oEmbed-legacy](https://developers.facebook
 
 ## 7 tweet
 
-[`tweet` 的文档](https://gohugo.io/content-management/shortcodes#tweet)
+{{< version 1.0.1 changed >}}
 
-一个 `tweet` 示例:
-
-```markdown
-{{</* tweet 877500564405444608 */>}}
-```
-
-呈现的输出效果如下:
-
-{{< tweet 877500564405444608 >}}
+This method was moved with the newest API in the [extended shortcode documentation](https://feelit.khusika.com/theme-documentation-extended-shortcodes/#123-oembed-twitter).
 
 ## 8 vimeo
 

diff --git a/exampleSite/content/posts/theme-documentation-extended-shortcodes/index.en.md b/exampleSite/content/posts/theme-documentation-extended-shortcodes/index.en.md
@@ -1394,3 +1394,16 @@ Sample input of Instagram TV
 Sample output of Instagram TV
 
 {{< oembed "ig" "tv" "BkQUbR8h1sp" "hidecaption" >}}
+
+### 12.3 oEmbed Twitter
+{{< version 1.0.1 >}}
+
+Sample input of 'oembed tweet'
+
+```markdown
+{{</* oembed "tweet" "https://twitter.com/GoHugoIO/status/877500564405444608" */>}}
+```
+
+Sample output of 'oembed tweet'
+
+{{< oembed "tweet" "https://twitter.com/GoHugoIO/status/877500564405444608" >}}
diff --git a/exampleSite/content/posts/theme-documentation-extended-shortcodes/index.fr.md b/exampleSite/content/posts/theme-documentation-extended-shortcodes/index.fr.md
@@ -1399,3 +1399,16 @@ Sample input of Instagram TV
 Sample output of Instagram TV
 
 {{< oembed "ig" "tv" "BkQUbR8h1sp" "hidecaption" >}}
+
+### 12.3 oEmbed Twitter
+{{< version 1.0.1 >}}
+
+Sample input of 'oembed tweet'
+
+```markdown
+{{</* oembed "tweet" "https://twitter.com/GoHugoIO/status/877500564405444608" */>}}
+```
+
+Sample output of 'oembed tweet'
+
+{{< oembed "tweet" "https://twitter.com/GoHugoIO/status/877500564405444608" >}}
diff --git a/exampleSite/content/posts/theme-documentation-extended-shortcodes/index.zh-cn.md b/exampleSite/content/posts/theme-documentation-extended-shortcodes/index.zh-cn.md
@@ -1396,3 +1396,16 @@ Sample input of Instagram TV
 Sample output of Instagram TV
 
 {{< oembed "ig" "tv" "BkQUbR8h1sp" "hidecaption" >}}
+
+### 12.3 oEmbed Twitter
+{{< version 1.0.1 >}}
+
+Sample input of 'oembed tweet'
+
+```markdown
+{{</* oembed "tweet" "https://twitter.com/GoHugoIO/status/877500564405444608" */>}}
+```
+
+Sample output of 'oembed tweet'
+
+{{< oembed "tweet" "https://twitter.com/GoHugoIO/status/877500564405444608" >}}
diff --git a/layouts/shortcodes/oembed.html b/layouts/shortcodes/oembed.html
@@ -1,11 +1,11 @@
 {{- $oe := .Site.Params.oembed -}}
-{{- $accessToken := getenv "HUGO_OEMBED_ACCESSTOKEN" | default $oe.accessToken -}}
-
-{{- if not $accessToken -}}
-  {{- erroridf "err-missing-oembed-accesstoken" "oembed shortcode: Missing config value for .Site.Params.oembed.accessToken. This can be set in config.toml, but it is recommended to configure this via the HUGO_OEMBED_ACCESSTOKEN OS environment variable. If you are using a Client Access Token, remember that you must combine it with your App ID using a pipe symbol (<APPID>|<CLIENTTOKEN>) otherwise the request will fail." -}}
-{{- else -}}
-  {{- if not $oe.privacy -}}
-    {{ $host := .Get 0 }}
+{{ $host := .Get 0 }}
+{{- if not $oe.privacy -}}
+{{- if or (eq $host "ig") (eq $host "fb") -}}
+{{- $accessToken := getenv "HUGO_OEMBED_ACCESSTOKEN" | default $oe.facebook.accessToken -}}
+  {{- if not $accessToken -}}
+    {{- erroridf "err-missing-oembed-accesstoken" "oembed shortcode: Missing config value for .Site.Params.oembed.accessToken. This can be set in config.toml, but it is recommended to configure this via the HUGO_OEMBED_ACCESSTOKEN OS environment variable. If you are using a Client Access Token, remember that you must combine it with your App ID using a pipe symbol (<APPID>|<CLIENTTOKEN>) otherwise the request will fail." -}}
+  {{- else -}}
     {{ $type := .Get 1 }}
     {{ $id := .Get 2 }}
     {{- if eq $host "ig" -}}
@@ -25,4 +25,11 @@
       {{- end -}}
     {{- end -}}
   {{- end -}}
+{{- else if (eq $host "tweet") -}}
+  {{ $url := .Get 1 }}
+  {{- $dnt := $oe.twitter.enableDNT | default false -}}
+  {{ with getJSON "https://publish.twitter.com/oembed" "?url=" $url "&dnt=" $dnt }}
+    {{ .html | safeHTML }}
+  {{ end }}
+{{- end -}}
 {{- end -}}
diff --git a/resources/_gen/assets/scss/css/page.scss_57b7ce9075f6c73982646e38cc2bdb0e.content b/resources/_gen/assets/scss/css/page.scss_57b7ce9075f6c73982646e38cc2bdb0e.content