refactor

artlu99 · Jul 1, 2024 · a43ec7d · a43ec7d
1 parent c576460
commit a43ec7d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/functions/common.ts b/functions/common.ts
@@ -8,6 +8,7 @@ export interface Env {
   AIRSTACK_API_KEY: string;
   UPSTASH_REDIS_REST_URL: string;
   UPSTASH_REDIS_REST_TOKEN: string;
+  REACT_APP_DEFAULT_FID: number;
   REACT_APP_PUBLIC_POSTHOG_HOST: string;
   REACT_APP_PUBLIC_POSTHOG_KEY: string;
   D1: D1Database;

diff --git a/functions/getCastsByFollowing/index.ts b/functions/getCastsByFollowing/index.ts
@@ -1,6 +1,6 @@
 import { Env } from '../common';
 import { FeedObject } from '../shared/feed-types';
-import sendPosthogEvent from '../shared/posthog';
+import { sendPosthogFid } from '../shared/posthog';
 
 export const onRequestPost: PagesFunction<Env> = async (context) => {
   const { request } = context;
@@ -20,7 +20,7 @@ export const onRequestPost: PagesFunction<Env> = async (context) => {
   });
   if (!res.ok) throw new Error('Failed to fetch data');
 
-  await sendPosthogEvent(context.env, 'getCastsByFollowing', 'not_tracking_by_fid');
+  await sendPosthogFid(context.env, 'getCastsByFollowing', fid);
 
   const followingCronFeedResponse = (await res.json()) as FeedObject;
   return new Response(JSON.stringify(followingCronFeedResponse));

diff --git a/functions/getCronFeed/index.ts b/functions/getCronFeed/index.ts
@@ -1,6 +1,6 @@
 import { Env } from '../common';
 import { FeedObject } from '../shared/feed-types';
-import sendPosthogEvent from '../shared/posthog';
+import { sendPosthogChannelId } from '../shared/posthog';
 
 export const onRequestPost: PagesFunction<Env> = async (context) => {
   const { request } = context;
@@ -20,7 +20,7 @@ export const onRequestPost: PagesFunction<Env> = async (context) => {
   });
   if (!res.ok) throw new Error('Failed to fetch data');
 
-  await sendPosthogEvent(context.env, 'getCronFeed', channelId);
+  await sendPosthogChannelId(context.env, 'getCronFeed', channelId);
 
   const cronFeedResponse = (await res.json()) as FeedObject;
   return new Response(JSON.stringify(cronFeedResponse));

diff --git a/functions/getFollowingByFid/index.ts b/functions/getFollowingByFid/index.ts
@@ -1,6 +1,6 @@
 import { Env } from '../common';
 import { FollowingByFidResponseSchema } from '../shared/farquest-types';
-import sendPosthogEvent from '../shared/posthog';
+import { sendPosthogFid } from '../shared/posthog';
 
 export const onRequestPost: PagesFunction<Env> = async (context) => {
   const { request } = context;
@@ -20,7 +20,7 @@ export const onRequestPost: PagesFunction<Env> = async (context) => {
   });
   if (!res.ok) throw new Error('Failed to fetch data');
 
-  await sendPosthogEvent(context.env, 'getFollowingByFid', 'not_tracking_by_fid');
+  await sendPosthogFid(context.env, 'getFollowingByFid', fid);
 
   const followingResponse = (await res.json()) as FollowingByFidResponseSchema;
   return new Response(JSON.stringify(followingResponse));

diff --git a/functions/getForYouFeed/index.ts b/functions/getForYouFeed/index.ts
@@ -1,6 +1,6 @@
 import { Env } from '../common';
 import { FeedObject } from '../shared/feed-types';
-import sendPosthogEvent from '../shared/posthog';
+import { sendPosthogFid } from '../shared/posthog';
 
 export const onRequestPost: PagesFunction<Env> = async (context) => {
   const { request } = context;
@@ -26,7 +26,7 @@ export const onRequestPost: PagesFunction<Env> = async (context) => {
     throw new Error('Failed to fetch data');
   }
 
-  await sendPosthogEvent(context.env, 'getForYouFeed', 'not_tracking_by_fid');
+  await sendPosthogFid(context.env, 'getForYouFeed', fid);
 
   const forYouFeedResponse = (await res.json()) as FeedObject;
   return new Response(JSON.stringify(forYouFeedResponse));

diff --git a/functions/getNeynarReactionsByFid/index.ts b/functions/getNeynarReactionsByFid/index.ts
@@ -1,6 +1,6 @@
 import { ReactionType, ReactionsCastResponse } from '@neynar/nodejs-sdk/build/neynar-api/v2';
 import { Env } from '../common';
-import sendPosthogEvent from '../shared/posthog';
+import { sendPosthogFid } from '../shared/posthog';
 
 export const onRequestPost: PagesFunction<Env> = async (context) => {
   const { request } = context;
@@ -27,7 +27,7 @@ export const onRequestPost: PagesFunction<Env> = async (context) => {
 
   if (!res.ok) throw new Error('Failed to fetch data');
 
-  await sendPosthogEvent(context.env, 'getNeynarReactionsByFid', 'not_tracking_by_fid');
+  await sendPosthogFid(context.env, 'getNeynarReactionsByFid', fid);
 
   const reactionsResponse = (await res.json()) as ReactionsCastResponse;
   return new Response(JSON.stringify(reactionsResponse));

diff --git a/functions/shared/posthog.ts b/functions/shared/posthog.ts
@@ -10,7 +10,6 @@ const sendPosthogEvent = async (env: Env, event: string, distinct_id: string) =>
     api_key,
     distinct_id,
     event,
-    properties: { none: undefined },
     timestamp,
   };
 
@@ -27,4 +26,12 @@ const sendPosthogEvent = async (env: Env, event: string, distinct_id: string) =>
   }
 };
 
-export default sendPosthogEvent;
+export const sendPosthogFid = async (env: Env, event: string, fid: number) => {
+  const distinct_id = fid === env.REACT_APP_DEFAULT_FID ? 'not signed in' : 'SIWN';
+  await sendPosthogEvent(env, event, distinct_id);
+};
+
+export const sendPosthogChannelId = async (env: Env, event: string, channelId: string) => {
+  const distinct_id = channelId;
+  await sendPosthogEvent(env, event, distinct_id);
+};