refactor: the real patch

Author: cotes2020

_includes/head.html

@@ -4,35 +4,47 @@
   <meta name="theme-color" media="(prefers-color-scheme: dark)" content="#1b1b1e">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-  <meta name="viewport" content="width=device-width, user-scalable=no initial-scale=1, shrink-to-fit=no, viewport-fit=cover">
+  <meta
+    name="viewport"
+    content="width=device-width, user-scalable=no initial-scale=1, shrink-to-fit=no, viewport-fit=cover"
+  >
 
   {%- capture seo_tags -%}
     {% seo title=false %}
   {%- endcapture -%}
 
-  {% assign img_url = '' %}
+  <!-- Setup Open Graph image -->
 
   {% if page.image %}
     {% assign src = page.image.path | default: page.image %}
+
     {% unless src contains '://' %}
       {%- capture img_url -%}
-        {{ site.url }}{% include img-url.html src=src img_path=page.img_path %}
+        {% include img-url.html src=src img_path=page.img_path absolute=true %}
       {%- endcapture -%}
+
+      {%- capture old_url -%}{{ src | absolute_url }}{%- endcapture -%}
+      {%- capture new_url -%}{{ img_url }}{%- endcapture -%}
+
+      {% assign seo_tags = seo_tags | replace: old_url, new_url %}
     {% endunless %}
+
   {% elsif site.social_preview_image %}
     {%- capture img_url -%}
-      {{ site.url }}{% include img-url.html src=site.social_preview_image %}
+      {% include img-url.html src=site.social_preview_image absolute=true %}
     {%- endcapture -%}
-  {% endif %}
 
-  {% if img_url != '' %}
     {%- capture og_image -%}
       <meta property="og:image" content="{{ img_url }}" />
-      <meta name="twitter:image" content="{{ img_url }}" />
     {%- endcapture -%}
 
-    {% assign old_meta_clip = '<meta name="twitter:card"' %}
-    {% assign new_meta_clip = og_image | append: old_meta_clip %}
+    {%- capture twitter_image -%}
+      <meta property="twitter:card" content="summary_large_image" />
+      <meta property="twitter:image" content="{{ img_url }}" />
+    {%- endcapture -%}
+
+    {% assign old_meta_clip = '<meta name="twitter:card" content="summary" />' %}
+    {% assign new_meta_clip = og_image | append: twitter_image %}
     {% assign seo_tags = seo_tags | replace: old_meta_clip, new_meta_clip %}
   {% endif %}
 
@@ -58,18 +70,21 @@
 
   {% if site.resources.ignore_env != jekyll.environment and site.resources.self_hosted %}
     <link href="{{ site.data.origin[type].webfonts | relative_url }}" rel="stylesheet">
+
   {% else %}
     {% for cdn in site.data.origin[type].cdns %}
       <link rel="preconnect" href="{{ cdn.url }}" {{ cdn.args }}>
       <link rel="dns-prefetch" href="{{ cdn.url }}" {{ cdn.args }}>
     {% endfor %}
+
     <link rel="stylesheet" href="{{ site.data.origin[type].webfonts | relative_url }}">
   {% endif %}
 
   <!-- GA -->
   {% if jekyll.environment == 'production' and site.google_analytics.id != empty and site.google_analytics.id %}
     <link rel="preconnect" href="https://www.google-analytics.com" crossorigin="use-credentials">
     <link rel="dns-prefetch" href="https://www.google-analytics.com">
+
     <link rel="preconnect" href="https://www.googletagmanager.com" crossorigin="anonymous">
     <link rel="dns-prefetch" href="https://www.googletagmanager.com">
   {% endif %}

_includes/img-url.html

@@ -2,8 +2,9 @@
   Generate image final URL based on `site.img_cdn`, `page.img_path`
 
   Arguments:
-    src - basic image path, required
-    img_path - relative path of image, optional
+    src - required, basic image path
+    img_path - optional, relative path of image
+    absolute - optional, boolean, if true, generate absolute URL
 
   Return:
     image URL
@@ -14,7 +15,7 @@
 {%- if url -%}
   {% unless url contains ':' %}
     {%- comment -%} CND URL {%- endcomment -%}
-    {% assign prefix = site.img_cdn | default: '' | relative_url %}
+    {% assign prefix = site.img_cdn | default: '' %}
 
     {%- comment -%} Add page image path prefix {%- endcomment -%}
     {% assign url = include.img_path | default: '' | append: '/' | append: url %}
@@ -26,6 +27,12 @@
       | replace: '//', '/'
       | replace: ':', ':/'
     %}
+
+    {% if include.absolute %}
+      {% assign url = url | absolute_url %}
+    {% else %}
+      {% assign url = url | relative_url %}
+    {% endif %}
   {% endunless %}
 {%- endif -%}