gh_mirrors/newsnow
1
0
Fork 0
mirror of https://github.com/ourongxing/newsnow.git synced 2025-01-19 03:09:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: parseRelativeDate in correct time zone

Browse Source
This commit is contained in:
Ou 2024-10-21 12:16:15 +08:00
parent 4f34b7fdfc
commit 0bc5e9cb85
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/sources/gelonghui.ts
View File

@ -21,7 +21,7 @@ export default defineSource(async () => {
title, title,
id: url, id: url,
extra: { extra: {
date: parseRelativeDate(relatieveTime).toDateString(), date: parseRelativeDate(relatieveTime),
info, info,
}, },
}) })

10
server/utils/date.ts
View File

@ -21,8 +21,6 @@ export function tranformToUTC(date: string, format?: string, timezone: string =
return dayjs.tz(date, format, timezone).valueOf() return dayjs.tz(date, format, timezone).valueOf()
} }
export const day = dayjs
const words = [ const words = [
{ {
startAt: dayjs(), startAt: dayjs(),
@ -142,7 +140,7 @@ function toDurations(matches: string[]) {
export const parseDate = (date: string | number, ...options: any) => dayjs(date, ...options).toDate() export const parseDate = (date: string | number, ...options: any) => dayjs(date, ...options).toDate()
export function parseRelativeDate(date: string) { export function parseRelativeDate(date: string, timezone: string = "Asia/Shanghai") {
// 预处理日期字符串 date // 预处理日期字符串 date
const theDate = toDate(date) const theDate = toDate(date)
@ -194,7 +192,7 @@ export function parseRelativeDate(date: string) {
// 取特殊词对应日零时为起点，加上相应的时间长度 // 取特殊词对应日零时为起点，加上相应的时间长度
return w.startAt return w.startAt
.set("hour", 0) .set("hour", (dayjs().tz(timezone).utcOffset() - dayjs().utcOffset() / 60))
.set("minute", 0) .set("minute", 0)
.set("second", 0) .set("second", 0)
.set("millisecond", 0) .set("millisecond", 0)
@ -212,10 +210,10 @@ export function parseRelativeDate(date: string) {
if (wordMatches) { if (wordMatches) {
// The default parser of dayjs() can parse '8:00 pm' but not '8:00pm' // The default parser of dayjs() can parse '8:00 pm' but not '8:00pm'
// so we need to insert a space in between // so we need to insert a space in between
return dayjs(`${w.startAt.format("YYYY-MM-DD")} ${/a|pm$/.test(wordMatches[1]) ? wordMatches[1].replace(/a|pm/, " $&") : wordMatches[1]}`).toDate() return dayjs.tz(`${w.startAt.format("YYYY-MM-DD")} ${/a|pm$/.test(wordMatches[1]) ? wordMatches[1].replace(/a|pm/, " $&") : wordMatches[1]}`, timezone).toDate()
} }
} }
} }
return new Date() return date
} }