aclarar y usar tweets

Author: catdevnull

sitio/src/routes/+page.server.ts

@@ -42,8 +42,7 @@ export const load: PageServerLoad = async ({ url, setHeaders }) => {
     firstLikedTweet,
     monthData,
     hasNextMonth,
-    heatLikes,
-    heatRetweets,
+    heatTweets,
   ] = await Promise.all([
     db.query.likedTweets.findMany({
       columns: {
@@ -116,22 +115,31 @@ export const load: PageServerLoad = async ({ url, setHeaders }) => {
         startingFrom.add(1, "month").startOf("month").toDate(),
       ),
     }),
-    db.query.likedTweets.findMany({
-      columns: { firstSeenAt: true },
+    db.query.tweets.findMany({
+      columns: {},
+      extras: {
+        timestamp:
+          sql<number>`(${schema.tweets.twitterScraperJson}->>'timestamp')::numeric`.as(
+            "timestamp",
+          ),
+        isRetweet:
+          sql<boolean>`(${schema.tweets.twitterScraperJson}->>'isRetweet')::boolean`.as(
+            "isRetweet",
+          ),
+      },
       where: and(
-        gte(schema.likedTweets.firstSeenAt, heatmapStart.toDate()),
-        lte(schema.likedTweets.firstSeenAt, heatmapEnd.toDate()),
-        likesCutoffSql,
+        gte(
+          sql`(${schema.tweets.twitterScraperJson}->>'timestamp')::numeric`,
+          +heatmapStart / 1000,
+        ),
+        lte(
+          sql`(${schema.tweets.twitterScraperJson}->>'timestamp')::numeric`,
+          +heatmapEnd / 1000,
+        ),
       ),
-      orderBy: desc(schema.likedTweets.firstSeenAt),
-    }),
-    db.query.retweets.findMany({
-      columns: { retweetAt: true },
-      where: and(
-        gte(schema.retweets.retweetAt, heatmapStart.toDate()),
-        lte(schema.retweets.retweetAt, heatmapEnd.toDate()),
+      orderBy: desc(
+        sql`(${schema.tweets.twitterScraperJson}->>'timestamp')::numeric`,
       ),
-      orderBy: desc(schema.retweets.retweetAt),
     }),
   ]);
   const t1 = performance.now();
@@ -155,8 +163,9 @@ export const load: PageServerLoad = async ({ url, setHeaders }) => {
     }
     hourHeatmap[dow][hour]++;
   };
-  heatLikes.forEach((t: { firstSeenAt: Date }) => addToHeat(t.firstSeenAt));
-  heatRetweets.forEach((t: { retweetAt: Date }) => addToHeat(t.retweetAt));
+  heatTweets.forEach((t: { timestamp: number }) => {
+    addToHeat(new Date(t.timestamp * 1000));
+  });
   console.timeEnd("heatmap");
 
   if (

sitio/src/routes/+page.svelte

@@ -226,7 +226,7 @@
   {/if}
 
   <section
-    class="mx-auto flex w-full max-w-2xl flex-col gap-4 bg-neutral-100 p-4 dark:bg-neutral-800 md:rounded-lg"
+    class="mx-auto flex w-full max-w-2xl flex-col gap-4 bg-neutral-100 p-4 md:rounded-lg dark:bg-neutral-800"
   >
     <h2 class="my-2 text-center text-xl font-bold md:text-4xl">
       Su actividad en {dayjs(data.start).isAfter(dayjs().startOf("month"))
@@ -248,13 +248,13 @@
   </section>
 
   <section
-    class="mx-auto w-full max-w-2xl bg-neutral-100 p-4 dark:bg-neutral-800 md:rounded-lg"
+    class="mx-auto w-full max-w-2xl bg-neutral-100 p-4 md:rounded-lg dark:bg-neutral-800"
   >
     <h2 class="mb-2 text-center text-xl font-bold md:text-3xl">
       ¿Cuándo suele estar activo en Twitter?
     </h2>
-    <p class="mb-4 text-center text-sm text-muted-foreground">
-      Basado en retweets y likes de los últimos 90 días.
+    <p class="text-muted-foreground mb-4 text-center text-sm">
+      Basado en tweets y retweets de los últimos 90 días.
     </p>
     <HeatmapHours matrix={data.hourHeatmap} />
   </section>
@@ -321,7 +321,7 @@
       Como lo viste en la prensa
     </h2>
     <div
-      class="mx-auto flex flex-col items-center justify-center gap-4 bg-neutral-100 p-2 dark:bg-neutral-800 md:mb-8 md:flex-row md:rounded-lg md:text-lg"
+      class="mx-auto flex flex-col items-center justify-center gap-4 bg-neutral-100 p-2 md:mb-8 md:flex-row md:rounded-lg md:text-lg dark:bg-neutral-800"
     >
       <enhanced:img
         class="w-[300px] rounded-lg"