data/db files migrated to sqlite syntax

likeandscribe · Aug 23, 2024 · 7d664d6 · 7d664d6
1 parent db66fb4
commit 7d664d6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/packages/frontpage/lib/data/db/comment.ts b/packages/frontpage/lib/data/db/comment.ts
@@ -64,16 +64,13 @@ export const getCommentsForPost = cache(async (postId: number) => {
     .as("vote");
 
   const commentRank = sql`
-    coalesce(${votes.voteCount}, 1) / (
-    -- Age
+    CAST(COALESCE(${votes.voteCount}, 1) AS REAL) / (
       (
-        EXTRACT(
-          EPOCH
-          FROM
-            (CURRENT_TIMESTAMP - ${schema.Comment.createdAt})
-        ) / 3600
-      ) + 2
-    ) ^ 1.8
+        (JULIANDAY('now') - JULIANDAY(${schema.Comment.createdAt})) * 24 + 2
+      ) * (
+        (JULIANDAY('now') - JULIANDAY(${schema.Comment.createdAt})) * 24 + 2
+      ) * SQRT((JULIANDAY('now') - JULIANDAY(${schema.Comment.createdAt})) * 24 + 2)
+    )
   `
     .mapWith(Number)
     .as("rank");

diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
@@ -1,6 +1,6 @@
 import "server-only";
-import { cache } from "react";
 
+import { cache } from "react";
 import { db } from "@/lib/db";
 import { eq, sql, count, desc, and } from "drizzle-orm";
 import * as schema from "@/lib/schema";
@@ -43,16 +43,13 @@ export const getFrontpagePosts = cache(async () => {
   // This ranking is very naive. I believe it'll need to consider every row in the table even if you limit the results.
   // We should closely monitor this and consider alternatives if it gets slow over time
   const rank = sql`
-    coalesce(${votesSubQuery.voteCount}, 1) / (
-    -- Age
+    CAST(COALESCE(${votesSubQuery.voteCount}, 1) AS REAL) / (
       (
-        EXTRACT(
-          EPOCH
-          FROM
-            (CURRENT_TIMESTAMP - ${schema.Post.createdAt})
-        ) / 3600
-      ) + 2
-    ) ^ 1.8
+        (JULIANDAY('now') - JULIANDAY(${schema.Post.createdAt})) * 24 + 2
+      ) * (
+        (JULIANDAY('now') - JULIANDAY(${schema.Post.createdAt})) * 24 + 2
+      ) * SQRT((JULIANDAY('now') - JULIANDAY(${schema.Post.createdAt})) * 24 + 2)
+    )
   `.as("rank");
 
   const userHasVoted = await buildUserHasVotedQuery();
@@ -183,7 +180,7 @@ type CreatePostInput = {
   authorDid: DID;
   rkey: string;
   cid: string;
-  offset: bigint;
+  offset: number;
 };
 
 export async function unauthed_createPost({
@@ -200,7 +197,16 @@ export async function unauthed_createPost({
       authorDid,
       title: post.title,
       url: post.url,
-      createdAt: new Date(post.createdAt),
+      createdAt: new Date(post.createdAt).toISOString(),
+    });
+
+    await tx.insert(schema.Post).values({
+      rkey,
+      cid,
+      authorDid,
+      title: post.title,
+      url: post.url,
+      createdAt: new Date(post.createdAt).toISOString(),
     });
 
     await tx.insert(schema.ConsumedOffset).values({ offset });
@@ -248,7 +254,7 @@ export async function unauthed_createPost({
 
 type DeletePostInput = {
   rkey: string;
-  offset: bigint;
+  offset: number;
 };
 
 export async function unauthed_deletePost({ rkey, offset }: DeletePostInput) {