Merge pull request #2760 from ecency/nt/wave-updates

Nt/wave image ratios
ecency · Sep 21, 2023 · e146738 · e146738
2 parents 9a6d6d4 + dbf806a
commit e146738
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/src/components/comment/view/commentView.tsx b/src/components/comment/view/commentView.tsx
@@ -104,6 +104,7 @@ const CommentView = ({
       <View style={[{ marginLeft: 2, marginTop: -6 }]}>
         <CommentBody
           body={comment.body}
+          metadata={comment.json_metadata}
           key={`key-${comment.permlink}`}
           hideContent={_hideContent}
           commentDepth={_depth}

diff --git a/src/components/postElements/body/view/commentBodyView.tsx b/src/components/postElements/body/view/commentBodyView.tsx
@@ -24,6 +24,7 @@ const WIDTH = getWindowDimensions().width;
 
 interface CommentBodyProps {
   body: string;
+  metadata?: any;
   commentDepth: number;
   hideContent: boolean;
   handleOnContentPress: () => void;
@@ -38,6 +39,7 @@ interface CommentBodyProps {
 
 const CommentBody = ({
   body,
+  metadata,
   commentDepth,
   hideContent,
   handleOnContentPress,
@@ -132,6 +134,7 @@ const CommentBody = ({
             <PostHtmlRenderer
               contentWidth={_contentWidth}
               body={body}
+              metadata={metadata}
               isComment={true}
               setSelectedImage={handleImagePress}
               setSelectedLink={handleLinkPress}

diff --git a/src/components/postHtmlRenderer/postHtmlRenderer.tsx b/src/components/postHtmlRenderer/postHtmlRenderer.tsx
@@ -13,7 +13,7 @@ import { VideoPlayer } from '..';
 interface PostHtmlRendererProps {
   contentWidth: number;
   body: string;
-  metadata: string;
+  metadata: any;
   isComment?: boolean;
   onLoaded?: () => void;
   setSelectedImage: (imgUrl: string, postImageUrls: string[]) => void;

diff --git a/src/components/quickReplyModal/usePostSubmitter.ts b/src/components/quickReplyModal/usePostSubmitter.ts
@@ -1,7 +1,7 @@
 import { useDispatch } from "react-redux";
 import { useAppSelector } from "../../hooks";
 import { postComment } from "../../providers/hive/dhive";
-import { generateReplyPermlink, makeJsonMetadataReply } from "../../utils/editor";
+import { extractMetadata, generateReplyPermlink, makeJsonMetadata } from "../../utils/editor";
 import { Alert } from "react-native";
 import { updateCommentCache } from "../../redux/actions/cacheActions";
 import { toastNotification } from "../../redux/actions/uiAction";
@@ -46,14 +46,21 @@ export const usePostSubmitter = () => {
             const category = parentPost.category || '';
             const url = `/${category}/@${parentAuthor}/${parentPermlink}#@${author}/${permlink}`;
 
+            //adding jsonmeta with image ratios here....
+            const meta = await extractMetadata({
+                body:commentBody,
+                fetchRatios:true
+            })
+            const jsonMetadata = makeJsonMetadata(meta, parentTags || ['ecency'])
+
             console.log(
                 currentAccount,
                 pinCode,
                 parentAuthor,
                 parentPermlink,
                 permlink,
                 commentBody,
-                parentTags,
+                jsonMetadata
             );
 
 
@@ -65,7 +72,8 @@ export const usePostSubmitter = () => {
                     parentPermlink,
                     permlink,
                     commentBody,
-                    parentTags,
+                    [],
+                    jsonMetadata
                 )
 
                 userActivityMutation.mutate({
@@ -90,7 +98,7 @@ export const usePostSubmitter = () => {
                     parent_author: parentAuthor,
                     parent_permlink: parentPermlink,
                     markdownBody: commentBody,
-                    json_metadata: makeJsonMetadataReply(parentTags || ['ecency'])
+                    json_metadata: jsonMetadata
                 }
 
                 dispatch(

diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js
@@ -1510,7 +1510,7 @@ export const postComment = (
   permlink,
   body,
   parentTags,
-  isEdit = false,
+  jsonMetadata = null,
 ) =>
   _postContent(
     account,
@@ -1520,7 +1520,7 @@ export const postComment = (
     permlink,
     '',
     body,
-    makeJsonMetadataReply(parentTags || ['ecency']),
+    jsonMetadata ? jsonMetadata : makeJsonMetadataReply(parentTags || ['ecency']),
     null,
     null,
   )

diff --git a/src/redux/actions/cacheActions.ts b/src/redux/actions/cacheActions.ts
@@ -18,7 +18,6 @@ import {
   DELETE_CLAIM_CACHE_ENTRY,
 } from '../constants/constants';
 import {
-  ClaimCache,
   Comment,
   CacheStatus,
   Draft,