Merge pull request #593 from poppastring/open-live-writer-timezoneadjust

Change the look ahead calculation to not focus on "Time Zone" adjusting time.

close #592

.gitignore

@@ -216,3 +216,5 @@ source/DasBlog.Web.UI/content
 test_results/
 test_results.xml
 /source/DasBlog.Tests/FunctionalTests/Properties/launchSettings.json
+/source/DasBlog.Web.UI/Properties/ServiceDependencies/dasblog-linux - Zip Deploy/profile.arm.json
+/source/DasBlog.Web.UI/Properties/ServiceDependencies/dasblog-linux - Zip Deploy

source/DasBlog.Services/IDasBlogSettings.cs

@@ -48,5 +48,6 @@ public interface IDasBlogSettings
 		string GeneratePostUrl(Entry entry);
 		SendMailInfo GetMailInfo(MailMessage emailmessage);
 		DateTime GetDisplayTime(DateTime datetime);
+		DateTime GetCreateTime(DateTime datetime);
 	}
 }

source/DasBlog.Tests/UnitTests/DasBlogSettingTest.cs

@@ -267,5 +267,10 @@ public DateTime GetDisplayTime(DateTime datetime)
 		{
 			throw new NotImplementedException();
 		}
+
+		public DateTime GetCreateTime(DateTime datetime)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

source/DasBlog.Web.Repositories/XmlRpcManager.cs

@@ -477,6 +477,8 @@ public string blogger_newPost(string appKey, string blogid, string username, str
 			newPost.IsPublic = publish;
 			newPost.Syndicated = publish;
 
+			newPost.CreatedUtc = newPost.ModifiedUtc = dasBlogSettings.GetCreateTime(newPost.CreatedUtc);
+
 			dataService.SaveEntry(newPost);
 
 			return newPost.EntryId;
@@ -614,6 +616,8 @@ public string metaweblog_newPost(string blogid, string username, string password
 
 			var trackbackList = FillEntryFromMetaWeblogPost(newPost, post);
 
+			newPost.CreatedUtc = newPost.ModifiedUtc = dasBlogSettings.GetCreateTime(newPost.CreatedUtc);
+
 			newPost.IsPublic = publish;
 			newPost.Syndicated = publish;
 

source/DasBlog.Web.UI/Controllers/BlogPostController.cs

@@ -253,15 +253,7 @@ public IActionResult CreatePost(PostViewModel post, string submit)
 				entry.Language = post.Language;
 				entry.Latitude = null;
 				entry.Longitude = null;
-
-				if (dasBlogSettings.SiteConfiguration.AdjustDisplayTimeZone)
-				{
-					entry.CreatedUtc = entry.ModifiedUtc = post.CreatedDateTime.AddHours(-1 * dasBlogSettings.SiteConfiguration.DisplayTimeZoneIndex);
-				}
-				else
-				{
-					entry.CreatedUtc = entry.ModifiedUtc = post.CreatedDateTime;
-				}
+				entry.CreatedUtc = entry.ModifiedUtc = dasBlogSettings.GetCreateTime(post.CreatedDateTime);
 
 				var sts = blogManager.CreateEntry(entry);
 				if (sts != NBR.EntrySaveState.Added)

source/DasBlog.Web.UI/Settings/DasBlogSettings.cs

@@ -168,14 +168,7 @@ public DateTimeZone GetConfiguredTimeZone()
 
 		public DateTime GetContentLookAhead()
 		{
-			if (SiteConfiguration.AdjustDisplayTimeZone)
-			{
-				return DateTime.UtcNow.AddHours(SiteConfiguration.DisplayTimeZoneIndex).AddDays(SiteConfiguration.ContentLookaheadDays);
-			}
-			else
-			{
-				return DateTime.UtcNow.AddDays(SiteConfiguration.ContentLookaheadDays);
-			}
+			return DateTime.UtcNow.AddDays(SiteConfiguration.ContentLookaheadDays);
 		}
 
 		public string FilterHtml(string input)
@@ -304,5 +297,15 @@ public DateTime GetDisplayTime(DateTime datetime)
 			}
 			return datetime;
 		}
+
+		public DateTime GetCreateTime(DateTime datetime)
+		{
+			if (SiteConfiguration.AdjustDisplayTimeZone)
+			{
+				datetime = datetime.AddHours(-1 * SiteConfiguration.DisplayTimeZoneIndex);
+			}
+
+			return datetime;
+		}
 	}
 }