Reduce GraphQL fragments redundancies

fragments/comments.js

@@ -1,19 +1,9 @@
 import { gql } from '@apollo/client'
+import { STREAK_FIELDS } from './common'
 
-// we can't import from users because of circular dependency
-const STREAK_FIELDS = gql`
-  fragment StreakFields on User {
-    optional {
-      streak
-      hasSendWallet
-      hasRecvWallet
-    }
-  }
-`
-
-export const COMMENT_FIELDS = gql`
+export const COMMENT_FIELDS_NO_CHILD_COMMENTS = gql`
   ${STREAK_FIELDS}
-  fragment CommentFields on Item {
+  fragment CommentFieldsNoChildComments on Item {
     id
     position
     parentId
@@ -26,16 +16,6 @@ export const COMMENT_FIELDS = gql`
       meMute
       ...StreakFields
     }
-    payIn {
-      id
-      payInState
-      payInType
-      payInStateChangedAt
-      payerPrivates {
-        payInFailureReason
-        retryCount
-      }
-    }
     sats
     credits
     meAnonSats @client
@@ -54,8 +34,6 @@ export const COMMENT_FIELDS = gql`
     commentCredits
     mine
     otsHash
-    ncomments
-    nDirectComments
     live @client
     imgproxyUrls
     rel
@@ -64,44 +42,22 @@ export const COMMENT_FIELDS = gql`
   }
 `
 
-export const COMMENT_FIELDS_NO_CHILD_COMMENTS = gql`
-  ${STREAK_FIELDS}
-  fragment CommentFieldsNoChildComments on Item {
-    id
-    position
-    parentId
-    createdAt
-    deletedAt
-    text
-    user {
+export const COMMENT_FIELDS = gql`
+  ${COMMENT_FIELDS_NO_CHILD_COMMENTS}
+  fragment CommentFields on Item {
+    ...CommentFieldsNoChildComments
+    payIn {
       id
-      name
-      meMute
-      ...StreakFields
+      payInState
+      payInType
+      payInStateChangedAt
+      payerPrivates {
+        payInFailureReason
+        retryCount
+      }
     }
-    sats
-    credits
-    meAnonSats @client
-    upvotes
-    freedFreebie
-    boost
-    meSats
-    meCredits
-    meDontLikeSats
-    meBookmark
-    meSubscription
-    outlawed
-    freebie
-    path
-    commentSats
-    commentCredits
-    mine
-    otsHash
-    live @client
-    imgproxyUrls
-    rel
-    apiKey
-    cost
+    ncomments
+    nDirectComments
   }
 `
 

fragments/common.js

@@ -0,0 +1,11 @@
+import { gql } from '@apollo/client'
+
+export const STREAK_FIELDS = gql`
+  fragment StreakFields on User {
+    optional {
+      streak
+      hasSendWallet
+      hasRecvWallet
+    }
+  }
+`

fragments/invites.js

@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client'
-import { STREAK_FIELDS } from './users'
+import { STREAK_FIELDS } from './common'
 
 export const INVITE_FIELDS = gql`
   ${STREAK_FIELDS}

fragments/items.js

@@ -1,16 +1,6 @@
 import { gql } from '@apollo/client'
 import { COMMENTS } from './comments'
-
-// we can't import from users because of circular dependency
-const STREAK_FIELDS = gql`
-  fragment StreakFields on User {
-    optional {
-      streak
-      hasSendWallet
-      hasRecvWallet
-    }
-  }
-`
+import { STREAK_FIELDS } from './common'
 
 export const ITEM_FIELDS = gql`
   ${STREAK_FIELDS}
@@ -128,6 +118,7 @@ export const ITEM_FULL_FIELDS = gql`
     }
   }`
 
+/** displays timestamp verification infos */
 export const ITEM_OTS_FIELDS = gql`
   fragment ItemOtsFields on Item {
     id

fragments/subs.js

@@ -1,17 +1,7 @@
 import { gql } from '@apollo/client'
 import { ITEM_FIELDS, ITEM_FULL_FIELDS } from './items'
 import { COMMENTS_ITEM_EXT_FIELDS } from './comments'
-
-// we can't import from users because of circular dependency
-const STREAK_FIELDS = gql`
-  fragment StreakFields on User {
-    optional {
-      streak
-      hasSendWallet
-      hasRecvWallet
-    }
-  }
-`
+import { STREAK_FIELDS } from './common'
 
 export const SUB_FIELDS = gql`
   fragment SubFields on Sub {

fragments/users.js

@@ -2,16 +2,7 @@ import { gql } from '@apollo/client'
 import { COMMENTS, COMMENTS_ITEM_EXT_FIELDS } from './comments'
 import { ITEM_FIELDS, ITEM_FULL_FIELDS } from './items'
 import { SUB_FULL_FIELDS } from './subs'
-
-export const STREAK_FIELDS = gql`
-  fragment StreakFields on User {
-    optional {
-      streak
-      hasSendWallet
-      hasRecvWallet
-    }
-  }
-`
+import { STREAK_FIELDS } from './common'
 
 export const ME = gql`
 ${STREAK_FIELDS}

worker/ots.js

@@ -3,8 +3,9 @@ import stringifyCanon from 'canonical-json'
 import { createHash } from 'crypto'
 import Ots from 'opentimestamps'
 
-const ITEM_OTS_FIELDS = gql`
-  fragment ItemOTSFields on Item {
+/** fetches the necessary fields to compute the ots hash */
+const ITEM_OTS_HASH_FIELDS = gql`
+  fragment ItemOtsHashFields on Item {
     parentId
     parentOtsHash
     title
@@ -15,10 +16,10 @@ const ITEM_OTS_FIELDS = gql`
 export async function timestampItem ({ data: { id }, apollo, models }) {
   const { data: { item: { parentId, parentOtsHash, title, text, url } } } = await apollo.query({
     query: gql`
-        ${ITEM_OTS_FIELDS}
+        ${ITEM_OTS_HASH_FIELDS}
         query Item {
           item(id: ${id}) {
-            ...ItemOTSFields
+            ...ItemOtsHashFields
           }
         }`
   })