From 8cecd2e2418b370feb0fb3d0f08a26247b9aeb69 Mon Sep 17 00:00:00 2001
From: Dmitry Osipov <dmith.osipov@gmail.com>
Date: Fri, 20 Oct 2023 13:12:13 +0400
Subject: [PATCH] update

---
 src/batchState.ts      | 27 +++++++++++++++++----------
 src/handlers/cb-nft.ts |  6 +++---
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/batchState.ts b/src/batchState.ts
index d26135d..602041b 100644
--- a/src/batchState.ts
+++ b/src/batchState.ts
@@ -104,25 +104,32 @@ export class BatchState {
     tokenId: string,
     collection: NftCollection,
     ownerAddress: string,
-    description: string,
-    name: string,
-    mediaUrl: string,
     attribUrl: string[],
-    blockNumber: bigint,
-    timestamp: Date,
+    description?: string,
+    name?: string,
+    mediaUrl?: string,
+    blockNumber?: bigint,
+    timestamp?: Date,
     mint = true,
   ) {
     const id = `${collection.id}-${tokenId}`;
 
     const owner = await this.getAccount(ownerAddress);
     let nft = mint
-      ? new Nft({ id, collection, mintedAt: timestamp, mintedAtBlock: blockNumber, tokenId, transfers: [] })
+      ? new Nft({
+          id,
+          collection,
+          mintedAt: timestamp,
+          mintedAtBlock: blockNumber,
+          tokenId,
+          transfers: [],
+          mediaUrl,
+          name,
+          description,
+          owner,
+        })
       : await this.getNft(id);
 
-    nft.owner = owner;
-    nft.description = description;
-    nft.name = name;
-    nft.mediaUrl = mediaUrl;
     nft.attribUrl = attribUrl;
 
     this.nfts.set(`${collection.id}-${tokenId}`, nft);
diff --git a/src/handlers/cb-nft.ts b/src/handlers/cb-nft.ts
index abaf8e1..67ada35 100644
--- a/src/handlers/cb-nft.ts
+++ b/src/handlers/cb-nft.ts
@@ -34,15 +34,15 @@ export async function cbNftHandler(
       tokenId,
       collection,
       owner.toHex(),
-      collection.description,
-      collection.name + ' - ' + media.toString(),
-      linkIsFull ? link.toString() : `${link.toString()}/${tokenId}.png`,
       activities.map(([name, times, ts]) => {
         const timesFormatted = name.toString() === 'NFT minted' ? ', ' : ` ${times.toString()} times, `;
         const date = getDate(ts.toString());
         const dateFormatted = name.toString() === 'NFT minted' ? `date: ${date}` : `last game date: ${date}`;
         return `${name}${timesFormatted}${dateFormatted}`;
       }),
+      collection.description,
+      collection.name + ' - ' + media.toString(),
+      linkIsFull ? link.toString() : `${link.toString()}/${tokenId}.png`,
       blockNumber,
       ts,
       data.isMinted,