From bb1415f5dc1f81fb633f7a96e028dcaff5ef6fb0 Mon Sep 17 00:00:00 2001
From: Nick <nholder@afa.net>
Date: Fri, 20 Jan 2023 09:27:42 +0900
Subject: [PATCH 1/2] Fixed xcopy not working

Would not work if the path has a space.
---
 MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj | 2 +-
 MetaMomentum.UmbracoV8/MetaMomentum.UmbracoV8.csproj   | 4 ++--
 MetaMomentum.UmbracoV9/MetaMomentum.UmbracoV9.csproj   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj b/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj
index f6002fe..6e5dd58 100644
--- a/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj
+++ b/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj
@@ -44,6 +44,6 @@
     <RazorCompileOnPublish>false</RazorCompileOnPublish>
   </PropertyGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy $(SolutionDir)MetaMomentum\App_Plugins\MetaMomentum\*.* $(ProjectDir)App_Plugins\MetaMomentum\ /S /E /Y&#xD;&#xA;xcopy $(SolutionDir)MetaMomentum\Views\Partials\MetaMomentum\*.* $(ProjectDir)Views\Partials\MetaMomentum\ /S /E /Y" />
+    <Exec Command="xcopy &quot;$(SolutionDir)MetaMomentum\App_Plugins\MetaMomentum\*.*&quot; &quot;$(ProjectDir)App_Plugins\MetaMomentum\&quot; /S /E /Y&#xD;&#xA;xcopy &quot;$(SolutionDir)MetaMomentum\Views\Partials\MetaMomentum\*.*&quot; &quot;$(ProjectDir)Views\Partials\MetaMomentum\&quot; /S /E /Y" />
   </Target>
 </Project>
diff --git a/MetaMomentum.UmbracoV8/MetaMomentum.UmbracoV8.csproj b/MetaMomentum.UmbracoV8/MetaMomentum.UmbracoV8.csproj
index 281777b..74a4f58 100644
--- a/MetaMomentum.UmbracoV8/MetaMomentum.UmbracoV8.csproj
+++ b/MetaMomentum.UmbracoV8/MetaMomentum.UmbracoV8.csproj
@@ -375,8 +375,8 @@
     </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>xcopy $(SolutionDir)MetaMomentum\App_Plugins\MetaMomentum\*.* $(ProjectDir)App_Plugins\MetaMomentum\ /S /E /Y
-xcopy $(SolutionDir)MetaMomentum\Views\Partials\MetaMomentum\*.* $(ProjectDir)Views\Partials\MetaMomentum\ /S /E /Y</PreBuildEvent>
+    <PreBuildEvent>xcopy "$(SolutionDir)MetaMomentum\App_Plugins\MetaMomentum\*.*" "$(ProjectDir)App_Plugins\MetaMomentum\" /S /E /Y
+xcopy "$(SolutionDir)MetaMomentum\Views\Partials\MetaMomentum\*.*" "$(ProjectDir)Views\Partials\MetaMomentum\" /S /E /Y</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MetaMomentum.UmbracoV9/MetaMomentum.UmbracoV9.csproj b/MetaMomentum.UmbracoV9/MetaMomentum.UmbracoV9.csproj
index b14adef..9c101e5 100644
--- a/MetaMomentum.UmbracoV9/MetaMomentum.UmbracoV9.csproj
+++ b/MetaMomentum.UmbracoV9/MetaMomentum.UmbracoV9.csproj
@@ -29,6 +29,6 @@
         <RazorCompileOnBuild>false</RazorCompileOnBuild>
     </PropertyGroup>
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-      <Exec Command="xcopy $(SolutionDir)MetaMomentum\App_Plugins\MetaMomentum\*.* $(ProjectDir)App_Plugins\MetaMomentum\ /S /E /Y&#xD;&#xA;xcopy $(SolutionDir)MetaMomentum\Views\Partials\MetaMomentum\*.* $(ProjectDir)Views\Partials\MetaMomentum\ /S /E /Y" />
+      <Exec Command="xcopy &quot;$(SolutionDir)MetaMomentum\App_Plugins\MetaMomentum\*.*&quot; &quot;$(ProjectDir)App_Plugins\MetaMomentum\&quot; /S /E /Y&#xD;&#xA;xcopy &quot;$(SolutionDir)MetaMomentum\Views\Partials\MetaMomentum\*.*&quot; &quot;$(ProjectDir)Views\Partials\MetaMomentum\&quot; /S /E /Y" />
     </Target>
 </Project>

