refactor: add responsive control DateTimePresenter instead of TextBlock to display datetime (#2183)

love-linger · love-linger · commit 515c5508c2bc · 2026-03-12T13:30:26.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
@@ -30,11 +30,6 @@ public class Commit
         public int Color { get; set; } = 0;
         public double LeftMargin { get; set; } = 0;
 
-        public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
-        public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
-        public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
-        public string CommitterTimeShortStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
-
         public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime;
         public bool IsCurrentHead => Decorators.Find(x => x.Type is DecoratorType.CurrentBranchHead or DecoratorType.CurrentCommitHead) != null;
         public bool HasDecorators => Decorators.Count > 0;
diff --git a/src/Models/DiffOption.cs b/src/Models/DiffOption.cs
@@ -86,15 +86,15 @@ public DiffOption(Commit commit, string file)
         /// <param name="ver"></param>
         public DiffOption(FileVersion ver)
         {
-            if (string.IsNullOrEmpty(ver.Change.OriginalPath))
+            if (string.IsNullOrEmpty(ver.OriginalPath))
             {
                 _revisions.Add(ver.HasParent ? $"{ver.SHA}^" : Commit.EmptyTreeSHA1);
                 _revisions.Add(ver.SHA);
                 _path = ver.Path;
             }
             else
             {
-                _revisions.Add($"{ver.SHA}^:{ver.Change.OriginalPath.Quoted()}");
+                _revisions.Add($"{ver.SHA}^:{ver.OriginalPath.Quoted()}");
                 _revisions.Add($"{ver.SHA}:{ver.Path.Quoted()}");
                 _path = ver.Path;
                 _orgPath = ver.Change.OriginalPath;
diff --git a/src/Models/FileVersion.cs b/src/Models/FileVersion.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace SourceGit.Models
+﻿namespace SourceGit.Models
 {
     public class FileVersion
     {
@@ -10,9 +8,7 @@ public class FileVersion
         public ulong AuthorTime { get; set; } = 0;
         public string Subject { get; set; } = string.Empty;
         public Change Change { get; set; } = new();
-
         public string Path => Change.Path;
-        public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
-        public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
+        public string OriginalPath => Change.OriginalPath;
     }
 }
diff --git a/src/Models/Stash.cs b/src/Models/Stash.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 
 namespace SourceGit.Models
 {
@@ -10,24 +9,6 @@ public class Stash
         public List<string> Parents { get; set; } = [];
         public ulong Time { get; set; } = 0;
         public string Message { get; set; } = "";
-
-        public string Subject
-        {
-            get
-            {
-                return Message.Split('\n', 2)[0].Trim();
-            }
-        }
-
-        public string TimeStr
-        {
-            get
-            {
-                return DateTime.UnixEpoch
-                    .AddSeconds(Time)
-                    .ToLocalTime()
-                    .ToString(DateTimeFormat.Active.DateTime);
-            }
-        }
+        public string Subject => Message.Split('\n', 2)[0].Trim();
     }
 }
diff --git a/src/Models/Tag.cs b/src/Models/Tag.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace SourceGit.Models
+﻿namespace SourceGit.Models
 {
     public enum TagSortMode
     {
@@ -16,10 +14,5 @@ public class Tag
         public User Creator { get; set; } = null;
         public ulong CreatorDate { get; set; } = 0;
         public string Message { get; set; } = string.Empty;
-
-        public string CreatorDateStr
-        {
-            get => DateTime.UnixEpoch.AddSeconds(CreatorDate).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
-        }
     }
 }
diff --git a/src/ViewModels/TagCollection.cs b/src/ViewModels/TagCollection.cs
@@ -13,15 +13,15 @@ public class TagToolTip
         public string Name { get; private set; }
         public bool IsAnnotated { get; private set; }
         public Models.User Creator { get; private set; }
-        public string CreatorDateStr { get; private set; }
+        public ulong CreatorDate { get; private set; }
         public string Message { get; private set; }
 
         public TagToolTip(Models.Tag t)
         {
             Name = t.Name;
             IsAnnotated = t.IsAnnotated;
             Creator = t.Creator;
-            CreatorDateStr = t.CreatorDateStr;
+            CreatorDate = t.CreatorDate;
             Message = t.Message;
         }
     }
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
@@ -25,10 +25,10 @@
                   <Run Text="{Binding Author.Email, Mode=OneWay}"/>
                 </TextBlock>
               </Border>
-              <TextBlock Text="{Binding AuthorTimeStr}"
-                         Margin="2,0,0,0"
-                         FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
-                         Foreground="{DynamicResource Brush.FG2}"/>
+              <v:DateTimePresenter Margin="2,0,0,0"
+                                   Timestamp="{Binding AuthorTime}"
+                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                   Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
 
@@ -43,10 +43,10 @@
                   <Run Text="{Binding Committer.Email, Mode=OneWay}"/>
                 </TextBlock>
               </Border>
-              <TextBlock Text="{Binding CommitterTimeStr}"
-                         Margin="2,0,0,0"
-                         FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
-                         Foreground="{DynamicResource Brush.FG2}"/>
+              <v:DateTimePresenter Margin="2,0,0,0"
+                                   Timestamp="{Binding CommitterTime}"
+                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                   Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
         </UniformGrid>
@@ -127,7 +127,10 @@
                         <Grid ColumnDefinitions="Auto,*,Auto">
                           <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
                           <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                          <v:DateTimePresenter Grid.Column="2"
+                                               Margin="8,0,0,0"
+                                               Timestamp="{Binding CommitterTime}"
+                                               Foreground="{DynamicResource Brush.FG2}"/>
                         </Grid>
 
                         <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
@@ -171,7 +174,10 @@
                         <Grid ColumnDefinitions="Auto,*,Auto">
                           <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
                           <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                          <v:DateTimePresenter Grid.Column="2"
+                                               Margin="8,0,0,0"
+                                               Timestamp="{Binding CommitterTime}"
+                                               Foreground="{DynamicResource Brush.FG2}"/>
                         </Grid>
 
                         <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
@@ -213,7 +219,10 @@
                   <Grid ColumnDefinitions="Auto,*,Auto">
                     <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
                     <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                    <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                    <v:DateTimePresenter Grid.Column="2"
+                                         Margin="8,0,0,0"
+                                         Timestamp="{Binding CommitterTime}"
+                                         Foreground="{DynamicResource Brush.FG2}"/>
                   </Grid>
 
                   <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
diff --git a/src/Views/CommitTimeTextBlock.cs b/src/Views/CommitTimeTextBlock.cs
@@ -130,10 +130,13 @@ private string GetDisplayText()
             if (DataContext is not Models.Commit commit)
                 return string.Empty;
 
+            var timestamp = UseAuthorTime ? commit.AuthorTime : commit.CommitterTime;
             if (ShowAsDateTime)
-                return UseAuthorTime ? commit.AuthorTimeStr : commit.CommitterTimeStr;
+            {
+                var format = Models.DateTimeFormat.Active.DateTime;
+                return DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime().ToString(format);
+            }
 
-            var timestamp = UseAuthorTime ? commit.AuthorTime : commit.CommitterTime;
             var now = DateTime.Now;
             var localTime = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();
             var span = now - localTime;
diff --git a/src/Views/Compare.axaml b/src/Views/Compare.axaml
@@ -53,8 +53,16 @@
                   <TextBlock Text="{Binding BaseName}" Margin="4,0" Foreground="#FFF2F2F2"/>        
                 </StackPanel>
               </Border>
-              <TextBlock Grid.Column="3" Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
-              <TextBlock Grid.Column="4" Text="{Binding BaseHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="3"
+                         Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                         Foreground="DarkOrange" Margin="8,0,0,0"
+                         TextDecorations="Underline"
+                         Cursor="Hand"
+                         PointerPressed="OnPressedSHA"/>
+              <v:DateTimePresenter Grid.Column="4"
+                                   Margin="8,0,0,0"
+                                   Timestamp="{Binding BaseHead.CommitterTime}"
+                                   Foreground="{DynamicResource Brush.FG2}"/>
             </Grid>
 
             <TextBlock Grid.Row="1" Text="{Binding BaseHead.Subject}" VerticalAlignment="Bottom"/>
@@ -81,7 +89,10 @@
                 </StackPanel>
               </Border>
               <TextBlock Grid.Column="3" Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
-              <TextBlock Grid.Column="4" Text="{Binding ToHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+              <v:DateTimePresenter Grid.Column="4"
+                                   Margin="8,0,0,0"
+                                   Timestamp="{Binding ToHead.CommitterTime}"
+                                   Foreground="{DynamicResource Brush.FG2}"/>
             </Grid>
 
             <TextBlock Grid.Row="1" Text="{Binding ToHead.Subject}" VerticalAlignment="Bottom"/>
diff --git a/src/Views/DateTimePresenter.cs b/src/Views/DateTimePresenter.cs
@@ -0,0 +1,82 @@
+﻿using System;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+
+namespace SourceGit.Views
+{
+    public class DateTimePresenter : TextBlock
+    {
+        public static readonly StyledProperty<bool> ShowDateOnlyProperty =
+            AvaloniaProperty.Register<DateTimePresenter, bool>(nameof(ShowDateOnly), false);
+
+        public bool ShowDateOnly
+        {
+            get => GetValue(ShowDateOnlyProperty);
+            set => SetValue(ShowDateOnlyProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> Use24HoursProperty =
+            AvaloniaProperty.Register<DateTimePresenter, bool>(nameof(Use24Hours), true);
+
+        public bool Use24Hours
+        {
+            get => GetValue(Use24HoursProperty);
+            set => SetValue(Use24HoursProperty, value);
+        }
+
+        public static readonly StyledProperty<int> DateTimeFormatProperty =
+            AvaloniaProperty.Register<DateTimePresenter, int>(nameof(DateTimeFormat));
+
+        public int DateTimeFormat
+        {
+            get => GetValue(DateTimeFormatProperty);
+            set => SetValue(DateTimeFormatProperty, value);
+        }
+
+        public static readonly StyledProperty<ulong> TimestampProperty =
+            AvaloniaProperty.Register<DateTimePresenter, ulong>(nameof(Timestamp), 0);
+
+        public ulong Timestamp
+        {
+            get => GetValue(TimestampProperty);
+            set => SetValue(TimestampProperty, value);
+        }
+
+        protected override Type StyleKeyOverride => typeof(TextBlock);
+
+        public DateTimePresenter()
+        {
+            Bind(Use24HoursProperty, new Binding()
+            {
+                Mode = BindingMode.OneWay,
+                Source = ViewModels.Preferences.Instance,
+                Path = "Use24Hours"
+            });
+
+            Bind(DateTimeFormatProperty, new Binding()
+            {
+                Mode = BindingMode.OneWay,
+                Source = ViewModels.Preferences.Instance,
+                Path = "DateTimeFormat"
+            });
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == ShowDateOnlyProperty ||
+                change.Property == Use24HoursProperty ||
+                change.Property == DateTimeFormatProperty ||
+                change.Property == TimestampProperty)
+            {
+                var active = Models.DateTimeFormat.Active;
+                var format = ShowDateOnly ? active.DateOnly : active.DateTime;
+                var text = DateTime.UnixEpoch.AddSeconds(Timestamp).ToLocalTime().ToString(format);
+                SetCurrentValue(TextProperty, text);
+            }
+        }
+    }
+}
diff --git a/src/Views/DirHistories.axaml b/src/Views/DirHistories.axaml
@@ -94,7 +94,12 @@
                              TextDecorations="Underline"
                              Margin="8,0,0,0"
                              PointerPressed="OnPressCommitSHA"/>
-                  <TextBlock Grid.Column="3" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
+                  <v:DateTimePresenter Grid.Column="3"
+                                       Margin="8,0,0,0"
+                                       ShowDateOnly="True"
+                                       Timestamp="{Binding AuthorTime}"
+                                       Foreground="{DynamicResource Brush.FG2}"
+                                       HorizontalAlignment="Right"/>
                 </Grid>
 
                 <Border Grid.Row="1" Background="Transparent" DataContextChanged="OnCommitSubjectDataContextChanged" PointerMoved="OnCommitSubjectPointerMoved">
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
@@ -93,7 +93,12 @@
                              TextDecorations="Underline"
                              Margin="8,0,0,0"
                              PointerPressed="OnPressCommitSHA"/>
-                  <TextBlock Grid.Column="3" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
+                  <v:DateTimePresenter Grid.Column="3"
+                                       Margin="8,0,0,0"
+                                       ShowDateOnly="True"
+                                       Timestamp="{Binding AuthorTime}"
+                                       Foreground="{DynamicResource Brush.FG2}"
+                                       HorizontalAlignment="Right"/>
                 </Grid>
 
                 <Border Grid.Row="1" Background="Transparent" DataContextChanged="OnCommitSubjectDataContextChanged" PointerMoved="OnCommitSubjectPointerMoved">
@@ -202,7 +207,10 @@
                         <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
                         <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
                         <TextBlock Grid.Column="2" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressCommitSHA" />
-                        <TextBlock Grid.Column="3" Text="{Binding AuthorTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                        <v:DateTimePresenter Grid.Column="3"
+                                             Margin="8,0,0,0"
+                                             Timestamp="{Binding AuthorTime}"
+                                             Foreground="{DynamicResource Brush.FG2}"/>
                       </Grid>
 
                       <TextBlock Grid.Row="1" Margin="0,6,0,0" Text="{Binding Subject}" TextTrimming="CharacterEllipsis" VerticalAlignment="Bottom"/>
diff --git a/src/Views/GotoRevisionSelector.axaml b/src/Views/GotoRevisionSelector.axaml
@@ -87,11 +87,11 @@
                          Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                          Foreground="DarkOrange"
                          VerticalAlignment="Center"/>
-              
-              <TextBlock Grid.Column="3"
-                         Margin="4,0"
-                         Text="{Binding CommitterTimeShortStr}"
-                         HorizontalAlignment="Right" VerticalAlignment="Center"/>
+
+              <v:DateTimePresenter Grid.Column="3"
+                                   Margin="4,0"
+                                   Timestamp="{Binding CommitterTime}"
+                                   HorizontalAlignment="Right" VerticalAlignment="Center"/>
             </Grid>
           </DataTemplate>
         </ListBox.ItemTemplate>
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
@@ -191,9 +191,9 @@
 
                 <!-- Commit Time -->
                 <Border Grid.Column="7">
-                  <TextBlock Margin="16,0,8,0"
-                             Text="{Binding Commit.CommitterTimeStr}"
-                             Opacity="{Binding IsFullMessageUsed, Converter={x:Static c:BoolConverters.IsMergedToOpacity}}"/>
+                  <v:DateTimePresenter Margin="16,0,8,0"
+                                       Timestamp="{Binding Commit.CommitterTime}"
+                                       Opacity="{Binding IsFullMessageUsed, Converter={x:Static c:BoolConverters.IsMergedToOpacity}}"/>
                 </Border>
               </Grid>
             </DataTemplate>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml

Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,15 @@ public DiffOption(Commit commit, string file)`
`86`	`86`	`/// <param name="ver"></param>`
`87`	`87`	`public DiffOption(FileVersion ver)`
`88`	`88`	`{`
`89`		`- if (string.IsNullOrEmpty(ver.Change.OriginalPath))`
	`89`	`+ if (string.IsNullOrEmpty(ver.OriginalPath))`
`90`	`90`	`{`
`91`	`91`	`_revisions.Add(ver.HasParent ? $"{ver.SHA}^" : Commit.EmptyTreeSHA1);`
`92`	`92`	`_revisions.Add(ver.SHA);`
`93`	`93`	`_path = ver.Path;`
`94`	`94`	`}`
`95`	`95`	`else`
`96`	`96`	`{`
`97`		`- _revisions.Add($"{ver.SHA}^:{ver.Change.OriginalPath.Quoted()}");`
	`97`	`+ _revisions.Add($"{ver.SHA}^:{ver.OriginalPath.Quoted()}");`
`98`	`98`	`_revisions.Add($"{ver.SHA}:{ver.Path.Quoted()}");`
`99`	`99`	`_path = ver.Path;`
`100`	`100`	`_orgPath = ver.Change.OriginalPath;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System;`
`2`		`-`
`3`		`-namespace SourceGit.Models`
	`1`	`+namespace SourceGit.Models`
`4`	`2`	`{`
`5`	`3`	`public class FileVersion`
`6`	`4`	`{`
`@@ -10,9 +8,7 @@ public class FileVersion`
`10`	`8`	`public ulong AuthorTime { get; set; } = 0;`
`11`	`9`	`public string Subject { get; set; } = string.Empty;`
`12`	`10`	`public Change Change { get; set; } = new();`
`13`		`-`
`14`	`11`	`public string Path => Change.Path;`
`15`		`- public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);`
`16`		`- public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);`
	`12`	`+ public string OriginalPath => Change.OriginalPath;`
`17`	`13`	`}`
`18`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,15 @@ public class TagToolTip`
`13`	`13`	`public string Name { get; private set; }`
`14`	`14`	`public bool IsAnnotated { get; private set; }`
`15`	`15`	`public Models.User Creator { get; private set; }`
`16`		`- public string CreatorDateStr { get; private set; }`
	`16`	`+ public ulong CreatorDate { get; private set; }`
`17`	`17`	`public string Message { get; private set; }`
`18`	`18`
`19`	`19`	`public TagToolTip(Models.Tag t)`
`20`	`20`	`{`
`21`	`21`	`Name = t.Name;`
`22`	`22`	`IsAnnotated = t.IsAnnotated;`
`23`	`23`	`Creator = t.Creator;`
`24`		`- CreatorDateStr = t.CreatorDateStr;`
	`24`	`+ CreatorDate = t.CreatorDate;`
`25`	`25`	`Message = t.Message;`
`26`	`26`	`}`
`27`	`27`	`}`