Merge pull request #3242 from thematters/fix/article-private-fetch

[hotfix - master] fix(article): private fetch article detail by node id
thematters · Mar 6, 2023 · 1b01a71 · 1b01a71
2 parents 961c2a8 + 21bfcc2
commit 1b01a71
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/views/ArticleDetail/gql.ts b/src/views/ArticleDetail/gql.ts
@@ -134,25 +134,24 @@ export const ARTICLE_DETAIL_PUBLIC_BY_NODE_ID = gql`
 `
 
 export const ARTICLE_DETAIL_PRIVATE = gql`
-  query ArticleDetailPrivate(
-    $mediaHash: String!
-    $includeCanSuperLike: Boolean!
-  ) {
-    article(input: { mediaHash: $mediaHash }) {
-      id
-      content
-      author {
+  query ArticleDetailPrivate($id: ID!, $includeCanSuperLike: Boolean!) {
+    article: node(input: { id: $id }) {
+      ... on Article {
         id
-        ...UserDigestRichUserPrivate
-      }
-      access {
-        circle {
+        content
+        author {
           id
-          ...CircleWallCirclePrivate
+          ...UserDigestRichUserPrivate
+        }
+        access {
+          circle {
+            id
+            ...CircleWallCirclePrivate
+          }
         }
+        ...ToolbarArticlePrivate
+        ...SupportWidgetArticlePrivate
       }
-      ...ToolbarArticlePrivate
-      ...SupportWidgetArticlePrivate
     }
   }
   ${UserDigest.Rich.fragments.user.private}

diff --git a/src/views/ArticleDetail/index.tsx b/src/views/ArticleDetail/index.tsx
@@ -412,15 +412,15 @@ const ArticleDetail = ({
    */
   const [privateFetched, setPrivateFetched] = useState(false)
   const loadPrivate = async () => {
-    if (!viewer.isAuthed || !article || !article?.mediaHash) {
+    if (!viewer.isAuthed || !article) {
       return
     }
 
     await client.query({
       query: ARTICLE_DETAIL_PRIVATE,
       fetchPolicy: 'network-only',
       variables: {
-        mediaHash: article?.mediaHash,
+        id: article?.id,
         includeCanSuperLike: viewer.isCivicLiker,
       },
     })