From 9ca91f96718f07d0982873ee07c33b7c629d070d Mon Sep 17 00:00:00 2001
From: Nick <nholder@afa.net>
Date: Tue, 31 Jan 2023 12:01:52 +0900
Subject: [PATCH 2/2] Added a site fallback image option to appsettings

If this option is set it will fallback to this image after checking the fallback image fields.
In the backoffice it will show if it is using an image from a fallback image field or if it is using the site fallback image.
---
 .../Config/MetaMomentumConfig.cs              |  3 ++
 MetaMomentum.Core/Constants.cs                |  3 +-
 .../Controllers/SettingsController.cs         | 32 +++++++++++++++++++
 MetaMomentum.Core/Models/MetaValues.cs        |  7 +++-
 .../MetaMomentumValueConverter.cs             |  3 +-
 .../MetaMomentum/editorView.controller.js     | 16 ++++++++--
 .../App_Plugins/MetaMomentum/editorView.html  | 12 +++++--
 .../MetaMomentum/RenderMetaTags.cshtml        | 13 ++++++--
 8 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 MetaMomentum.Core/Controllers/SettingsController.cs

diff --git a/MetaMomentum.Core/Config/MetaMomentumConfig.cs b/MetaMomentum.Core/Config/MetaMomentumConfig.cs
index cecdbda..b43b976 100644
--- a/MetaMomentum.Core/Config/MetaMomentumConfig.cs
+++ b/MetaMomentum.Core/Config/MetaMomentumConfig.cs
@@ -10,6 +10,7 @@ public class MetaMomentumConfig {
 		public string OGSiteName { get; set; } = null;
 		public string TwitterName { get; set; } = null;
 		public string FacebookAppId { get; set; } = null;
+		public string FallbackImageUrl { get; set; }
 		//public string CanonicalDomain { get; set; } = null;
 
 #if NET5_0_OR_GREATER
@@ -23,6 +24,7 @@ internal MetaMomentumConfig(IConfiguration configuration) {
 				OGSiteName = configSection?.OGSiteName;
 				TwitterName = configSection?.TwitterName;
 				FacebookAppId = configSection?.FacebookAppId;
+				FallbackImageUrl = configSection?.FallbackImageUrl;
 				//CanonicalDomain = ValidateCanonicalDomain(configSection?.CanonicalDomain);
 			}
 		}
@@ -31,6 +33,7 @@ public MetaMomentumConfig() {
 			OGSiteName = ConfigurationManager.AppSettings[$"{Constants.Configuration.SectionName}.{Constants.Configuration.OGSiteName}"];
 			TwitterName = ConfigurationManager.AppSettings[$"{Constants.Configuration.SectionName}.{Constants.Configuration.TwitterName}"];
 			FacebookAppId = ConfigurationManager.AppSettings[$"{Constants.Configuration.SectionName}.{Constants.Configuration.FacebookId}"];
+			FallbackImageUrl = ConfigurationManager.AppSettings[$"{Constants.Configuration.SectionName}.{Constants.Configuration.FallbackImageUrl}"];
 			//CanonicalDomain = MetaMomentumConfig.ValidateCanonicalDomain(ConfigurationManager.AppSettings[$"{Constants.Configuration.SectionName}.{Constants.Configuration.CanonicalDomain}"]);
 		}
 #endif
