#434

frontend/src/lib/utils.ts

@@ -91,36 +91,36 @@ export const originalCreatedAtString = (
   const unknownLabel = (key: string) => i18n.t (`history:${key}`, { lng: locale })
   const space = locale === 'ja' ? ' ' : '\u3000'
 
-  if (from && before)
+  const fromParts = from == null ? null : new Date (from.getTime () + 9 * 3_600_000)
+  const beforeParts = before == null ? null : new Date (before.getTime () + 9 * 3_600_000)
+
+  if (from && before && fromParts && beforeParts)
+  {
+    const diff = before.getTime () - from.getTime ()
+    if (diff <= 60_000 /* 1 分 */)
+      return format (from, 'second')
+    if (fromParts.getUTCMinutes () === 0 && beforeParts.getUTCMinutes () === 0)
     {
-      const diff = before.getTime () - from.getTime ()
-
-      if (diff <= 60_000 /* 1 分 */)
-	return format (from, 'second')
-
-      if (from.getMinutes () === 0 && before.getMinutes () === 0)
+      if (Math.abs (diff - 3_600_000 /* 1 時間 */) < 60_000)
+	return `${format (from, 'minute')}${space}(${unknownLabel ('unknownMinute')})`
+      if (fromParts.getUTCHours () === 0 && beforeParts.getUTCHours () === 0)
+      {
+	if (Math.abs (diff - 86_400_000 /* 1 日 */) < 60_000)
+	  return `${format (from, 'hour')}${space}(${unknownLabel ('unknownTime')})`
+	if (fromParts.getUTCDate () === 1 && beforeParts.getUTCDate () === 1)
 	{
-	  if (Math.abs (diff - 3_600_000 /* 1 時間 */) < 60_000)
-	    return `${format (from, 'minute')}${space}(${unknownLabel ('unknownMinute')})`
-
-	  if (from.getHours () === 0 && before.getHours () === 0)
-	    {
-	      if (Math.abs (diff - 86_400_000 /* 1 日 */) < 60_000)
-		return `${format (from, 'hour')}${space}(${unknownLabel ('unknownTime')})`
-
-	      if (from.getDate () === 1 && before.getDate () === 1)
-		{
-		  if (2_332_800_000 /* 27 日 */ < diff && diff < 2_764_800_000 /* 32 日 */)
-		    return `${format (from, 'day')}${space}(${unknownLabel ('unknownDay')})`
-
-		  if (from.getMonth () === 0 && before.getMonth () === 0
-		      && (31_449_600_000 /* 364 日 */ <= diff
-			  && diff < 31_708_800_000 /* 367 日 */))
-		    return `${format (from, 'month')}${space}(${unknownLabel ('unknownMonthDay')})`
-		}
-	    }
+	  if (2_332_800_000 /* 27 日 */ < diff && diff < 2_764_800_000 /* 32 日 */)
+	    return `${format (from, 'day')}${space}(${unknownLabel ('unknownDay')})`
+	  if (fromParts.getUTCMonth () === 0 && beforeParts.getUTCMonth () === 0
+	      && (31_449_600_000 /* 364 日 */ <= diff
+		  && diff < 31_708_800_000 /* 367 日 */))
+	  {
+	    return `${format (from, 'month')}${space}(${unknownLabel ('unknownMonthDay')})`
+	  }
 	}
+      }
     }
+  }
 
   const rtn = ([from ? format (from, 'second') : '',
 		'〜',