Merge pull request #586 from poppastring/lookahead-offset-fix

Lookahead offset fix close #578
poppastring · Nov 15, 2021 · 19b7de9 · 19b7de9
2 parents 34938f0 + 8a67734
commit 19b7de9
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 15 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,7 +10,7 @@ pool:
 
 variables:
   buildConfiguration: 'Release'
-  version: 3.00
+  version: 3.0
 
 steps:
 - task: UseDotNet@2

diff --git a/source/DasBlog.Services/IDasBlogSettings.cs b/source/DasBlog.Services/IDasBlogSettings.cs
@@ -47,5 +47,6 @@ public interface IDasBlogSettings
 		bool IsAdmin(string gravatarhash);
 		string GeneratePostUrl(Entry entry);
 		SendMailInfo GetMailInfo(MailMessage emailmessage);
+		DateTime GetDisplayTime(DateTime datetime);
 	}
 }
diff --git a/source/DasBlog.Services/Site/TimeZoneProvider.cs b/source/DasBlog.Services/Site/TimeZoneProvider.cs
@@ -6,7 +6,7 @@ namespace DasBlog.Services.Site
 	public class TimeZoneProvider : ITimeZoneProvider
 	{
 		private bool adjustDisplayTimeZone;
-		private decimal displayTimeZoneIndex;		// this seems to be a misnomer - I think this is just an offset in hours
+		private decimal displayTimeZoneIndex;
 		public TimeZoneProvider(IOptions<TimeZoneProviderOptions> opt)
 		{
 			adjustDisplayTimeZone = opt.Value.AdjustDisplayTimeZone;
@@ -17,8 +17,8 @@ public DateTimeZone GetConfiguredTimeZone()
 			// currently Sept 2018 displayTimeZoneIndex is always an int.
 			if (adjustDisplayTimeZone)
 			{
-				return DateTimeZone.ForOffset(Offset.FromHoursAndMinutes((int)displayTimeZoneIndex
-				  , (int)(displayTimeZoneIndex % 1m * 60)));
+				return DateTimeZone.ForOffset(Offset.FromHoursAndMinutes((int)displayTimeZoneIndex, 
+						(int)(displayTimeZoneIndex % 1m * 60)));
 			}
 			else
 			{

diff --git a/source/DasBlog.Tests/UnitTests/DasBlogSettingTest.cs b/source/DasBlog.Tests/UnitTests/DasBlogSettingTest.cs
@@ -262,5 +262,10 @@ public SendMailInfo GetMailInfo(MailMessage emailmessage)
 		{
 			throw new NotImplementedException();
 		}
+
+		public DateTime GetDisplayTime(DateTime datetime)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }
diff --git a/source/DasBlog.Web.UI/Config/site.Development.config b/source/DasBlog.Web.UI/Config/site.Development.config
@@ -46,8 +46,8 @@
   <EntryTitleAsLink>true</EntryTitleAsLink>
   <ObfuscateEmail>true</ObfuscateEmail>
 
-  <DisplayTimeZoneIndex>4</DisplayTimeZoneIndex>
-  <AdjustDisplayTimeZone>true</AdjustDisplayTimeZone>
+  <DisplayTimeZoneIndex>-5</DisplayTimeZoneIndex>
+  <AdjustDisplayTimeZone>false</AdjustDisplayTimeZone>
   <ContentDir>content</ContentDir>
   <LogDir>logs</LogDir>
   <BinariesDir>content/binary</BinariesDir>

diff --git a/source/DasBlog.Web.UI/Config/site.config b/source/DasBlog.Web.UI/Config/site.config
@@ -46,8 +46,8 @@
   <EntryTitleAsLink>true</EntryTitleAsLink>
   <ObfuscateEmail>true</ObfuscateEmail>
 
-  <DisplayTimeZoneIndex>4</DisplayTimeZoneIndex>
-  <AdjustDisplayTimeZone>true</AdjustDisplayTimeZone>
+  <DisplayTimeZoneIndex>-5</DisplayTimeZoneIndex>
+  <AdjustDisplayTimeZone>false</AdjustDisplayTimeZone>
 
   <ContentDir>content</ContentDir>
   <LogDir>logs</LogDir>

diff --git a/source/DasBlog.Web.UI/Controllers/BlogPostController.cs b/source/DasBlog.Web.UI/Controllers/BlogPostController.cs
@@ -254,6 +254,15 @@ public IActionResult CreatePost(PostViewModel post, string submit)
 				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;
+				}
+
 				var sts = blogManager.CreateEntry(entry);
 				if (sts != NBR.EntrySaveState.Added)
 				{
@@ -443,10 +452,10 @@ public IActionResult AddComment(AddCommentViewModel addcomment)
 			var commt = mapper.Map<NBR.Comment>(addcomment);
 			commt.AuthorIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
 			commt.AuthorUserAgent = HttpContext.Request.Headers["User-Agent"].ToString();
-			commt.CreatedUtc = commt.ModifiedUtc = DateTime.UtcNow;
 			commt.EntryId = Guid.NewGuid().ToString();
 			commt.IsPublic = !dasBlogSettings.SiteConfiguration.CommentsRequireApproval;
-
+			commt.CreatedUtc = commt.ModifiedUtc = DateTime.Now.ToUniversalTime();
+
 			logger.LogInformation(new EventDataItem(EventCodes.CommentAdded, null, "Comment CONTENT DUMP", commt.Content));
 
 			var state = blogManager.AddComment(addcomment.TargetEntryId, commt);

diff --git a/source/DasBlog.Web.UI/Mappers/ProfilePost.cs b/source/DasBlog.Web.UI/Mappers/ProfilePost.cs
@@ -35,8 +35,8 @@ public ProfilePost(IDasBlogSettings dasBlogSettings)
 				.ForMember(dest => dest.PermaLink, opt => opt.MapFrom(src => _dasBlogSettings.GeneratePostUrl(src)))
 				.ForMember(dest => dest.ImageUrl, opt => opt.MapFrom(src => src.Content.FindFirstImage()))
 				.ForMember(dest => dest.VideoUrl, opt => opt.MapFrom(src => src.Content.FindFirstYouTubeVideo()))
-				.ForMember(dest => dest.CreatedDateTime, opt => opt.MapFrom(src => src.CreatedLocalTime))
-				.ForMember(dest => dest.ModifiedDateTime, opt => opt.MapFrom(src => src.ModifiedLocalTime));
+				.ForMember(dest => dest.CreatedDateTime, opt => opt.MapFrom(src => _dasBlogSettings.GetDisplayTime(src.CreatedUtc)))
+				.ForMember(dest => dest.ModifiedDateTime, opt => opt.MapFrom(src => _dasBlogSettings.GetDisplayTime(src.ModifiedUtc)));
 
 			CreateMap<PostViewModel, Entry>()
 				.ForMember(dest => dest.Title, opt => opt.MapFrom(src => src.Title))
@@ -61,7 +61,7 @@ public ProfilePost(IDasBlogSettings dasBlogSettings)
 				.ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Author))
 				.ForMember(dest => dest.Text, opt => opt.MapFrom(src => src.Content))
 				.ForMember(dest => dest.GravatarHashId, opt => opt.MapFrom(src => Utils.GetGravatarHash(src.AuthorEmail)))
