wip: standarize userId vs userAddress

TERITORI · Aug 10, 2023 · 8ac1c27 · 8ac1c27
1 parent ae88cfc
commit 8ac1c27
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/packages/components/socialFeed/utils.ts b/packages/components/socialFeed/utils.ts
@@ -1,6 +1,7 @@
 import { Post, Reaction } from "../../api/feed/v1/feed";
+import { getUserId } from "../../networks";
 
-export const decodeGnoPost = (postData: string): Post => {
+export const decodeGnoPost = (networkId: string, postData: string): Post => {
   const buf = Buffer.from(postData, "base64");
 
   let offset = 0;
@@ -31,7 +32,7 @@ export const decodeGnoPost = (postData: string): Post => {
 
   const addrLen = buf.readUInt16BE(offset);
   offset += 2;
-  const authorId = buf.slice(offset, offset + addrLen).toString();
+  const authorAddress = buf.slice(offset, offset + addrLen).toString();
   offset += addrLen;
 
   const createdAt = buf.readUInt32BE(offset);
@@ -70,7 +71,7 @@ export const decodeGnoPost = (postData: string): Post => {
     metadata,
     parentPostIdentifier: parentPostIdentifier ? "" + parentPostIdentifier : "",
     subPostLength: subpostIDs.length,
-    authorId,
+    authorId: getUserId(networkId, authorAddress),
     createdAt: +createdAt * 1000,
     tipAmount: 0,
     reactions,

diff --git a/packages/hooks/feed/useFetchComments.ts b/packages/hooks/feed/useFetchComments.ts
@@ -61,7 +61,7 @@ const fetchGnoComments = async (
 
   const outputStr = extractGnoString(output);
   for (const postData of outputStr.split(",")) {
-    const post = decodeGnoPost(postData);
+    const post = decodeGnoPost(selectedNetwork.id, postData);
 
     posts.push({
       identifier: post.identifier,

diff --git a/packages/hooks/feed/useFetchFeed.ts b/packages/hooks/feed/useFetchFeed.ts
@@ -66,7 +66,7 @@ const fetchGnoFeed = async (
 
     const outputStr = extractGnoString(output);
     for (const postData of outputStr.split(",")) {
-      const post = decodeGnoPost(postData);
+      const post = decodeGnoPost(selectedNetwork.id, postData);
       posts.push(post);
     }
 

diff --git a/packages/hooks/feed/usePost.ts b/packages/hooks/feed/usePost.ts
@@ -5,7 +5,7 @@ import { Post } from "../../api/feed/v1/feed";
 import { nonSigningSocialFeedClient } from "../../client-creators/socialFeedClient";
 import { GNO_SOCIAL_FEEDS_PKG_PATH } from "../../components/socialFeed/const";
 import { decodeGnoPost } from "../../components/socialFeed/utils";
-import { NetworkKind, getNetwork } from "../../networks";
+import { NetworkKind, getNetwork, getUserId } from "../../networks";
 import { extractGnoString } from "../../utils/gno";
 
 export const usePost = (id: string, networkId: string) => {
@@ -21,7 +21,7 @@ export const usePost = (id: string, networkId: string) => {
         );
 
         const postData = extractGnoString(output);
-        const post = decodeGnoPost(postData);
+        const post = decodeGnoPost(networkId, postData);
         return post;
       } else {
         const client = await nonSigningSocialFeedClient({
@@ -31,12 +31,12 @@ export const usePost = (id: string, networkId: string) => {
 
         const post: Post = {
           identifier: id,
-          parentPostIdentifier: res.parent_post_identifier,
+          parentPostIdentifier: res.parent_post_identifier || "",
           category: res.category,
           metadata: res.metadata,
-          reactions: res.user_reactions,
-          authorId: res.post_by,
-          isDeleted: res.delete,
+          reactions: res.reactions,
+          authorId: getUserId(networkId, res.post_by),
+          isDeleted: res.deleted,
           subPostLength: res.sub_post_length,
           createdAt: res.created_at,
           tipAmount: res.tip_amount,

diff --git a/packages/screens/FeedPostView/FeedPostViewScreen.tsx b/packages/screens/FeedPostView/FeedPostViewScreen.tsx
@@ -42,7 +42,7 @@ import { useIsMobile } from "../../hooks/useIsMobile";
 import { useMaxResolution } from "../../hooks/useMaxResolution";
 import { useNSUserInfo } from "../../hooks/useNSUserInfo";
 import { useSelectedNetworkId } from "../../hooks/useSelectedNetwork";
-import { NetworkFeature, getUserId, parseUserId } from "../../networks";
+import { NetworkFeature, parseUserId } from "../../networks";
 import { ScreenFC, useAppNavigation } from "../../utils/navigation";
 import { DEFAULT_USERNAME } from "../../utils/social-feed";
 import { primaryColor } from "../../utils/style/colors";
@@ -70,7 +70,8 @@ export const FeedPostViewScreen: ScreenFC<"FeedPostView"> = ({
     id,
     selectedNetworkId
   );
-  const authorId = getUserId(selectedNetworkId, postResult?.authorId);
+
+  const authorId = postResult?.authorId;
   const authorNSInfo = useNSUserInfo(authorId);
 
   const [, authorAddress] = parseUserId(postResult?.authorId);