Update meta tag helper to use PrimaryImage as default for OgImage

PiranhaCMS · Aug 18, 2020 · 0107140 · 0107140
1 parent 77810ca
commit 0107140
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/core/Piranha.AspNetCore/HtmlExtensions.cs b/core/Piranha.AspNetCore/HtmlExtensions.cs
@@ -53,12 +53,25 @@ public static HtmlString MetaTags(this IApplicationService app, IMeta content, b
         if (opengraph)
         {
             // Generate open graph tags
-            sb.AppendLine($"<meta name=\"og:type\" value=\"article\">");
+            if (content is PageBase page && page.IsStartPage)
+            {
+                sb.AppendLine($"<meta name=\"og:type\" value=\"website\">");
+            }
+            else
+            {
+                sb.AppendLine($"<meta name=\"og:type\" value=\"article\">");
+            }
             sb.AppendLine($"<meta name=\"og:title\" value=\"{ OgTitle(content) }\">");
             if (content.OgImage != null && content.OgImage.HasValue)
             {
                 sb.AppendLine($"<meta name=\"og:image\" value=\"{ app.AbsoluteUrl(content.OgImage) }\">");
             }
+            else if (content is RoutedContentBase contentBase && contentBase.PrimaryImage != null && contentBase.PrimaryImage.HasValue)
+            {
+                // If there's no OG image specified but we have a primary image,
+                // default to the primary image.
+                sb.AppendLine($"<meta name=\"og:image\" value=\"{ app.AbsoluteUrl(contentBase.PrimaryImage) }\">");
+            }
             if (!string.IsNullOrWhiteSpace(OgDescription(content)))
             {
                 sb.AppendLine($"<meta name=\"og:description\" value=\"{ OgDescription(content) }\">");

diff --git a/core/Piranha/Models/GenericPage.cs b/core/Piranha/Models/GenericPage.cs
@@ -20,13 +20,6 @@ namespace Piranha.Models
     [Serializable]
     public class GenericPage<T> : PageBase where T : GenericPage<T>
     {
-        /// <summary>
-        /// Gets if this is the startpage of the site.
-        /// </summary>
-        public bool IsStartPage {
-            get { return !ParentId.HasValue && SortOrder == 0; }
-        }
-
         /// <summary>
         /// Creates a new page model using the given page type id.
         /// </summary>

diff --git a/core/Piranha/Models/PageBase.cs b/core/Piranha/Models/PageBase.cs
@@ -36,16 +36,6 @@ public abstract class PageBase : RoutedContentBase, IBlockContent, IMeta, IComme
         /// </summary>
         public int SortOrder { get; set; }
 
-        /// <summary>
-        /// Gets/sets the optional primary image.
-        /// </summary>
-        public ImageField PrimaryImage { get; set; } = new ImageField();
-
-        /// <summary>
-        /// Gets/sets the optional excerpt.
-        /// </summary>
-        public string Excerpt { get; set; }
-
         /// <summary>
         /// Gets/sets the navigation title.
         /// </summary>
@@ -100,5 +90,11 @@ public abstract class PageBase : RoutedContentBase, IBlockContent, IMeta, IComme
         /// Checks if comments are open for this page.
         /// </summary>
         public bool IsCommentsOpen => EnableComments && Published.HasValue && (CloseCommentsAfterDays == 0 || Published.Value.AddDays(CloseCommentsAfterDays) > DateTime.Now);
+
+        /// <summary>
+        /// Gets if this is the startpage of the site.
+        /// </summary>
+        public bool IsStartPage => !ParentId.HasValue && SortOrder == 0;
+
     }
 }
diff --git a/core/Piranha/Models/PostBase.cs b/core/Piranha/Models/PostBase.cs
@@ -33,16 +33,6 @@ public abstract class PostBase : RoutedContentBase, IBlockContent, IMeta, IComme
         [Required]
         public Taxonomy Category { get; set; }
 
-        /// <summary>
-        /// Gets/sets the optional primary image.
-        /// </summary>
-        public ImageField PrimaryImage { get; set; } = new ImageField();
-
-        /// <summary>
-        /// Gets/sets the optional excerpt.
-        /// </summary>
-        public string Excerpt { get; set; }
-
         /// <summary>
         /// Gets/sets the optional redirect.
         /// </summary>

diff --git a/core/Piranha/Models/RoutedContentBase.cs b/core/Piranha/Models/RoutedContentBase.cs
@@ -66,6 +66,16 @@ public abstract class RoutedContentBase : ContentBase
         /// </summary>
         public ImageField OgImage { get; set; } = new ImageField();
 
+        /// <summary>
+        /// Gets/sets the optional primary image.
+        /// </summary>
+        public ImageField PrimaryImage { get; set; } = new ImageField();
+
+        /// <summary>
+        /// Gets/sets the optional excerpt.
+        /// </summary>
+        public string Excerpt { get; set; }
+
         /// <summary>
         /// Gets/sets the optional route used by the middleware.
         /// </summary>