-				.ForMember(dest => dest.Date, opt => opt.MapFrom(src => src.CreatedLocalTime))
+				.ForMember(dest => dest.Date, opt => opt.MapFrom(src => _dasBlogSettings.GetDisplayTime(src.CreatedUtc)))
 				.ForMember(dest => dest.HomePageUrl, opt => opt.MapFrom(src => src.AuthorHomepage))
 				.ForMember(dest => dest.BlogPostId, opt => opt.MapFrom(src => src.TargetEntryId))
 				.ForMember(dest => dest.CommentId, opt => opt.MapFrom(src => src.EntryId))
@@ -72,7 +72,7 @@ public ProfilePost(IDasBlogSettings dasBlogSettings)
 				.ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Author))
 				.ForMember(dest => dest.Text, opt => opt.MapFrom(src => src.Content))
 				.ForMember(dest => dest.GravatarHashId, opt => opt.MapFrom(src => Utils.GetGravatarHash(src.AuthorEmail)))
-				.ForMember(dest => dest.Date, opt => opt.MapFrom(src => src.CreatedLocalTime))
+				.ForMember(dest => dest.Date, opt => opt.MapFrom(src => _dasBlogSettings.GetDisplayTime(src.CreatedUtc)))
 				.ForMember(dest => dest.HomePageUrl, opt => opt.MapFrom(src => src.AuthorHomepage))
 				.ForMember(dest => dest.BlogPostId, opt => opt.MapFrom(src => src.TargetEntryId))
 				.ForMember(dest => dest.CommentId, opt => opt.MapFrom(src => src.EntryId))

diff --git a/source/DasBlog.Web.UI/Settings/DasBlogSettings.cs b/source/DasBlog.Web.UI/Settings/DasBlogSettings.cs
@@ -168,7 +168,14 @@ public DateTimeZone GetConfiguredTimeZone()
 
 		public DateTime GetContentLookAhead()
 		{
-			return DateTime.UtcNow.AddDays(SiteConfiguration.ContentLookaheadDays);
+			if (SiteConfiguration.AdjustDisplayTimeZone)
+			{
+				return DateTime.UtcNow.AddHours(SiteConfiguration.DisplayTimeZoneIndex).AddDays(SiteConfiguration.ContentLookaheadDays);
+			}
+			else
+			{
+				return DateTime.UtcNow.AddDays(SiteConfiguration.ContentLookaheadDays);
+			}
 		}
 
 		public string FilterHtml(string input)
@@ -288,5 +295,14 @@ public SendMailInfo GetMailInfo(MailMessage emailmessage)
 						   SiteConfiguration.EnableSmtpAuthentication, SiteConfiguration.UseSSLForSMTP,
 						   SiteConfiguration.SmtpUserName, SiteConfiguration.SmtpPassword, SiteConfiguration.SmtpPort);
 		}
+
+		public DateTime GetDisplayTime(DateTime datetime)
+		{
+			if (SiteConfiguration.AdjustDisplayTimeZone)
+			{
+				return datetime.AddHours(SiteConfiguration.DisplayTimeZoneIndex);
+			}
+			return datetime;
+		}
 	}
 }