alexohneander/alexohneander-zola
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

✨ feat: add support for Hyvor Talk comments

Browse Source
This commit is contained in:
welpo
2023-07-17 20:10:18 +02:00
parent 5214dd3560
commit 7924e8206c
10 changed files with 184 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
templates/macros/add_comments.html
View File

@@ -41,14 +41,34 @@
data-light-theme="{{ config.extra.utterances.light_theme }}"
data-dark-theme="{{ config.extra.utterances.dark_theme }}"
data-lazy-loading="{{ config.extra.utterances.lazy_loading | default(value=true) }}">
{% elif comment_system == "hyvortalk" %}
{# Store required Hyvor Talk data attributes in the div #}
data-website-id="{{ config.extra.hyvortalk.website_id }}"
{% if config.extra.hyvortalk.page_id_is_slug %}
data-page-id="{{ page.slug }}"
{% else %}
data-page-id="{{ current_url }}"
{% endif %}
{% if config.extra.hyvortalk.lang %}
data-page-language="{{ config.extra.hyvortalk.lang }}"
{% else %}
data-page-language="{{ lang }}"
{% endif %}
data-page-author="{{ config.extra.hyvortalk.page_author }}"
{% if config.extra.hyvortalk.lazy_loading %}
data-loading="lazy">
{% else %}
data-loading="default">
{% endif %}
{% endif %}
</div>
{% if automatic_loading %}
<script src="{{ get_url(path='js/' ~ comment_system ~ '_min.js', trailing_slash=false) | safe }}" async></script>
{% else %}
<button id="load-comments" class="load-comments-button" data-script-src="{{ get_url(path='js/' ~ comment_system ~ '_min.js', trailing_slash=false) | safe }}">...</button>
<button id="load-comments" class="load-comments-button" data-script-src="{{ get_url(path='js/' ~ comment_system ~ '_min.js', trailing_slash=false) | safe }}">{%- if lang != config.default_language %} {{ trans(key="load_comments" | safe, lang=lang) }}{% else %} Load comments {%- endif -%}</button>
<script src="{{ get_url(path='js/loadComments_min.js', trailing_slash=false) | safe }}" async></script>
{% endif %}
</div>
{%- endmacro add_comments -%}

5
templates/macros/content.html
View File

@@ -83,14 +83,17 @@
{# Check if comments are enabled #}
{% set giscus_enabled = config.extra.giscus.enabled_for_all_posts or page.extra.giscus %}
{% set utterances_enabled = config.extra.utterances.enabled_for_all_posts or page.extra.utterances %}
{% set hyvortalk_enabled = config.extra.hyvortalk.enabled_for_all_posts or page.extra.hyvortalk %}
{# Ensure only one comment system is enabled #}
{% if giscus_enabled and utterances_enabled %}
{% if giscus_enabled and utterances_enabled or giscus_enabled and hyvortalk_enabled or utterances_enabled and hyvortalk_enabled %}
{{ throw(message="ERROR: Multiple comment systems have been enabled for the same page. Check your config.toml and individual page settings to ensure only one comment system is activated at a time.") }}
{% elif giscus_enabled %}
{% set comment_system = "giscus" %}
{% elif utterances_enabled %}
{% set comment_system = "utterances" %}
{% elif hyvortalk_enabled %}
{% set comment_system = "hyvortalk" %}
{% endif %}
{% if comment_system %}

15
templates/partials/header.html
View File

@@ -72,20 +72,27 @@
content="default-src 'self'
{%- if config.extra.allowed_domains -%}
;
{# Check if a comment system is enabled to allow the necessary domains and directives #}
{%- set utterances_enabled = config.extra.utterances.enabled_for_all_posts or page.extra.utterances -%}
{%- set giscus_enabled = config.extra.giscus.enabled_for_all_posts or page.extra.giscus -%}
{% set hyvortalk_enabled = config.extra.hyvortalk.enabled_for_all_posts or page.extra.hyvortalk %}
{% if hyvortalk_enabled %}
connect-src talk.hyvor.com;
{% endif %}
{%- for domain in config.extra.allowed_domains -%}
{{ domain.directive }} {{ domain.domains | join(sep=' ') -}}
{% if utterances_enabled -%}
{% if utterances_enabled or hyvortalk_enabled -%}
{%- if domain.directive == "style-src" %} 'unsafe-inline'
{%- endif -%}
{% endif -%}
{# Automatically allow giscus/utterances, if enabled #}
{%- if domain.directive == "script-src" or domain.directive == "frame-src" -%}
{%- if config.extra.giscus.enabled_for_all_posts or page.extra.giscus %} giscus.app
{%- elif config.extra.utterances.enabled_for_all_posts or page.extra.utterances%} utteranc.es
{%- if giscus_enabled %} giscus.app
{%- elif utterances_enabled %} utteranc.es
{%- elif hyvortalk_enabled %} talk.hyvor.com
{%- endif %}
{%- endif -%}
{%- if not loop.last -%}