Sync latest version 2 (alpha)

lexiconhq · Sep 14, 2023 · dfb4ee7 · dfb4ee7
1 parent a98d457
commit dfb4ee7
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 33 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [master, alpha-v2]
   pull_request:
-    branches: [master]
+    branches: [master, alpha-v2]
 
 jobs:
   build:

diff --git a/api/src/helpers/getFrequentPoster.ts b/api/src/helpers/getFrequentPoster.ts
diff --git a/api/src/typeSchemas/Topic.ts b/api/src/typeSchemas/Topic.ts
@@ -1,7 +1,6 @@
 import { objectType } from 'nexus';
 
 import { getTopicAuthorUserId } from '../helpers/getTopicAuthor';
-import { getFrequentPosterUserId } from '../helpers/getFrequentPoster';
 
 export let Topic = objectType({
   name: 'Topic',
@@ -58,9 +57,6 @@ export let Topic = objectType({
     t.nullable.int('authorUserId', {
       resolve: ({ posters }) => getTopicAuthorUserId(posters) ?? null,
     });
-    t.nullable.int('frequentPosterUserId', {
-      resolve: ({ posters }) => getFrequentPosterUserId(posters) || null,
-    });
     // Note: Comment out for maybe next phase
     // t.nullable.int('recentPosterUserId', {
     //   resolve: ({ posters }) => {

diff --git a/api/src/types/dataTypes.ts b/api/src/types/dataTypes.ts
@@ -75,7 +75,6 @@ export type Topic = {
   pinnedGlobally: boolean | null;
   posters: Array<TopicPoster>;
   authorUserId?: number | null;
-  frequentPosterUserId?: number | null;
 };
 
 type TagFilter = {

diff --git a/frontend/src/graphql/server/getTopicDetail.ts b/frontend/src/graphql/server/getTopicDetail.ts
@@ -36,7 +36,6 @@ export const TOPIC_FRAGMENT = gql`
       }
     }
     authorUserId
-    frequentPosterUserId
     pinned
   }
 `;

diff --git a/frontend/src/graphql/server/topics.ts b/frontend/src/graphql/server/topics.ts
@@ -54,7 +54,6 @@ export const TOPICS = gql`
             }
           }
           authorUserId
-          frequentPosterUserId
           pinned
         }
       }