From 775645b321de6392533d4116285d5f06f2b3d0ec Mon Sep 17 00:00:00 2001
From: nokhnaton <sage_of_forest@icloud.com>
Date: Thu, 24 Oct 2024 01:25:20 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=95=E7=94=A8=E3=81=AE=E6=97=A5?=
 =?UTF-8?q?=E4=BB=98=E3=82=92=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=81=AE=E3=82=82=E3=81=AE=E3=81=A8=E5=90=88=E3=82=8F=E3=81=9B?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/basic/date.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lib/basic/date.ts b/src/lib/basic/date.ts
index 7d3fb3f311..20b34f7670 100644
--- a/src/lib/basic/date.ts
+++ b/src/lib/basic/date.ts
@@ -41,8 +41,8 @@ export const getDateRepresentationWithoutSameDate = (
   return timeString
 }
 
-export const getDisplayDate = (createdAt: string, updatedAt: string) => {
-  const displayDate = new Date(updatedAt)
+export const getDateRepresentation = (date: string) => {
+  const displayDate = new Date(date)
   const today = new Date()
   const timeString = getTimeString(displayDate)
   const yesterday = new Date(today.getTime() - 1000 * 60 * 60 * 24)
@@ -68,10 +68,12 @@ export const getDisplayDate = (createdAt: string, updatedAt: string) => {
   }
 }
 
+export const getDisplayDate = (createdAt: string, updatedAt: string) => {
+  return getDateRepresentation(updatedAt)
+}
+
 export const getCreatedDate = (createdAt: string) => {
-  const createdDate = new Date(createdAt)
-  const now = new Date()
-  return getDateRepresentationWithoutSameDate(createdDate, now)
+  return getDateRepresentation(createdAt)
 }
 
 export const compareDate = (date1: Date, date2: Date, inverse = false) => {

From b5007660178e13ca00c039c9b1f4f735f857d0ee Mon Sep 17 00:00:00 2001
From: nokhnaton <sage_of_forest@icloud.com>
Date: Thu, 24 Oct 2024 01:26:12 +0900
Subject: [PATCH 2/4] fix: text

---
 tests/unit/lib/basic/date.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/lib/basic/date.spec.ts b/tests/unit/lib/basic/date.spec.ts
index 4ffb7240e0..19b4a27d9e 100644
--- a/tests/unit/lib/basic/date.spec.ts
+++ b/tests/unit/lib/basic/date.spec.ts
@@ -130,7 +130,7 @@ describe('getCreatedDate', () => {
   today.setMinutes(23)
 
   it('can get', () => {
-    expect(getCreatedDate(today.toISOString())).toBe('01:23')
+    expect(getCreatedDate(today.toISOString())).toBe('今日 01:23')
   })
 })
 

From c8d676156d7327373804594fe7ebb09d1ddc048c Mon Sep 17 00:00:00 2001
From: nokhnaton <sage_of_forest@icloud.com>
Date: Sun, 27 Oct 2024 13:22:15 +0900
Subject: [PATCH 3/4] =?UTF-8?q?getDisplayDate=E3=81=ABgetCreatedDate?=
 =?UTF-8?q?=E3=82=92=E7=B5=B1=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchResultMessageElement.vue            |  4 +-
 .../MessageQuoteListItemFooter.vue            |  4 +-
 .../FileModal/FileModalContentFooter.vue      |  4 +-
 src/lib/basic/date.ts                         | 18 +++++----
 tests/unit/lib/basic/date.spec.ts             | 38 ++-----------------
 5 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/src/components/Main/CommandPalette/SearchResultMessageElement.vue b/src/components/Main/CommandPalette/SearchResultMessageElement.vue
index 46983e5528..b90a4e62eb 100644
--- a/src/components/Main/CommandPalette/SearchResultMessageElement.vue
+++ b/src/components/Main/CommandPalette/SearchResultMessageElement.vue
@@ -44,7 +44,7 @@
 <script lang="ts" setup>
 import type { DeepReadonly } from 'vue'
 import { computed, ref, shallowRef, watchEffect } from 'vue'
-import { getCreatedDate } from '/@/lib/basic/date'
+import { getDisplayDate } from '/@/lib/basic/date'
 import type { MessageId } from '/@/types/entity-ids'
 import useChannelPath from '/@/composables/useChannelPath'
 import type { Message } from '@traptitech/traq'
@@ -92,7 +92,7 @@ const date = computed(() => {
   } else {
     _date = props.message.updatedAt
   }
-  return getCreatedDate(_date)
+  return getDisplayDate(_date)
 })
 const { fetchFileMetaData } = useMessagesStore()
 
diff --git a/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue b/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue
index 07ba640d9f..ca87185a4b 100644
--- a/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue
+++ b/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue
@@ -16,7 +16,7 @@
 import { computed } from 'vue'
 import type { Message } from '@traptitech/traq'
 import useChannelPath from '/@/composables/useChannelPath'
-import { getCreatedDate } from '/@/lib/basic/date'
+import { getDisplayDate } from '/@/lib/basic/date'
 import { constructMessagesPath } from '/@/router'
 
 const props = defineProps<{
@@ -32,7 +32,7 @@ const channelLink = computed(() =>
   props.message ? channelIdToLink(props.message.channelId) : ''
 )
 const date = computed(() =>
-  props.message ? getCreatedDate(props.message.createdAt) : ''
+  props.message ? getDisplayDate(props.message.createdAt) : ''
 )
 const messageLink = computed(() =>
   props.message ? constructMessagesPath(props.message.id) : ''
diff --git a/src/components/Modal/FileModal/FileModalContentFooter.vue b/src/components/Modal/FileModal/FileModalContentFooter.vue
index 8ce38e5ccc..779af49da4 100644
--- a/src/components/Modal/FileModal/FileModalContentFooter.vue
+++ b/src/components/Modal/FileModal/FileModalContentFooter.vue
@@ -16,7 +16,7 @@ import FileModalContentFooterUsername from './FileModalContentFooterUsername.vue
 import { computed } from 'vue'
 import useFileMeta from '/@/composables/files/useFileMeta'
 import useChannelPath from '/@/composables/useChannelPath'
-import { getCreatedDate } from '/@/lib/basic/date'
+import { getDisplayDate } from '/@/lib/basic/date'
 import { useOpenLinkAndClearModal } from '../composables/useOpenLinkFromModal'
 import { useUsersStore } from '/@/store/entities/users'
 
@@ -39,7 +39,7 @@ const user = computed(() =>
   usersMap.value.get(fileMeta.value?.uploaderId ?? '')
 )
 const createdAt = computed(() =>
-  getCreatedDate(fileMeta.value?.createdAt ?? '')
+  getDisplayDate(fileMeta.value?.createdAt ?? '')
 )
 
 const { channelIdToPathString, channelIdToLink } = useChannelPath()
diff --git a/src/lib/basic/date.ts b/src/lib/basic/date.ts
index 20b34f7670..18eb23f699 100644
--- a/src/lib/basic/date.ts
+++ b/src/lib/basic/date.ts
@@ -41,8 +41,8 @@ export const getDateRepresentationWithoutSameDate = (
   return timeString
 }
 
-export const getDateRepresentation = (date: string) => {
-  const displayDate = new Date(date)
+export const getDateRepresentation = (date: Readonly<Date>) => {
+  const displayDate = date
   const today = new Date()
   const timeString = getTimeString(displayDate)
   const yesterday = new Date(today.getTime() - 1000 * 60 * 60 * 24)
@@ -68,12 +68,16 @@ export const getDateRepresentation = (date: string) => {
   }
 }
 
-export const getDisplayDate = (createdAt: string, updatedAt: string) => {
-  return getDateRepresentation(updatedAt)
-}
+export const getDisplayDate = (createdAt: string, updatedAt?: string) => {
+  const createdAtUnix = Date.parse(createdAt)
+  const updatedAtUnix = Date.parse(updatedAt ?? '')
+  if (!Number.isNaN(updatedAtUnix)) {
+    return getDateRepresentation(new Date(updatedAtUnix))
+  }
 
-export const getCreatedDate = (createdAt: string) => {
-  return getDateRepresentation(createdAt)
+  return Number.isNaN(createdAtUnix)
+    ? ''
+    : getDateRepresentation(new Date(createdAtUnix))
 }
 
 export const compareDate = (date1: Date, date2: Date, inverse = false) => {
diff --git a/tests/unit/lib/basic/date.spec.ts b/tests/unit/lib/basic/date.spec.ts
index 19b4a27d9e..6e1fc08bd0 100644
--- a/tests/unit/lib/basic/date.spec.ts
+++ b/tests/unit/lib/basic/date.spec.ts
@@ -4,11 +4,9 @@ import {
   getFullDayString,
   getFullDayWithTimeString,
   getISOFullDayString,
-  getDateRepresentationWithoutSameDate,
   getDisplayDate,
   compareDate,
   compareDateString,
-  getCreatedDate,
   getCurrentTimeString
 } from '/@/lib/basic/date'
 
@@ -69,30 +67,6 @@ describe('getCurrentTimeString', () => {
   })
 })
 
-describe('getDateRepresentationWithoutSameDate', () => {
-  const date = new Date(defaultDate1.getTime())
-
-  it('can get time string', () => {
-    const date2 = new Date(defaultDate1.getTime())
-    date2.setMinutes(date2.getMinutes() + 2)
-    expect(getDateRepresentationWithoutSameDate(date2, date)).toBe('15:23')
-  })
-  it('can get date with time string', () => {
-    const date2 = new Date(defaultDate1.getTime())
-    date2.setDate(date2.getDate() + 2)
-    expect(getDateRepresentationWithoutSameDate(date2, date)).toBe(
-      '12/06 15:21'
-    )
-  })
-  it('can get date with time string and year', () => {
-    const date2 = new Date(defaultDate1.getTime())
-    date2.setFullYear(date2.getFullYear() + 2)
-    expect(getDateRepresentationWithoutSameDate(date2, date)).toBe(
-      '1987/12/04 15:21'
-    )
-  })
-})
-
 describe('getDisplayDate', () => {
   beforeEach(() => {
     vi.useFakeTimers()
@@ -122,15 +96,9 @@ describe('getDisplayDate', () => {
       '2010/05/02 14:28'
     )
   })
-})
-
-describe('getCreatedDate', () => {
-  const today = new Date()
-  today.setHours(1)
-  today.setMinutes(23)
-
-  it('can get', () => {
-    expect(getCreatedDate(today.toISOString())).toBe('今日 01:23')
+  it('with one parameter', () => {
+    vi.setSystemTime('2010-04-01T12:00:00')
+    expect(getDisplayDate(createdDateISO)).toBe('今日 12:34')
   })
 })
 

From 1af8958969c866f9fd826ef1a409ff24898e73f9 Mon Sep 17 00:00:00 2001
From: nokhnaton <sage_of_forest@icloud.com>
Date: Mon, 28 Oct 2024 13:59:17 +0900
Subject: [PATCH 4/4] =?UTF-8?q?getDateRepresentation=E3=82=92=E5=BA=83?=
 =?UTF-8?q?=E3=81=8F=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchResultMessageElement.vue            |  4 ++--
 .../MainView/MessageElement/MessageHeader.vue |  7 +++++--
 .../MessageQuoteListItemFooter.vue            |  4 ++--
 .../FileModal/FileModalContentFooter.vue      |  4 ++--
 src/lib/basic/date.ts                         | 19 +++++--------------
 tests/unit/lib/basic/date.spec.ts             | 19 ++++++-------------
 6 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/components/Main/CommandPalette/SearchResultMessageElement.vue b/src/components/Main/CommandPalette/SearchResultMessageElement.vue
index b90a4e62eb..f45b6342d7 100644
--- a/src/components/Main/CommandPalette/SearchResultMessageElement.vue
+++ b/src/components/Main/CommandPalette/SearchResultMessageElement.vue
@@ -44,7 +44,7 @@
 <script lang="ts" setup>
 import type { DeepReadonly } from 'vue'
 import { computed, ref, shallowRef, watchEffect } from 'vue'
-import { getDisplayDate } from '/@/lib/basic/date'
+import { getDateRepresentation } from '/@/lib/basic/date'
 import type { MessageId } from '/@/types/entity-ids'
 import useChannelPath from '/@/composables/useChannelPath'
 import type { Message } from '@traptitech/traq'
@@ -92,7 +92,7 @@ const date = computed(() => {
   } else {
     _date = props.message.updatedAt
   }
-  return getDisplayDate(_date)
+  return getDateRepresentation(_date)
 })
 const { fetchFileMetaData } = useMessagesStore()
 
diff --git a/src/components/Main/MainView/MessageElement/MessageHeader.vue b/src/components/Main/MainView/MessageElement/MessageHeader.vue
index 76d454bdf2..f5648e993a 100644
--- a/src/components/Main/MainView/MessageElement/MessageHeader.vue
+++ b/src/components/Main/MainView/MessageElement/MessageHeader.vue
@@ -30,7 +30,10 @@ import GradeBadge from './GradeBadge.vue'
 import AIcon from '/@/components/UI/AIcon.vue'
 import { computed } from 'vue'
 import type { UserId } from '/@/types/entity-ids'
-import { getDisplayDate, getFullDayWithTimeString } from '/@/lib/basic/date'
+import {
+  getDateRepresentation,
+  getFullDayWithTimeString
+} from '/@/lib/basic/date'
 import { useUsersStore } from '/@/store/entities/users'
 
 const props = defineProps<{
@@ -49,7 +52,7 @@ if (user.value === undefined) {
 const createdDate = computed(() =>
   getFullDayWithTimeString(new Date(props.createdAt))
 )
-const date = computed(() => getDisplayDate(props.createdAt, props.updatedAt))
+const date = computed(() => getDateRepresentation(props.updatedAt))
 </script>
 
 <style lang="scss" module>
diff --git a/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue b/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue
index ca87185a4b..bd37062ccb 100644
--- a/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue
+++ b/src/components/Main/MainView/MessageElement/MessageQuoteListItemFooter.vue
@@ -16,7 +16,7 @@
 import { computed } from 'vue'
 import type { Message } from '@traptitech/traq'
 import useChannelPath from '/@/composables/useChannelPath'
-import { getDisplayDate } from '/@/lib/basic/date'
+import { getDateRepresentation } from '/@/lib/basic/date'
 import { constructMessagesPath } from '/@/router'
 
 const props = defineProps<{
@@ -32,7 +32,7 @@ const channelLink = computed(() =>
   props.message ? channelIdToLink(props.message.channelId) : ''
 )
 const date = computed(() =>
-  props.message ? getDisplayDate(props.message.createdAt) : ''
+  props.message ? getDateRepresentation(props.message.createdAt) : ''
 )
 const messageLink = computed(() =>
   props.message ? constructMessagesPath(props.message.id) : ''
diff --git a/src/components/Modal/FileModal/FileModalContentFooter.vue b/src/components/Modal/FileModal/FileModalContentFooter.vue
index 779af49da4..22085a8db1 100644
--- a/src/components/Modal/FileModal/FileModalContentFooter.vue
+++ b/src/components/Modal/FileModal/FileModalContentFooter.vue
@@ -16,7 +16,7 @@ import FileModalContentFooterUsername from './FileModalContentFooterUsername.vue
 import { computed } from 'vue'
 import useFileMeta from '/@/composables/files/useFileMeta'
 import useChannelPath from '/@/composables/useChannelPath'
-import { getDisplayDate } from '/@/lib/basic/date'
+import { getDateRepresentation } from '/@/lib/basic/date'
 import { useOpenLinkAndClearModal } from '../composables/useOpenLinkFromModal'
 import { useUsersStore } from '/@/store/entities/users'
 
@@ -39,7 +39,7 @@ const user = computed(() =>
   usersMap.value.get(fileMeta.value?.uploaderId ?? '')
 )
 const createdAt = computed(() =>
-  getDisplayDate(fileMeta.value?.createdAt ?? '')
+  getDateRepresentation(fileMeta.value?.createdAt ?? '')
 )
 
 const { channelIdToPathString, channelIdToLink } = useChannelPath()
diff --git a/src/lib/basic/date.ts b/src/lib/basic/date.ts
index 18eb23f699..21b6b45ce1 100644
--- a/src/lib/basic/date.ts
+++ b/src/lib/basic/date.ts
@@ -41,8 +41,11 @@ export const getDateRepresentationWithoutSameDate = (
   return timeString
 }
 
-export const getDateRepresentation = (date: Readonly<Date>) => {
-  const displayDate = date
+export const getDateRepresentation = (date: Readonly<Date> | string) => {
+  const displayDate = new Date(date)
+  if (Number.isNaN(displayDate.getTime())) {
+    return ''
+  }
   const today = new Date()
   const timeString = getTimeString(displayDate)
   const yesterday = new Date(today.getTime() - 1000 * 60 * 60 * 24)
@@ -68,18 +71,6 @@ export const getDateRepresentation = (date: Readonly<Date>) => {
   }
 }
 
-export const getDisplayDate = (createdAt: string, updatedAt?: string) => {
-  const createdAtUnix = Date.parse(createdAt)
-  const updatedAtUnix = Date.parse(updatedAt ?? '')
-  if (!Number.isNaN(updatedAtUnix)) {
-    return getDateRepresentation(new Date(updatedAtUnix))
-  }
-
-  return Number.isNaN(createdAtUnix)
-    ? ''
-    : getDateRepresentation(new Date(createdAtUnix))
-}
-
 export const compareDate = (date1: Date, date2: Date, inverse = false) => {
   const _inv = inverse ? -1 : 1
   const _t1 = date1.getTime()
diff --git a/tests/unit/lib/basic/date.spec.ts b/tests/unit/lib/basic/date.spec.ts
index 6e1fc08bd0..bdd223c1af 100644
--- a/tests/unit/lib/basic/date.spec.ts
+++ b/tests/unit/lib/basic/date.spec.ts
@@ -4,7 +4,7 @@ import {
   getFullDayString,
   getFullDayWithTimeString,
   getISOFullDayString,
-  getDisplayDate,
+  getDateRepresentation,
   compareDate,
   compareDateString,
   getCurrentTimeString
@@ -75,30 +75,23 @@ describe('getDisplayDate', () => {
     vi.useRealTimers()
   })
 
-  const createdDateISO = '2010-04-01T12:34:56'
-  const updatedDateISO = '2010-05-02T14:28:57'
+  const dateISO = '2010-05-02T14:28:57'
 
   it('should say 今日 when updated today', () => {
     vi.setSystemTime('2010-05-02T15:00:00')
-    expect(getDisplayDate(createdDateISO, updatedDateISO)).toBe('今日 14:28')
+    expect(getDateRepresentation(dateISO)).toBe('今日 14:28')
   })
   it('should say 昨日 when updated yesterday', () => {
     vi.setSystemTime('2010-05-03T15:00:00')
-    expect(getDisplayDate(createdDateISO, updatedDateISO)).toBe('昨日 14:28')
+    expect(getDateRepresentation(dateISO)).toBe('昨日 14:28')
   })
   it('should get MM/DD when updated in the same year', () => {
     vi.setSystemTime('2010-07-07T15:00:00')
-    expect(getDisplayDate(createdDateISO, updatedDateISO)).toBe('05/02 14:28')
+    expect(getDateRepresentation(dateISO)).toBe('05/02 14:28')
   })
   it('should get YYYY/MM/DD when updated before last year', () => {
     vi.setSystemTime('2015-10-10T15:00:00')
-    expect(getDisplayDate(createdDateISO, updatedDateISO)).toBe(
-      '2010/05/02 14:28'
-    )
-  })
-  it('with one parameter', () => {
-    vi.setSystemTime('2010-04-01T12:00:00')
-    expect(getDisplayDate(createdDateISO)).toBe('今日 12:34')
+    expect(getDateRepresentation(dateISO)).toBe('2010/05/02 14:28')
   })
 })