Merge pull request #1025 from lens-protocol/T-23318/js-update-latest-…

…schema-and-remove-nestedpost Update schema and remove nestedPost
lens-protocol · Dec 18, 2024 · 38ef35c · 38ef35c
2 parents 708e86f + 9626a1b
commit 38ef35c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 43 deletions.
diff --git a/packages/client/src/actions/timeline.ts b/packages/client/src/actions/timeline.ts
@@ -1,6 +1,6 @@
 import type {
+  AnyPost,
   Paginated,
-  Post,
   TimelineHighlightsRequest,
   TimelineItem,
   TimelineRequest,
@@ -47,6 +47,6 @@ export function fetchTimeline(
 export function fetchTimelineHighlights(
   client: AnyClient,
   request: TimelineHighlightsRequest,
-): ResultAsync<Paginated<Post> | null, UnexpectedError> {
+): ResultAsync<Paginated<AnyPost>, UnexpectedError> {
   return client.query(TimelineHighlightsQuery, { request });
 }
diff --git a/packages/graphql/schema.graphql b/packages/graphql/schema.graphql
@@ -2222,18 +2222,31 @@ type GroupGatedFeedRule {
   group: Group!
 }
 
+type GroupMember {
+  account: Account!
+  lastActiveAt: DateTime!
+  joinedAt: DateTime!
+}
+
+input GroupMembersFilterRequest {
+  """The optional filter to narrow members by search query."""
+  searchBy: UsernameSearchInput
+}
+
 enum GroupMembersOrderBy {
   LAST_JOINED
   FIRST_JOINED
+  LAST_ACTIVE
   ACCOUNT_SCORE
 }
 
 input GroupMembersRequest {
   """The group"""
   group: EvmAddress!
+  filter: GroupMembersFilterRequest
 
   """The order by."""
-  orderBy: GroupMembersOrderBy! = LAST_JOINED
+  orderBy: GroupMembersOrderBy! = ACCOUNT_SCORE
 
   """The page size."""
   pageSize: PageSize! = FIFTY
@@ -3672,8 +3685,6 @@ type NamespacesResult {
   pageInfo: PaginatedResultInfo!
 }
 
-union NestedPost = Post | PostReference
-
 type NetworkAddress {
   address: EvmAddress!
   chainId: Int!
@@ -3868,6 +3879,11 @@ type PaginatedGraphsResult {
   pageInfo: PaginatedResultInfo!
 }
 
+type PaginatedGroupMembersResult {
+  items: [GroupMember!]!
+  pageInfo: PaginatedResultInfo!
+}
+
 type PaginatedGroupsResult {
   """The groups"""
   items: [Group!]!
@@ -3975,9 +3991,9 @@ type Post {
   timestamp: DateTime!
   app: App
   metadata: PostMetadata!
-  root: NestedPost
-  quoteOf: NestedPost
-  commentOn: NestedPost
+  root: Post
+  quoteOf: Post
+  commentOn: Post
   actions: [PostAction!]!
   operations: LoggedInPostOperations
   stats: PostStats!
@@ -4113,10 +4129,6 @@ input PostReactionsRequest {
   cursor: Cursor
 }
 
-type PostReference {
-  id: PostId!
-}
-
 enum PostReferenceType {
   COMMENT_ON
   REPOST_OF
@@ -4382,7 +4394,7 @@ type Query {
   groups(request: GroupsRequest!): PaginatedGroupsResult!
 
   """Get the members of the group"""
-  groupMembers(request: GroupMembersRequest!): PaginatedAccountsResult!
+  groupMembers(request: GroupMembersRequest!): PaginatedGroupMembersResult!
 
   """Get the number of members in a Group"""
   groupStats(request: GroupStatsRequest!): GroupStatsResponse!

diff --git a/packages/graphql/src/fragments/post.ts b/packages/graphql/src/fragments/post.ts
@@ -177,13 +177,6 @@ export const LoggedInPostOperationsFragment = graphql(
 );
 export type LoggedInPostOperations = FragmentOf<typeof LoggedInPostOperationsFragment>;
 
-export const PostReferenceFragment = graphql(
-  `fragment PostReference on PostReference {
-    id
-  }`,
-);
-export type PostReference = FragmentOf<typeof PostReferenceFragment>;
-
 export const ReferencedPostFragment = graphql(
   `fragment ReferencedPost on Post {
     __typename
@@ -219,19 +212,6 @@ export const ReferencedPostFragment = graphql(
   ],
 );
 
-export const NestedPostFragment = graphql(
-  `fragment NestedPost on NestedPost {
-    ...on Post {
-      ...ReferencedPost
-    }
-    ...on PostReference {
-      ...PostReference
-    }
-  }`,
-  [PostReferenceFragment, ReferencedPostFragment],
-);
-export type NestedPost = FragmentOf<typeof NestedPostFragment>;
-
 export const PostFragment = graphql(
   `fragment Post on Post {
     __typename
@@ -250,13 +230,13 @@ export const PostFragment = graphql(
       ...PostMetadata
     }
     root {
-      ...NestedPost
+      ...ReferencedPost
     }
     quoteOf {
-      ...NestedPost
+      ...ReferencedPost
     }
     commentOn {
-      ...NestedPost
+      ...ReferencedPost
     }
     actions {
       ...PostAction
@@ -272,7 +252,7 @@ export const PostFragment = graphql(
     FeedFragment,
     PostMetadataFragment,
     PostActionFragment,
-    NestedPostFragment,
+    ReferencedPostFragment,
     LoggedInPostOperationsFragment,
   ],
 );