fix: gamepasses and devproducts not having icons

Author: michei69

Source/assets/__init__.py

@@ -112,6 +112,8 @@ def resolve_asset_query(self, query: dict[str, str]) -> int | str | None:
             (query.get('id'), self.resolve_asset_id),
             (query.get('aid'), self.resolve_asset_id),
             (query.get('AssetID'), self.resolve_asset_id),
+            (query.get('assetid'), self.resolve_asset_id),
+            (query.get('assetId'), self.resolve_asset_id),
             (query.get('assetversionid'), self.resolve_asset_version_id),
         ]
 

Source/assets/thumbnail.py

@@ -1,5 +1,6 @@
 from . import const, extractor
 import json
+import game_config
 
 def transform_to_id_num(asset_id: str) -> int:
     asset_sub = asset_id[len(const.THUMB_PREFIX):-4] # strip .png
@@ -16,6 +17,25 @@ def load_asset(asset_id: str) -> bytes | None:
     id = transform_to_id_num(asset_id)
     if id == 0:
         return None
+    
+    config = game_config.get_cached_config()
+    passes = config.remote_data.gamepasses
+    for gamepass in passes.values():
+        if gamepass.id_num == id:
+            if gamepass.icon is None:
+                # technically we could fetch it from the thumbnails api,
+                # but gamepass.id_num is usually the product_id, not
+                # the gamepass_id (which is different)
+                return None
+            return gamepass.icon.extract()
+        
+    products = config.remote_data.devproducts
+    for product in products.values():
+        if product.id_num == id:
+            # same case as gamepasses
+            if product.icon is None:
+                return None
+            return product.icon.extract()
 
     # technically we could also download the decal and parse its contents
     # to extract the thumbnail, but that might be overkill

Source/web_server/endpoints/assets.py

@@ -61,6 +61,7 @@ def _(self: web_server_handler) -> bool:
 
 @server_path('/Game/Tools/ThumbnailAsset.ashx')
 @server_path('/Thumbs/Asset.ashx') # we can pass this too since we're calling rbx api regardless
+@server_path('/thumbs/asset.ashx')
 def _(self: web_server_handler) -> bool:
     asset_cache = self.game_config.asset_cache
     asset_id = asset_cache.resolve_asset_query(self.query)