Update QueryAllParams.count to match WebGL behavior

0xFirekeeper · 0xFirekeeper · commit dbd387bfc165 · 2024-02-01T04:50:43.000+03:00
diff --git a/Assets/Thirdweb/Core/Scripts/ERC1155.cs b/Assets/Thirdweb/Core/Scripts/ERC1155.cs
@@ -86,7 +86,7 @@ public async Task<List<NFT>> GetAll(QueryAllParams queryParams = null)
             {
                 int totalCount = await TotalCount();
                 int start = queryParams?.start ?? 0;
-                int count = queryParams?.count + 1 ?? totalCount;
+                int count = queryParams?.count ?? totalCount;
                 int end = Math.Min(start + count, totalCount);
                 List<NFT> allNfts = new();
                 try
diff --git a/Assets/Thirdweb/Core/Scripts/ERC721.cs b/Assets/Thirdweb/Core/Scripts/ERC721.cs
@@ -88,7 +88,7 @@ public async Task<List<NFT>> GetAll(QueryAllParams queryParams = null)
             {
                 int totalCount = await TotalCount();
                 int start = queryParams?.start ?? 0;
-                int count = queryParams?.count + 1 ?? totalCount;
+                int count = queryParams?.count ?? totalCount;
                 int end = Math.Min(start + count, totalCount);
                 List<NFT> allNfts = new();
                 try
diff --git a/Assets/Thirdweb/Examples/Prefabs/Prefab_NFTLoader.prefab b/Assets/Thirdweb/Examples/Prefabs/Prefab_NFTLoader.prefab
@@ -396,7 +396,7 @@ MonoBehaviour:
     loadMultipleNfts:
     - contractAddress: 0x5350e0662D1BAB9f8843690B91C363aFD3e0cFe7
       startID: 0
-      count: 2
+      count: 3
       type: 0
     loadOwnedNfts:
     - contractAddress: 0x5350e0662D1BAB9f8843690B91C363aFD3e0cFe7

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public async Task<List<NFT>> GetAll(QueryAllParams queryParams = null)`
`86`	`86`	`{`
`87`	`87`	`int totalCount = await TotalCount();`
`88`	`88`	`int start = queryParams?.start ?? 0;`
`89`		`- int count = queryParams?.count + 1 ?? totalCount;`
	`89`	`+ int count = queryParams?.count ?? totalCount;`
`90`	`90`	`int end = Math.Min(start + count, totalCount);`
`91`	`91`	`List<NFT> allNfts = new();`
`92`	`92`	`try`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public async Task<List<NFT>> GetAll(QueryAllParams queryParams = null)`
`88`	`88`	`{`
`89`	`89`	`int totalCount = await TotalCount();`
`90`	`90`	`int start = queryParams?.start ?? 0;`
`91`		`- int count = queryParams?.count + 1 ?? totalCount;`
	`91`	`+ int count = queryParams?.count ?? totalCount;`
`92`	`92`	`int end = Math.Min(start + count, totalCount);`
`93`	`93`	`List<NFT> allNfts = new();`
`94`	`94`	`try`