Improve NFT Metadata & Filters

Author: 0xFirekeeper

Thirdweb/Thirdweb.Extensions/ThirdwebExtensions.Types.cs

@@ -157,7 +157,7 @@ public struct NFT
     public NFTMetadata Metadata { get; set; }
 
     /// <summary>
-    /// Gets or sets the owner address of the NFT.
+    /// Gets or sets the owner address of the NFT. This is only applicable for ERC721 tokens.
     /// </summary>
     public string Owner { get; set; }
 
@@ -172,7 +172,7 @@ public struct NFT
     public BigInteger? Supply { get; set; }
 
     /// <summary>
-    /// Gets or sets the quantity owned by the user.
+    /// Gets or sets the quantity owned by the user. This is only applicable for ERC1155 tokens.
     /// </summary>
     public BigInteger? QuantityOwned { get; set; }
 }

Thirdweb/Thirdweb.Extensions/ThirdwebExtensions.cs

@@ -1177,9 +1177,10 @@ public static async Task<BigInteger> ERC1155_TotalSupply(this ThirdwebContract c
     /// </summary>
     /// <param name="contract">The contract to interact with.</param>
     /// <param name="tokenId">The ID of the token.</param>
+    /// <param name="fillOwner">A boolean indicating whether to fill the owner details. Defaults to true.</param>
     /// <returns>A task representing the asynchronous operation, with an NFT result containing the token details.</returns>
     /// <exception cref="ArgumentNullException">Thrown when the contract is null.</exception>
-    public static async Task<NFT> ERC721_GetNFT(this ThirdwebContract contract, BigInteger tokenId)
+    public static async Task<NFT> ERC721_GetNFT(this ThirdwebContract contract, BigInteger tokenId, bool fillOwner = true)
     {
         if (contract == null)
         {
@@ -1198,14 +1199,17 @@ public static async Task<NFT> ERC721_GetNFT(this ThirdwebContract contract, BigI
         }
         metadata.Id = tokenId.ToString();
 
-        string owner;
-        try
-        {
-            owner = await contract.ERC721_OwnerOf(tokenId).ConfigureAwait(false);
-        }
-        catch (Exception)
+        var owner = Constants.ADDRESS_ZERO;
+        if (fillOwner)
         {
-            owner = Constants.ADDRESS_ZERO;
+            try
+            {
+                owner = await contract.ERC721_OwnerOf(tokenId).ConfigureAwait(false);
+            }
+            catch (Exception)
+            {
+                owner = Constants.ADDRESS_ZERO;
+            }
         }
 
         return new NFT
@@ -1214,6 +1218,7 @@ public static async Task<NFT> ERC721_GetNFT(this ThirdwebContract contract, BigI
             Owner = owner,
             Type = NFTType.ERC721,
             Supply = 1,
+            QuantityOwned = 1
         };
     }
 
@@ -1322,9 +1327,10 @@ public static async Task<List<NFT>> ERC721_GetOwnedNFTs(this ThirdwebContract co
     /// </summary>
     /// <param name="contract">The contract to interact with.</param>
     /// <param name="tokenId">The ID of the token.</param>
+    /// <param name="fillSupply">A boolean indicating whether to fill the supply. Defaults to true if not specified.</param>
     /// <returns>A task representing the asynchronous operation, with an NFT result containing the token details.</returns>
     /// <exception cref="ArgumentNullException">Thrown when the contract is null.</exception>
-    public static async Task<NFT> ERC1155_GetNFT(this ThirdwebContract contract, BigInteger tokenId)
+    public static async Task<NFT> ERC1155_GetNFT(this ThirdwebContract contract, BigInteger tokenId, bool fillSupply = true)
     {
         if (contract == null)
         {
@@ -1342,21 +1348,24 @@ public static async Task<NFT> ERC1155_GetNFT(this ThirdwebContract contract, Big
             metadata = new NFTMetadata { Description = e.Message };
         }
         metadata.Id = tokenId.ToString();
-        var owner = string.Empty;
-        BigInteger supply;
-        try
-        {
-            supply = await contract.ERC1155_TotalSupply(tokenId).ConfigureAwait(false);
-        }
-        catch (Exception)
+
+        var supply = BigInteger.MinusOne;
+        if (fillSupply)
         {
-            supply = BigInteger.MinusOne;
+            try
+            {
+                supply = await contract.ERC1155_TotalSupply(tokenId).ConfigureAwait(false);
+            }
+            catch (Exception)
+            {
+                supply = BigInteger.MinusOne;
+            }
         }
 
         return new NFT
         {
             Metadata = metadata,
-            Owner = owner,
+            Owner = "",
             Type = NFTType.ERC1155,
             Supply = supply,
         };
@@ -1454,6 +1463,10 @@ public static async Task<List<NFT>> ERC1155_GetOwnedNFTs(this ThirdwebContract c
         }
 
         var ownerNfts = await Task.WhenAll(ownerNftTasks).ConfigureAwait(false);
+        for (var i = 0; i < ownerNfts.Length; i++)
+        {
+            ownerNfts[i].QuantityOwned = balanceOfBatch[i];
+        }
         return ownerNfts.ToList();
     }