diff --git a/MetaMomentum.Core/Constants.cs b/MetaMomentum.Core/Constants.cs
index 272cfb1..dc550f6 100644
--- a/MetaMomentum.Core/Constants.cs
+++ b/MetaMomentum.Core/Constants.cs
@@ -6,7 +6,8 @@ internal static class Configuration {
 			internal const string OGSiteName = "OGSiteName";
 			internal const string TwitterName = "TwitterName";
 			internal const string FacebookId = "FacebookId";
-			internal const string CanonicalDomain = "CanonicalDomain";
+			internal const string FallbackImageUrl = "FallbackImageUrl";
+			//internal const string CanonicalDomain = "CanonicalDomain";
 		}
 	}
 }
diff --git a/MetaMomentum.Core/Controllers/SettingsController.cs b/MetaMomentum.Core/Controllers/SettingsController.cs
new file mode 100644
index 0000000..422b7c8
--- /dev/null
+++ b/MetaMomentum.Core/Controllers/SettingsController.cs
@@ -0,0 +1,32 @@
+
+using MetaMomentum.Config;
+
+
+#if NET5_0_OR_GREATER
+using Umbraco.Cms.Web.Common.Controllers;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Web.Common.Attributes;
+#else
+using Umbraco.Web.WebApi;
+using Umbraco.Web.Mvc;
+using System.Web.Http;
+#endif
+
+
+namespace MetaMomentum.Controllers {
+
+	[PluginController("MetaMomentum")]
+	public class SettingsController: UmbracoApiController {
+
+		private readonly MetaMomentumConfig _metaMomentumConfig;
+
+		public SettingsController(MetaMomentumConfig metaMomentumConfig) {
+			_metaMomentumConfig = metaMomentumConfig;
+		}
+
+		[HttpGet]
+		public string FallbackImage() {
+			return _metaMomentumConfig.FallbackImageUrl;
+		}
+	}
+}
diff --git a/MetaMomentum.Core/Models/MetaValues.cs b/MetaMomentum.Core/Models/MetaValues.cs
index 46e8f5e..2b9ce8d 100644
--- a/MetaMomentum.Core/Models/MetaValues.cs
+++ b/MetaMomentum.Core/Models/MetaValues.cs
@@ -27,10 +27,15 @@ public class MetaValues {
 		public string TwitterName { get; set; }
 
 		/// <summary>
-		/// This value can be set in the Web.Config under AppSettings.json under `MetaMomentum.TwitterName`. Make sure that you include the @ symbol
+		/// This value can be set in the Web.Config under AppSettings.json under `MetaMomentum.FacebookAppId`. Make sure that you include the @ symbol
 		/// </summary>
 		public string FacebookAppId { get; set; }
 
+		/// <summary>
+		/// This value can be set in the Web.Config under AppSettings.json under `MetaMomentum.FallbackImageUrl`. Make sure that you include the @ symbol
+		/// </summary>
+		public string FallbackImageUrl { get; set; }
+
 		[Obsolete("Please use ShareImageUrl instead")]
 		public IPublishedContent ShareImage { get; set; }
 
diff --git a/MetaMomentum.Core/ValueConverters/MetaMomentumValueConverter.cs b/MetaMomentum.Core/ValueConverters/MetaMomentumValueConverter.cs
index 108316d..144315b 100644
--- a/MetaMomentum.Core/ValueConverters/MetaMomentumValueConverter.cs
+++ b/MetaMomentum.Core/ValueConverters/MetaMomentumValueConverter.cs
@@ -171,7 +171,8 @@ private MetaValues MapToMetaValue(object source, bool preview, IPublishedPropert
 					NoIndex = md.NoIndex,
 					OGSiteName = _metaMomentumConfig.OGSiteName,
 					TwitterName = _metaMomentumConfig.TwitterName,
-					FacebookAppId = _metaMomentumConfig.FacebookAppId
+					FacebookAppId = _metaMomentumConfig.FacebookAppId,
+					FallbackImageUrl = _metaMomentumConfig?.FallbackImageUrl
 				};
 
 				return retVal;
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js b/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js
index 71473e6..7012bb0 100644
--- a/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js
+++ b/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js
@@ -1,6 +1,6 @@
 angular.module("umbraco")
 	.controller("DM.MetaMomentum",
-		function ($scope, $filter, editorState, contentEditingHelper, editorService, mediaHelper, entityResource, $interval) {
+		function ($scope, $filter, $http, editorState, contentEditingHelper, editorService, mediaHelper, entityResource, $interval) {
 			var shareImgUpdateInterval;
 
 			$scope.sharePreviewType = null;
@@ -215,7 +215,6 @@ angular.module("umbraco")
 			$scope.updateShareImage = function () {
 				$scope.model.value.shareImage = null;
 
-
 				//check if there is one already set.
 				if ($scope.model.value.share.imageUrl != null) {
 					$scope.model.value.shareImageUrl = $scope.model.value.share.imageUrl;
@@ -281,13 +280,24 @@ angular.module("umbraco")
 										$scope.model.value.shareImage = null; //Share image is not rellevant, so reset to null;
 
 									}
-									return $scope.model.value.shareImageUrl;
+									console.log($scope.model)
+									if ($scope.model.value.shareImageUrl != null) {
+										return $scope.model.value.shareImageUrl;
+									}
 								}
 								//break rootLoop;
 							}
 						}
 					}
 				}
