add timezone offset

Author: djyde

pages/api/open/comments.ts

@@ -88,6 +88,8 @@ export default async function handler(
       pageId: string
     }
 
+    const timezoneOffsetInHour = req.headers['x-timezone-offset']
+
     const isDeleted = await projectService.isDeleted(query.appId)
 
     if (isDeleted) {
@@ -121,15 +123,19 @@ export default async function handler(
       },
     )
 
-    const comments = await commentService.getComments(query.appId, {
-      approved: true,
-      parentId: null,
-      pageSlug: query.pageId,
-      page: Number(query.page) || 1,
-      select: {
-        by_nickname: true,
+    const comments = await commentService.getComments(
+      query.appId,
+      Number(timezoneOffsetInHour),
+      {
+        approved: true,
+        parentId: null,
+        pageSlug: query.pageId,
+        page: Number(query.page) || 1,
+        select: {
+          by_nickname: true,
+        },
       },
-    })
+    )
 
     queryCommentStat.end()
 

pages/api/project/[projectId]/comments.ts

@@ -18,6 +18,8 @@ export default async function handler(
       page: string
     }
 
+    const timezoneOffsetInHour = req.headers['x-timezone-offset'] || 0
+
     // only owner can get comments
     const project = (await projectService.get(projectId, {
       select: {
@@ -36,7 +38,7 @@ export default async function handler(
       }
     })
 
-    const comments = await commentService.getComments(projectId, {
+    const comments = await commentService.getComments(projectId, Number(timezoneOffsetInHour), {
       parentId: null,
       page: Number(page),
       onlyOwn: true,

service/comment.service.ts

@@ -9,6 +9,8 @@ import { statService } from './stat.service'
 import { EmailService } from './email.service'
 import { TokenService } from './token.service'
 import { makeConfirmReplyNotificationTemplate } from '../templates/confirm_reply_notification'
+import utc from 'dayjs/plugin/utc'
+dayjs.extend(utc)
 
 export const markdown = MarkdownIt({
   linkify: true,
@@ -39,6 +41,7 @@ export class CommentService extends RequestScopeService {
 
   async getComments(
     projectId: string,
+    timezoneOffset: number,
     options?: {
       parentId?: string
       page?: number
@@ -105,7 +108,7 @@ export class CommentService extends RequestScopeService {
     const allComments = await Promise.all(
       comments.map(async (comment: Comment) => {
         // get replies
-        const replies = await this.getComments(projectId, {
+        const replies = await this.getComments(projectId, timezoneOffset, {
           ...options,
           page: 1,
           // hard code 100 because we havent implement pagination in nested comment
@@ -115,7 +118,7 @@ export class CommentService extends RequestScopeService {
           select,
         })
 
-        const parsedCreatedAt = dayjs(comment.createdAt).format(
+        const parsedCreatedAt = dayjs.utc(comment.createdAt).utcOffset(timezoneOffset).format(
           'YYYY-MM-DD HH:mm',
         )
         const parsedContent = markdown.render(comment.content) as string

utils.client.ts

@@ -2,6 +2,9 @@ import axios from "axios";
 
 export const apiClient = axios.create({
   baseURL: "/api",
+  headers: {
+    'x-timezone-offset': -new Date().getTimezoneOffset()
+  }
 });
 
 export const VERSION = '1.1.4'

widget/Widget.svelte

@@ -39,6 +39,9 @@
     loadingComments = true
     try {
       const res = await api.get(`/api/open/comments`, {
+        headers: {
+          'x-timezone-offset': -new Date().getTimezoneOffset()
+        },
         params: {
           page: p,
           appId: attrs.appId,