fix: Facebook integration

reinhart1010 · May 31, 2023 · 1f64b63 · 1f64b63
1 parent 29798c4
commit 1f64b63
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -150,7 +150,7 @@ ham:
  contributing:
  discuss:
  type: facebook
- app_id: 123456789
+ facebook_app_id: 123456789
  lang: en_US
 ```
 
@@ -209,11 +209,11 @@ HAM heavily uses [Halfmoon] CSS framework on the generated page due to its themi
 [MediaWiki]: https://mediawiki.org
 
 ## Credits & Open Source Licenses
-Copyright (c) 2022 Reinhart Previano Koentjoro.
+Copyright (c) 2021-2023 Reinhart Previano Koentjoro.
 
 This project is distributed under MIT License, and also uses the following open-source components:
 
-+ Bootstrap Icons (<https://github.com/twbs/icons>) - Copyright (c) 2019-2022 The Bootstrap Authors, MIT License
++ Bootstrap Icons (<https://github.com/twbs/icons>) - Copyright (c) 2019-2023 The Bootstrap Authors, MIT License
 + Halfmoon (<https://github.com/halfmoonui/halfmoon>) - Copyright (c) 2020 Halfmoon UI, MIT License
 + OneDarkJekyll (<https://github.com/mgyongyosi/OneDarkJekyll>) - Copyright (c) 2016 Mihály Gyöngyösi, MIT License
 + Simple-Jekyll-Search (<https://github.com/christian-fei/Simple-Jekyll-Search>) - Copyright (c) 2015 Christian Fei, MIT License
diff --git a/_includes/comments.html b/_includes/comments.html
@@ -7,30 +7,32 @@ <h5 id="discuss" class="sidebar-title">Discuss this page</h5>
  {% when 'custom' %}
  {% include custom-comments.html %}
  {% when 'facebook' %}
+ {% if page.contributing.discuss.facebook_app_id != null %}
+ <div id="fb-root"></div>
+ <script async defer crossorigin="anonymous" src="https://connect.facebook.net/{{ page.contributing.discuss.lang }}/sdk.js#xfbml=1&version=v17.0&appId={{ page.contributing.discuss.facebook_app_id }}&autoLogAppEvents=1" nonce="mqsBinib"></script>
+ <div class="fb-comments" data-href="https://developers.facebook.com/docs/plugins/comments#configurator" data-width="" data-numposts="5"></div>
+ {% endif %}
+ {% when 'giscus' %}
+ <script src="https://giscus.app/client.js" data-repo="{{ page.contributing.discuss.repo }}" data-repo-id="{{ page.contributing.discuss.repo_id }}" data-category="{{ page.contributing.discuss.category }}" data-category-id="{{ page.contributing.discuss.category_id }}" data-mapping="{{ page.contributing.discuss.mapping }}" data-reactions-enabled="{{ page.contributing.discuss.reactions_enabled | default: 1 }}" data-emit-metadata="{{ page.contributing.discuss.emit_metadata | default: 0 }}" data-theme="{{ page.contributing.discuss.theme | default: 'preferred_color_scheme' }}" data-lang="{{ page.contributing.discuss.lang | default: 'en' }}" crossorigin="anonymous" async></script>
+ {% when 'telegram' %}
+ <script src="https://telegram.org/js/telegram-widget.js?15" {% if page.contributing.discuss.telegram_discussion != null %} data-telegram-discussion="{{ page.contributing.discuss.telegram_discussion }}" {% endif %} data-comments-limit="{{ page.contributing.discuss.comments_limit | default: '5' }}" {% if page.contributing.discuss.height != null %} data-height="{{ page.contributing.discuss.height }}" {% endif %} data-color="{{ page.contributing.discuss.color | default: '319BE6' }}" data-dark-color="{{ page.contributing.discuss.color | default: '4BA3E2' }}" data-colorful="{{ page.contributing.discuss.colorful | default: 0 }}" data-dark="{{ page.contributing.discuss.dark | default: 0 }}" crossorigin="anonymous" async></script>
+ {% when 'utterances' %}
+ <script src="https://utteranc.es/client.js" repo="{{ page.contributing.discuss.repo }}" issue-term="{{ page.contributing.discuss.issue_term }}"
  {% if page.contributing.discuss.label != null %}
- <div id="fb-root"></div>
- <script async defer crossorigin="anonymous" src="https://connect.facebook.net/{{ page.contributing.discuss.lang }}/sdk.js#xfbml=1&version=v17.0&appId={{ page.contributing.discuss.app_id }}&autoLogAppEvents=1" nonce="mqsBinib"></script>
- <div class="fb-comments" data-href="https://developers.facebook.com/docs/plugins/comments#configurator" data-width="" data-numposts="5"></div>
- {% when 'giscus' %}
- <script src="https://giscus.app/client.js" data-repo="{{ page.contributing.discuss.repo }}" data-repo-id="{{ page.contributing.discuss.repo_id }}" data-category="{{ page.contributing.discuss.category }}" data-category-id="{{ page.contributing.discuss.category_id }}" data-mapping="{{ page.contributing.discuss.mapping }}" data-reactions-enabled="{{ page.contributing.discuss.reactions_enabled | default: 1 }}" data-emit-metadata="{{ page.contributing.discuss.emit_metadata | default: 0 }}" data-theme="{{ page.contributing.discuss.theme | default: 'preferred_color_scheme' }}" data-lang="{{ page.contributing.discuss.lang | default: 'en' }}" crossorigin="anonymous" async></script>
- {% when 'telegram' %}
- <script src="https://telegram.org/js/telegram-widget.js?15" {% if page.contributing.discuss.telegram_discussion != null %} data-telegram-discussion="{{ page.contributing.discuss.telegram_discussion }}" {% endif %} data-comments-limit="{{ page.contributing.discuss.comments_limit | default: '5' }}" {% if page.contributing.discuss.height != null %} data-height="{{ page.contributing.discuss.height }}" {% endif %} data-color="{{ page.contributing.discuss.color | default: '319BE6' }}" data-dark-color="{{ page.contributing.discuss.color | default: '4BA3E2' }}" data-colorful="{{ page.contributing.discuss.colorful | default: 0 }}" data-dark="{{ page.contributing.discuss.dark | default: 0 }}" crossorigin="anonymous" async></script>
- {% when 'utterances' %}
- <script src="https://utteranc.es/client.js" repo="{{ page.contributing.discuss.repo }}" issue-term="{{ page.contributing.discuss.issue_term }}"
- {% if page.contributing.discuss.label != null %}
- label="{{ page.contributing.discuss.label }}"
- {% endif %}
- theme="{{ page.contributing.discuss.theme | default: 'preferred-color-scheme' }}" crossorigin="anonymous" async></script>
+ label="{{ page.contributing.discuss.label }}"
+ {% endif %}
+ theme="{{ page.contributing.discuss.theme | default: 'preferred-color-scheme' }}" crossorigin="anonymous" async></script>
  {% endcase %}
  {% else %}
  {% case site.ham.contributing.discuss.type %}
  {% when 'custom' %}
  {% include custom-comments.html %}
  {% when 'facebook' %}
- {% if site.ham.contributing.discuss.label != null %}
+ {% if site.ham.contributing.discuss.facebook_app_id != null %}
  <div id="fb-root"></div>
- <script async defer crossorigin="anonymous" src="https://connect.facebook.net/{{ site.ham.contributing.discuss.lang }}/sdk.js#xfbml=1&version=v17.0&appId={{ site.ham.contributing.discuss.app_id }}&autoLogAppEvents=1" nonce="mqsBinib"></script>
+ <script async defer crossorigin="anonymous" src="https://connect.facebook.net/{{ site.ham.contributing.discuss.lang }}/sdk.js#xfbml=1&version=v17.0&appId={{ site.ham.contributing.discuss.facebook_app_id }}&autoLogAppEvents=1" nonce="mqsBinib"></script>
  <div class="fb-comments" data-href="https://developers.facebook.com/docs/plugins/comments#configurator" data-width="" data-numposts="5"></div>
+ {% endif %}
  {% when 'giscus' %}
  <script src="https://giscus.app/client.js" data-repo="{{ site.ham.contributing.discuss.repo }}" data-repo-id="{{ site.ham.contributing.discuss.repo_id }}" data-category="{{ site.ham.contributing.discuss.category }}" data-category-id="{{ site.ham.contributing.discuss.category_id }}" data-mapping="{{ site.ham.contributing.discuss.mapping }}" data-reactions-enabled="{{ site.ham.contributing.discuss.reactions_enabled | default: 1 }}" data-emit-metadata="{{ site.ham.contributing.discuss.emit_metadata | default: 0 }}" data-theme="{{ site.ham.contributing.discuss.theme | default: 'preferred_color_scheme' }}" data-lang="{{ site.ham.contributing.discuss.lang | default: 'en' }}" crossorigin="anonymous" async></script>
  {% when 'telegram' %}

diff --git a/jekyll-ham.gemspec b/jekyll-ham.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
  spec.name = "jekyll-ham"
- spec.version = "0.3.0"
+ spec.version = "0.3.1"
  spec.authors = ["Reinhart Previano Koentjoro"]
  spec.email = ["[email protected]"]