+				
+				if (!$scope.siteFallbackImage) {
+					$http.get('/Umbraco/MetaMomentum/Settings/FallbackImage').then(function successCallback(response) {
+						$scope.siteFallbackImage = response.data;
+					}, function errorCallback(response) {
+						console.log(`Error getting site fallback image: ${response}`)
+					});
+				}
 
 
 				//If we got this far, then we havent found an image
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/editorView.html b/MetaMomentum/App_Plugins/MetaMomentum/editorView.html
index 55b8440..e5ba9aa 100644
--- a/MetaMomentum/App_Plugins/MetaMomentum/editorView.html
+++ b/MetaMomentum/App_Plugins/MetaMomentum/editorView.html
@@ -93,6 +93,7 @@
 							</label>
 							<!--<button type="button" class="btn-reset btn-link" style="float:right;" ng-click="toggleSocialPreview()">{{(showEditSocial)? "Hide Preview" : "Edit Preview"}}</button>-->
 							<uui-button type="button" look="default" color="default" class="btn-reset btn-link" style="float:right;" ng-click="toggleSocialPreview()" ng-attr-label="{{(showEditSocial)? "Hide Preview" : "Edit Preview"}}">{{(showEditSocial)? "Hide Preview" : "Edit Preview"}}</uui-button>
+							
 						</div>
 					</div>
 
@@ -120,18 +121,21 @@
 						</uui-tab>
 					</uui-tab-group>
 
-					<uui-icon-registry-essential >
+					<uui-icon-registry-essential>
 						<uui-action-bar style="position:absolute;z-index:100;transform:translateX(5px) translateY(5px)">
 							<uui-button label="edit" look="secondary" color="default" ng-on-click="openSocialPreview()">
 								<uui-icon name="edit"></uui-icon> Edit
 							</uui-button>
-							
 						</uui-action-bar>
 					</uui-icon-registry-essential>
 
 					<div ng-if="model.config.showSocialPreviewFacebook == 1 && sharePreviewType==='facebook'" style="width:527px;font-family:Helvetica, Arial, sans-serif;position:relative;">
+						<uui-tag ng-if="!model.value.share.imageUrl && model.value.shareImageUrl" style="position: absolute;right: 0;z-index:100;transform: translateX(-5px) translateY(5px);" size="s" slot="tag" look="primary" color="default">Fallback Image Field</uui-tag>
+						<uui-tag ng-if="!model.value.shareImageUrl && siteFallbackImage" style="position: absolute;right: 0;z-index:100;transform: translateX(-5px) translateY(5px);" size="s" slot="tag" look="primary" color="default">Site Fallback Image</uui-tag>
 						<img ng-if="model.value.shareImageUrl" ng-src="{{model.value.shareImageUrl}}?width=540&height=281&mode=crop"
 							 style="border:1px solid #dddfe2;width:calc(100% - 2px);" />
