refactor(database): ♻️ Use dates instead of strings in database

cli/user/delete.ts

@@ -31,7 +31,9 @@ export const deleteUserCommand = defineCommand({
         console.info(`About to delete user ${chalk.gray(user.data.username)}!`);
         console.info(`Username: ${chalk.blue(user.data.username)}`);
         console.info(`Display Name: ${chalk.blue(user.data.displayName)}`);
-        console.info(`Created At: ${chalk.blue(user.data.createdAt)}`);
+        console.info(
+            `Created At: ${chalk.blue(user.data.createdAt.toISOString())}`,
+        );
         console.info(
             `Instance: ${chalk.blue(user.data.instance?.baseUrl || "Local")}`,
         );

packages/api/routes/api/v1/accounts/[id]/index.test.ts

@@ -44,7 +44,7 @@ describe("/api/v1/accounts/:id", () => {
             avatar: expect.any(String),
             header: expect.any(String),
             locked: users[0].data.isLocked,
-            created_at: new Date(users[0].data.createdAt).toISOString(),
+            created_at: users[0].data.createdAt.toISOString(),
             followers_count: 0,
             following_count: 0,
             statuses_count: 5,

packages/api/routes/api/v1/accounts/verify_credentials/index.test.ts

@@ -48,9 +48,7 @@ describe("/api/v1/accounts/verify_credentials", () => {
             expect(data.moved).toBeNull();
             expect(data.suspended).toBe(false);
             expect(data.limited).toBe(false);
-            expect(data.created_at).toBe(
+            expect(data.created_at).toBe(users[0].data.createdAt.toISOString());
-                new Date(users[0].data.createdAt).toISOString(),
-            );
             expect(data.last_status_at).toBeNull();
             expect(data.statuses_count).toBe(0);
             expect(data.followers_count).toBe(0);

packages/api/routes/api/v1/markers/index.ts

@@ -98,7 +98,7 @@ export default apiRoute((app) => {
                     markers.home = {
                         last_read_id: found.noteId,
                         version: totalCount,
-                        updated_at: new Date(found.createdAt).toISOString(),
+                        updated_at: found.createdAt.toISOString(),
                     };
                 }
             }
@@ -124,7 +124,7 @@ export default apiRoute((app) => {
                     markers.notifications = {
                         last_read_id: found.notificationId,
                         version: totalCount,
-                        updated_at: new Date(found.createdAt).toISOString(),
+                        updated_at: found.createdAt.toISOString(),
                     };
                 }
             }
@@ -212,9 +212,7 @@ export default apiRoute((app) => {
                 markers.home = {
                     last_read_id: homeId,
                     version: totalCount,
-                    updated_at: new Date(
+                    updated_at: insertedMarker.createdAt.toISOString(),
-                        insertedMarker.createdAt,
-                    ).toISOString(),
                 };
             }
 
@@ -242,9 +240,7 @@ export default apiRoute((app) => {
                 markers.notifications = {
                     last_read_id: notificationsId,
                     version: totalCount,
-                    updated_at: new Date(
+                    updated_at: insertedMarker.createdAt.toISOString(),
-                        insertedMarker.createdAt,
-                    ).toISOString(),
                 };
             }
 

packages/api/routes/api/v2/filters/[id]/index.ts

@@ -184,9 +184,7 @@ export default apiRoute((app) => {
                     title,
                     context: ctx ?? [],
                     filterAction: filter_action,
-                    expireAt: new Date(
+                    expireAt: new Date(Date.now() + (expires_in ?? 0)),
-                        Date.now() + (expires_in ?? 0),
-                    ).toISOString(),
                 })
                 .where(and(eq(Filters.userId, user.id), eq(Filters.id, id)));
 
@@ -244,9 +242,7 @@ export default apiRoute((app) => {
                     id: updatedFilter.id,
                     title: updatedFilter.title,
                     context: updatedFilter.context,
-                    expires_at: updatedFilter.expireAt
+                    expires_at: updatedFilter.expireAt?.toISOString() || null,
-                        ? new Date(updatedFilter.expireAt).toISOString()
-                        : null,
                     filter_action: updatedFilter.filterAction,
                     keywords: updatedFilter.keywords.map((keyword) => ({
                         id: keyword.id,

packages/api/routes/api/v2/filters/index.ts

@@ -59,9 +59,7 @@ export default apiRoute((app) => {
                     id: filter.id,
                     title: filter.title,
                     context: filter.context,
-                    expires_at: filter.expireAt
+                    expires_at: filter.expireAt?.toISOString() || null,
-                        ? new Date(Date.now() + filter.expireAt).toISOString()
-                        : null,
                     filter_action: filter.filterAction,
                     keywords: filter.keywords.map((keyword) => ({
                         id: keyword.id,
@@ -147,9 +145,7 @@ export default apiRoute((app) => {
                         title,
                         context: ctx,
                         filterAction: filter_action,
-                        expireAt: new Date(
+                        expireAt: new Date(Date.now() + (expires_in ?? 0)),
-                            Date.now() + (expires_in ?? 0),
-                        ).toISOString(),
                         userId: user.id,
                     })
                     .returning()

packages/api/routes/oauth/revoke.test.ts

@@ -17,8 +17,8 @@ const token = await Token.insert({
     id: randomUUIDv7(),
     clientId: application.id,
     accessToken: "test-access-token",
-    expiresAt: new Date(Date.now() + 3600 * 1000).toISOString(),
+    expiresAt: new Date(Date.now() + 3600 * 1000),
-    createdAt: new Date().toISOString(),
+    createdAt: new Date(),
     scopes: application.data.scopes,
     userId: users[0].id,
 });

packages/api/routes/oauth/sso/[issuer]/callback.ts

@@ -278,7 +278,7 @@ export default apiRoute((app) => {
             await db.insert(AuthorizationCodes).values({
                 clientId: flow.client.id,
                 code,
-                expiresAt: new Date(Date.now() + 10 * 60 * 1000).toISOString(), // 10 minutes
+                expiresAt: new Date(Date.now() + 10 * 60 * 1000), // 10 minutes
                 redirectUri: flow.clientRedirectUri ?? undefined,
                 userId: user.id,
                 scopes: flow.clientScopes ?? [],

packages/api/routes/oauth/token.test.ts

@@ -24,7 +24,7 @@ const authorizationCode = (
             code: randomString(10),
             redirectUri: application.data.redirectUris[0],
             userId: users[0].id,
-            expiresAt: new Date(Date.now() + 300 * 1000).toISOString(),
+            expiresAt: new Date(Date.now() + 300 * 1000),
         })
         .returning()
 )[0];

packages/api/routes/oauth/token.ts

@@ -101,7 +101,7 @@ export default apiRoute((app) => {
 
             if (
                 !authorizationCode ||
-                new Date(authorizationCode.expiresAt).getTime() < Date.now()
+                authorizationCode.expiresAt.getTime() < Date.now()
             ) {
                 return context.json(
                     {
@@ -131,8 +131,7 @@ export default apiRoute((app) => {
                     ...token.toApi(),
                     expires_in: token.data.expiresAt
                         ? Math.floor(
-                              (new Date(token.data.expiresAt).getTime() -
+                              (token.data.expiresAt.getTime() - Date.now()) /
-                                  Date.now()) /
                                   1000,
                           )
                         : null,

packages/api/routes/well-known/versia.ts

@@ -73,9 +73,7 @@ export default apiRoute((app) =>
                         "/inbox",
                         config.http.base_url,
                     ).toString(),
-                    created_at: new Date(
+                    created_at: firstUser?.data.createdAt.toISOString(),
-                        firstUser?.data.createdAt ?? 0,
-                    ).toISOString(),
                     extensions: {
                         "pub.versia:instance_messaging": {
                             endpoint: new URL(

packages/kit/api.ts

@@ -137,7 +137,7 @@ export const checkRouteNeedsChallenge = async (
     // Expire the challenge
     await db
         .update(Challenges)
-        .set({ expiresAt: new Date().toISOString() })
+        .set({ expiresAt: new Date() })
         .where(eq(Challenges.id, challenge_id));
 };
 

packages/kit/db/like.ts

@@ -153,7 +153,7 @@ export class Like extends BaseInterface<typeof Likes, LikeType> {
                 this.data.liker.uri ? new URL(this.data.liker.uri) : null,
             ).href,
             type: "pub.versia:likes/Like",
-            created_at: new Date(this.data.createdAt).toISOString(),
+            created_at: this.data.createdAt.toISOString(),
             liked: this.data.liked.uri
                 ? new URL(this.data.liked.uri).href
                 : new URL(`/notes/${this.data.liked.id}`, config.http.base_url)

packages/kit/db/note.ts

@@ -513,7 +513,7 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
             reblogId: this.id,
             visibility,
             sensitive: false,
-            updatedAt: new Date().toISOString(),
+            updatedAt: new Date(),
             clientId: null,
             uri: uri?.href,
         });
@@ -979,7 +979,7 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
                 authorId: author.id,
                 visibility: "public",
                 uri,
-                createdAt: new Date(created_at).toISOString(),
+                createdAt: new Date(created_at),
             }));
 
         const attachments = await Promise.all(
@@ -1150,7 +1150,7 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
             in_reply_to_id: data.replyId || null,
             in_reply_to_account_id: data.reply?.authorId || null,
             account: this.author.toApi(userFetching?.id === data.authorId),
-            created_at: new Date(data.createdAt).toISOString(),
+            created_at: data.createdAt.toISOString(),
             application: data.client
                 ? new Client(data.client).toApi()
                 : undefined,
@@ -1200,9 +1200,7 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
                       (n) => n?.toApi(userFetching),
                   )) ?? null)
                 : null,
-            edited_at: data.updatedAt
+            edited_at: data.updatedAt.toISOString(),
-                ? new Date(data.updatedAt).toISOString()
-                : null,
             reactions,
             text: data.contentSource,
         };
@@ -1246,7 +1244,7 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
         const status = this.data;
         return new VersiaEntities.Note({
             type: "Note",
-            created_at: new Date(status.createdAt).toISOString(),
+            created_at: status.createdAt.toISOString(),
             id: status.id,
             author: this.author.uri.href,
             uri: this.getUri().href,

packages/kit/db/notification.ts

@@ -186,7 +186,7 @@ export class Notification extends BaseInterface<
 
         return {
             account: account.toApi(),
-            created_at: new Date(this.data.createdAt).toISOString(),
+            created_at: this.data.createdAt.toISOString(),
             id: this.data.id,
             type: this.data.type,
             status: this.data.status

packages/kit/db/reaction.ts

@@ -217,7 +217,7 @@ export class Reaction extends BaseInterface<typeof Reactions, ReactionType> {
                 this.data.authorId,
                 this.data.author.uri ? new URL(this.data.author.uri) : null,
             ).href,
-            created_at: new Date(this.data.createdAt).toISOString(),
+            created_at: this.data.createdAt.toISOString(),
             id: this.id,
             object: this.data.note.uri
                 ? new URL(this.data.note.uri).href

packages/kit/db/token.ts

@@ -160,9 +160,7 @@ export class Token extends BaseInterface<typeof Tokens, TokenType> {
             access_token: this.data.accessToken,
             token_type: "Bearer",
             scope: this.data.scopes.join(" "),
-            created_at: Math.floor(
+            created_at: Math.floor(this.data.createdAt.getTime() / 1000),
-                new Date(this.data.createdAt).getTime() / 1000,
-            ),
         };
     }
 }

packages/kit/db/user.ts

@@ -475,7 +475,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
                         isNull(Users.instanceId),
                         gte(
                             Notes.createdAt,
-                            new Date(Date.now() - milliseconds).toISOString(),
+                            new Date(Date.now() - milliseconds),
                         ),
                     ),
                 )
@@ -803,7 +803,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
         }
 
         await user.update({
-            createdAt: new Date(created_at).toISOString(),
+            createdAt: new Date(created_at),
             endpoints: {
                 inbox,
                 outbox: collections.outbox,
@@ -940,7 +940,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
             publicKey: keys.public_key,
             fields: [],
             privateKey: keys.private_key,
-            updatedAt: new Date().toISOString(),
+            updatedAt: new Date(),
             source: {
                 language: "en",
                 note: "",
@@ -1116,7 +1116,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
             avatar: this.getAvatarUrl().proxied,
             header: this.getHeaderUrl()?.proxied ?? "",
             locked: user.isLocked,
-            created_at: new Date(user.createdAt).toISOString(),
+            created_at: user.createdAt.toISOString(),
             followers_count:
                 user.isHidingCollections && !isOwnAccount
                     ? 0
@@ -1177,7 +1177,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
                     remote: false,
                 },
             },
-            created_at: new Date(user.createdAt).toISOString(),
+            created_at: user.createdAt.toISOString(),
             collections: {
                 featured: new URL(
                     `/users/${user.id}/featured`,

packages/kit/tables/migrations/0053_lively_hellfire_club.sql

@@ -0,0 +1,45 @@
+ALTER TABLE "AuthorizationCodes" ALTER COLUMN "expires_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "AuthorizationCodes" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "AuthorizationCodes" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Challenges" ALTER COLUMN "expires_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Challenges" ALTER COLUMN "expires_at" SET DEFAULT NOW() + INTERVAL '5 minutes';--> statement-breakpoint
+ALTER TABLE "Challenges" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Challenges" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Filters" ALTER COLUMN "expires_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Filters" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Filters" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Flags" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Flags" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Likes" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Likes" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Markers" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Markers" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "ModNotes" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "ModNotes" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "ModTags" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "ModTags" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Notes" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Notes" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Notes" ALTER COLUMN "updated_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Notes" ALTER COLUMN "updated_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Notifications" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Notifications" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "PushSubscriptions" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "PushSubscriptions" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "PushSubscriptions" ALTER COLUMN "updated_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "PushSubscriptions" ALTER COLUMN "updated_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Reaction" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Reaction" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Reaction" ALTER COLUMN "updated_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Reaction" ALTER COLUMN "updated_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Relationships" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Relationships" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Relationships" ALTER COLUMN "updated_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Relationships" ALTER COLUMN "updated_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Tokens" ALTER COLUMN "expires_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Tokens" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Tokens" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Users" ALTER COLUMN "created_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Users" ALTER COLUMN "created_at" SET DEFAULT now();--> statement-breakpoint
+ALTER TABLE "Users" ALTER COLUMN "updated_at" SET DATA TYPE timestamp (3) with time zone;--> statement-breakpoint
+ALTER TABLE "Users" ALTER COLUMN "updated_at" SET DEFAULT now();

packages/kit/tables/migrations/meta/_journal.json

@@ -372,6 +372,13 @@
             "when": 1755732000165,
             "tag": "0052_complete_hellfire_club",
             "breakpoints": true
+        },
+        {
+            "idx": 53,
+            "version": "7",
+            "when": 1765422160004,
+            "tag": "0053_lively_hellfire_club",
+            "breakpoints": true
         }
     ]
 }

packages/kit/tables/schema.ts

@@ -28,13 +28,12 @@ import {
 import type { z } from "zod";
 
 const createdAt = () =>
-    // TODO: Change mode to Date
+    timestamp("created_at", { precision: 3, mode: "date", withTimezone: true })
-    timestamp("created_at", { precision: 3, mode: "string" })
         .defaultNow()
         .notNull();
 
 const updatedAt = () =>
-    timestamp("updated_at", { precision: 3, mode: "string" })
+    timestamp("updated_at", { precision: 3, mode: "date", withTimezone: true })
         .defaultNow()
         .notNull();
 
@@ -47,7 +46,8 @@ export const Challenges = pgTable("Challenges", {
     challenge: jsonb("challenge").notNull().$type<Challenge>(),
     expiresAt: timestamp("expires_at", {
         precision: 3,
-        mode: "string",
+        mode: "date",
+        withTimezone: true,
     })
         .default(
             // 5 minutes
@@ -191,7 +191,11 @@ export const Filters = pgTable("Filters", {
         >(),
     title: text("title").notNull(),
     filterAction: text("filter_action").notNull().$type<"warn" | "hide">(),
-    expireAt: timestamp("expires_at", { precision: 3, mode: "string" }),
+    expireAt: timestamp("expires_at", {
+        precision: 3,
+        mode: "date",
+        withTimezone: true,
+    }),
     createdAt: createdAt(),
 });
 
@@ -330,7 +334,11 @@ export const Tokens = pgTable("Tokens", {
     id: id(),
     scopes: text("scopes").array().notNull().default(sql`ARRAY[]::text[]`),
     accessToken: text("access_token").notNull(),
-    expiresAt: timestamp("expires_at", { precision: 3, mode: "string" }),
+    expiresAt: timestamp("expires_at", {
+        precision: 3,
+        mode: "date",
+        withTimezone: true,
+    }),
     createdAt: createdAt(),
     userId: uuid("userId")
         .references(() => Users.id, {
@@ -363,7 +371,8 @@ export const AuthorizationCodes = pgTable("AuthorizationCodes", {
     redirectUri: text("redirect_uri"),
     expiresAt: timestamp("expires_at", {
         precision: 3,
-        mode: "string",
+        mode: "date",
+        withTimezone: true,
     }).notNull(),
     createdAt: createdAt(),
     codeChallenge: text("code_challenge"),

packages/tests/index.ts

@@ -180,7 +180,7 @@ export const getTestStatuses = async (
             content: `${i} ${randomString(32, "hex")}`,
             authorId: user.id,
             sensitive: false,
-            updatedAt: new Date().toISOString(),
+            updatedAt: new Date(),
             visibility: "public",
             clientId: null,
             ...partial,

utils/challenges.ts

@@ -10,8 +10,8 @@ export const generateChallenge = async (
 ): Promise<{
     id: string;
     challenge: Challenge;
-    expiresAt: string;
+    expiresAt: Date;
-    createdAt: string;
+    createdAt: Date;
 }> => {
     if (!config.validation.challenges) {
         throw new Error("Challenges are not enabled");
@@ -39,7 +39,7 @@ export const generateChallenge = async (
             .values({
                 id: uuid,
                 challenge,
-                expiresAt: expirationDate.toISOString(),
+                expiresAt: expirationDate,
             })
             .returning()
     )[0];

utils/rss.ts

@@ -58,12 +58,12 @@ export const getFeed = async (user: User, page = 0): Promise<Feed> => {
                 config.http.base_url,
             ).href,
             content: note.data.content,
-            date: new Date(note.data.createdAt),
+            date: note.data.createdAt,
             id: new URL(
                 `/@${user.data.username}/${note.id}`,
                 config.http.base_url,
             ).href,
-            published: new Date(note.data.createdAt),
+            published: note.data.createdAt,
             title: "",
             image: image
                 ? {