query node - mappings minor adjustments

query-node/mappings/src/common.ts

@@ -43,7 +43,7 @@ export async function prepareDataObject(
     // `size` is masked by `size` special name in `Struct` so there needs to be `.get('size') as unknown as u64` to retrieve proper value
     size: (contentParameters.get('size') as unknown as u64).toNumber(),
     liaisonJudgement: LiaisonJudgement.PENDING, // judgement is pending at start; liaison id is set when content is accepted/rejected
-    ipfsContentId: contentParameters.ipfs_content_id.toHex(),
+    ipfsContentId: contentParameters.ipfs_content_id.toString(),
     joystreamContentId: contentParameters.content_id.toHex(),
 
 

query-node/mappings/src/content/channel.ts

@@ -94,7 +94,7 @@ export async function content_ChannelUpdated(
   }
 
   // prepare changed metadata
-  const newMetadata = channelUpdateParameters.new_meta.isSome && channelUpdateParameters.new_meta.unwrapOr(null)
+  const newMetadata = channelUpdateParameters.new_meta.unwrapOr(null)
 
   //  update metadata if it was changed
   if (newMetadata) {
@@ -116,7 +116,7 @@ export async function content_ChannelUpdated(
   }
 
   // prepare changed reward account
-  const newRewardAccount = channelUpdateParameters.reward_account.isSome && channelUpdateParameters.reward_account.unwrapOr(null)
+  const newRewardAccount = channelUpdateParameters.reward_account.unwrapOr(null)
 
   // reward account change happened?
   if (newRewardAccount) {
@@ -305,7 +305,7 @@ function handleChannelRewardAccountChange(
   channel: Channel, // will be modified inside of the function!
   reward_account: Option<AccountId>
 ) {
-  const rewardAccount = reward_account.isSome && reward_account.unwrapOr(null)
+  const rewardAccount = reward_account.unwrapOr(null)
 
   // new different reward account set?
   if (rewardAccount) {

query-node/mappings/src/content/utils.ts

@@ -233,9 +233,11 @@ export async function readProtobufWithAssets<T extends Channel | Video>(
     }
 
     // prepare information about media published somewhere else before Joystream if needed.
-    if (metaAsObject.publishedBeforeJoystream) {
+    if (metaAsObject.publishedBeforeJoystream && metaAsObject.publishedBeforeJoystream.isPublished) {
       // this will change the `channel`!
       handlePublishedBeforeJoystream(result, metaAsObject.publishedBeforeJoystream.date)
+    } else {
+      delete metaAsObject.publishedBeforeJoystream // make sure the object is unset
     }
 
     return result as Partial<T>
@@ -276,6 +278,8 @@ function handlePublishedBeforeJoystream(video: Partial<Video>, publishedAtString
   // published elsewhere before Joystream
   if (publishedAtString) {
     video.publishedBeforeJoystream = new Date(publishedAtString)
+
+    return
   }
 
   // unset publish info

query-node/mappings/src/content/video.ts

@@ -233,7 +233,7 @@ export async function content_VideoUpdated(
   }
 
   // prepare changed metadata
-  const newMetadata = videoUpdateParameters.new_meta.isSome && videoUpdateParameters.new_meta.unwrapOr(null)
+  const newMetadata = videoUpdateParameters.new_meta.unwrapOr(null)
 
   // update metadata if it was changed
   if (newMetadata) {