+						<img ng-if="siteFallbackImage && !model.value.shareImageUrl" ng-src="{{siteFallbackImage}}?width=540&height=281&mode=crop"
+							 style="border:1px solid #dddfe2;width:calc(100% - 2px);" />
 						<div style="border:1px solid #dddfe2;background-color:#e9ebee;padding:10px 12px;">
 							<div style="color:#606770;text-transform:uppercase; line-height:11px;font-size:12px">
 								{{searchHost}}
@@ -150,6 +154,8 @@
 
 						<img ng-if="model.value.shareImageUrl" ng-src="{{model.value.shareImageUrl}}?width=438&height=220&mode=crop"
 							 style="border:1px solid #dddfe2;width:calc(100%);" />
+						<img ng-if="siteFallbackImage && !model.value.shareImageUrl" ng-src="{{siteFallbackImage}}?width=438&height=220&mode=crop"
+							 style="border:1px solid #dddfe2;width:calc(100%);" />
 						<div style="padding:10px 12px;">
 
 							<div style="max-height:1.3em; white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-weight:700;margin:0 0 .15em;color:#000;" ng-bind-html="updateShareTitle()">
@@ -172,6 +178,8 @@
 
 						<img ng-if="model.value.shareImageUrl" ng-src="{{model.value.shareImageUrl}}?width=502&height=263&mode=crop"
 							 style="border:1px solid #dddfe2;width:calc(100%);" />
+						<img ng-if="siteFallbackImage && !model.value.shareImageUrl" ng-src="{{siteFallbackImage}}?width=502&height=263&mode=crop"
+							 style="border:1px solid #dddfe2;width:calc(100%);" />
 						<div style="padding: 8px 12px; background-color: #E7EAEC">
 
 							<div style="max-height:40px; white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-weight:600;margin:0 0 .15em;color:rgba(0,0,0,0.9);" ng-bind-html="updateShareTitle()">
diff --git a/MetaMomentum/Views/Partials/MetaMomentum/RenderMetaTags.cshtml b/MetaMomentum/Views/Partials/MetaMomentum/RenderMetaTags.cshtml
index cedcda3..8c07ca1 100644
--- a/MetaMomentum/Views/Partials/MetaMomentum/RenderMetaTags.cshtml
+++ b/MetaMomentum/Views/Partials/MetaMomentum/RenderMetaTags.cshtml
@@ -28,9 +28,18 @@
 
     @*Twitter Card ratio is 2:1 https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/summary-card-with-large-image *@
 	@*<meta name="twitter:image" content="@(Model.ShareImage.Url(mode: UrlMode.Absolute))?width=1200&height=628&bgcolor=white">*@
-	<meta name="twitter:image" content="@Model.GetAbsoluteShareImageUrl(Context.Request)?width=1200&height=600&bgcolor=white">
-
+    <meta name="twitter:image" content="@Model.GetAbsoluteShareImageUrl(Context.Request)?width=1200&height=600&bgcolor=white">
+}
+else if (!string.IsNullOrEmpty(Model.FallbackImageUrl))
+{
+    @* Meta(FB) require images at least 1200x630 https://developers.facebook.com/docs/sharing/webmasters/images/ *@
+    <meta property="og:image:width" content="1200" />
+    <meta property="og:image:height" content="630" />
+    <meta property="og:image" content="@Model.FallbackImageUrl" />
 
+    @*Twitter Card ratio is 2:1 https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/summary-card-with-large-image *@
+	@*<meta name="twitter:image" content="@(Model.ShareImage.Url(mode: UrlMode.Absolute))?width=1200&height=628&bgcolor=white">*@
+    <meta name="twitter:image" content="@Model.FallbackImageUrl">
 }
 
 @if (Model.NoIndex)