Merge pull request #1852 from github/fixes/create-comment-just-now

Treat negative durations in comments as having just occurred

Author: grokys

src/GitHub.UI/Converters/DurationToStringConverter.cs

@@ -7,22 +7,27 @@ public class DurationToStringConverter : ValueConverterMarkupExtension<DurationT
     {
         public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
+            TimeSpan duration;
+            if (value is TimeSpan span)
+                duration = span;
+            else if (value is DateTime time)
+                duration = DateTime.UtcNow - time;
+            else if (value is DateTimeOffset offset)
+                duration = DateTimeOffset.UtcNow - offset;
+            else
+                return value;
+
+            if (duration.Ticks <= 0)
+            {
+                return Resources.JustNow;
+            }
+
             const int year = 365;
             const int month = 30;
             const int day = 24;
             const int hour = 60;
             const int minute = 60;
 
-            TimeSpan duration;
-            if (value is TimeSpan)
-                duration = (TimeSpan)value;
-            else if (value is DateTime)
-                duration = DateTime.UtcNow - (DateTime)value;
-            else if (value is DateTimeOffset)
-                duration = DateTimeOffset.UtcNow - (DateTimeOffset)value;
-            else
-                return value;
-
             if (duration.TotalDays >= year)
                 return string.Format(culture, (int)(duration.TotalDays / year) > 1 ? Resources.years : Resources.year, (int)(duration.TotalDays / year));
             else if (duration.TotalDays >= 360)
@@ -35,7 +40,7 @@ public override object Convert(object value, Type targetType, object parameter,
                 return string.Format(culture, (int)(duration.TotalMinutes / hour) > 1 ? Resources.hours : Resources.hour, (int)(duration.TotalMinutes / hour));
             else if (duration.TotalSeconds >= minute)
                 return string.Format(culture, (int)(duration.TotalSeconds / minute) > 1 ? Resources.minutes : Resources.minute, (int)(duration.TotalSeconds / minute));
-            return string.Format(culture, duration.TotalSeconds > 1 ? Resources.seconds : Resources.second, duration.TotalSeconds);
+            return string.Format(culture, duration.TotalSeconds > 1 || duration.Ticks == 0 ? Resources.seconds : Resources.second, duration.TotalSeconds);
         }
     }
-}
+}

src/GitHub.UI/Resources.Designer.cs

@@ -129,6 +129,9 @@
   <data name="hours" xml:space="preserve">
     <value>{0:N0} hours ago</value>
   </data>
+  <data name="JustNow" xml:space="preserve">
+    <value>just now</value>
+  </data>
   <data name="minute" xml:space="preserve">
     <value>{0:N0} minute ago</value>
   </data>

src/GitHub.UI/Resources.resx

@@ -9,6 +9,10 @@
 
 public class Converters
 {
+    [TestCase(0, 0, -23, 0, "just now")]
+    [TestCase(-2, 0, 0, 0, "just now")]
+    [TestCase(-1, 0, 0, 0, "just now")]
+    [TestCase(0, 0, 0, 0, "just now")]
     [TestCase(1, 0, 0, 0, "1 second ago")]
     [TestCase(2, 0, 0, 0, "2 seconds ago")]
     [TestCase(59, 0, 0, 0, "59 seconds ago")]
@@ -30,11 +34,11 @@ public class Converters
     [TestCase(0, 0, 0, 365, "1 year ago")]
     [TestCase(0, 0, 0, 365*2-1, "1 year ago")]
     [TestCase(0, 0, 0, 365*2, "2 years ago")]
-    public void TimespanConversion(int sec, int min, int hou, int day, string expected)
+    public void DurationToStringConversion(int sec, int min, int hou, int day, string expected)
     {
         var ts = new TimeSpan(day, hou, min, sec);
         var conv = new DurationToStringConverter();
         var ret = (string)conv.Convert(ts, typeof(string), null, CultureInfo.CurrentCulture);
-        Assert.That(expected, Is.EqualTo(ret));
+        Assert.That(ret, Is.EqualTo(expected));
     }
 }