Use extract_js_vars in inv info

Author: Gobot1234

steam/http.py

@@ -369,14 +369,14 @@ async def get_user_wishlist(self, user_id64: ID64) -> AsyncGenerator[tuple[AppID
 
     async def get_user_inventory_info(self, user_id64: ID64) -> ValuesView[user.InventoryInfo]:
         resp = await self.get(URL.COMMUNITY / f"profiles/{user_id64}/inventory")
-        soup = BeautifulSoup(resp, "html.parser")
+        soup = BeautifulSoup(resp, "html.parser")  # needs to be html
         for script in soup.find_all("script", type="text/javascript"):
-            if match := re.search(r"var\s+g_rgAppContextData\s*=\s*(?P<json>{.*?});\s*", script.text):
-                break
-        else:
-            raise ValueError("Could not find inventory info")
-
-        return JSON_LOADS(match["json"]).values()
+            try:
+                (info,) = extract_js_variables(script.text, "g_rgAppContextData")
+                return info.values()
+            except NameError:
+                pass
+        raise ValueError("Could not find inventory info")
 
     async def send_user_gift(
         self, user_id: ID32, asset_id: AssetID, name: str, message: str, closing_note: str, signature: str
@@ -554,141 +554,6 @@ def invite_user_to_clan(self, user_id64: ID64, clan_id64: ID64) -> Coro[None]:
         }
         return self.post(URL.COMMUNITY / "actions/GroupInvite", data=payload)
 
-    async def get_user_clans(self, user_id64: ID64) -> list[ID64]:
-        params = {"steamid": user_id64}
-        data: user.GetUserGroupList = await self.get(api_route("ISteamUser/GetUserGroupList"), params=params)
-        return [parse_id64(group["gid"], type=Type.Clan) for group in data["response"]["groups"]]
-
-    async def get_user_bans(self, *user_id64s: ID64) -> list[user.UserBan]:
-        params = {"steamids": ",".join(str(id64) for id64 in user_id64s)}
-        data: user.GetPlayerBans = await self.get(api_route("ISteamUser/GetPlayerBans"), params=params)
-        return [
-            {
-                "steamid": ID64(int(ban["SteamId"])),
-                "community_banned": ban["CommunityBanned"],
-                "vac_banned": ban["VACBanned"],
-                "number_of_vac_bans": ban["NumberOfVACBans"],
-                "days_since_last_ban": ban["DaysSinceLastBan"],
-                "number_of_game_bans": ban["NumberOfGameBans"],
-                "economy_ban": ban["EconomyBan"],
-            }
-            for ban in data["players"]
-        ]
-
-    async def get_user_level(self, user_id64: ID64) -> int:
-        params = {"steamid": user_id64}
-        resp: user.GetSteamLevel = await self.get(api_route("IPlayerService/GetSteamLevel"), params=params)
-        return resp["response"]["player_level"]
-
-    async def get_user_badges(self, user_id64: ID64) -> user.UserBadges:
-        params = {"steamid": user_id64}
-        data: ResponseDict[user.UserBadges] = await self.get(api_route("IPlayerService/GetBadges"), params=params)
-        return data["response"]
-
-    async def get_user_community_badge_progress(
-        self, user_id64: ID64, badge_id: int
-    ) -> list[user.CommunityBadgeProgressQuest]:
-        params = {
-            "steamid": user_id64,
-            "badgeid": badge_id,
-        }
-        data: ResponseDict[dict[Literal["quests"], list[user.CommunityBadgeProgressQuest]]] = await self.get(
-            api_route("IPlayerService/GetCommunityBadgeProgress"), params=params
-        )
-        return data["response"]["quests"]
-
-    async def get_user_recently_played_apps(self, user_id64: ID64) -> list[app.UserRecentlyPlayedApp]:
-        params = {"steamid": user_id64}
-        data: ResponseDict[dict[Literal["games"], list[app.UserRecentlyPlayedApp]]] = await self.get(
-            api_route("IPlayerService/GetRecentlyPlayedGames"), params=params
-        )
-        return data["response"]["games"]
-
-    async def get_user_inventory_info(self, user_id64: ID64) -> ValuesView[user.InventoryInfo]:
-        resp = await self.get(URL.COMMUNITY / f"profiles/{user_id64}/inventory")
-        soup = BeautifulSoup(resp, "html.parser")  # needs to be html
-        for script in soup.find_all("script", type="text/javascript"):
-            try:
-                (info,) = extract_js_variables(script.text, "g_rgAppContextData")
-                return info.values()
-            except NameError:
-                pass
-        raise ValueError("Could not find inventory info")
-
-    async def send_user_gift(
-        self, user_id: ID32, asset_id: AssetID, name: str, message: str, closing_note: str, signature: str
-    ) -> None:
-        payload = {
-            "GifteeAccountID": user_id,
-            "GifteeEmail": "",
-            "GifteeName": name,
-            "GiftMessage": message,
-            "GiftSentiment": closing_note,
-            "GiftSignature": signature,
-            "GiftGID": asset_id,
-            "SessionID": self.session_id,
-        }
-        headers = {"Referer": f"{URL.STORE}/checkout/sendgift/{asset_id}"}
-        data: EResultSuccess = await self.post(URL.STORE / "checkout/sendgiftsubmit", data=payload, headers=headers)
-        if data["success"] != Result.OK:
-            raise RuntimeError("Failed to send gift")
-
-    def clear_nickname_history(self) -> Coro[None]:
-        payload = {"sessionid": self.session_id}
-        return self.post(URL.COMMUNITY / "my/ajaxclearaliashistory", data=payload)
-
-    async def get_user_wishlist(self, user_id64: ID64) -> AsyncGenerator[tuple[AppID, app.WishlistApp], None]:
-        params = {"p": 0}
-        while True:
-            resp: dict[AppID, app.WishlistApp] = await self.get(
-                URL.STORE / f"wishlist/profiles/{user_id64}/wishlistdata", params=params
-            )
-            if not resp:  # it's an empty list sometimes lol
-                return
-            for app_id, data in resp.items():
-                yield app_id, data
-            params["p"] += 1
-
-    def get_app(self, app_id: AppID, language: Language | None) -> Coro[dict[str, Any]]:
-        params = {
-            "appids": app_id,
-            "l": (language or self.language).api_name,
-        }
-        return self.get(URL.STORE / "api/appdetails", params=params)
-
-    def get_app_dlc(self, app_id: AppID, language: Language | None) -> Coro[dict[str, Any]]:
-        params = {
-            "appid": app_id,
-            "l": (language or self.language).api_name,
-        }
-        return self.get(URL.STORE / "api/dlcforapp", params=params)
-
-    async def get_app_asset_prices(self, app_id: AppID, currency: Currency | None = None) -> app.AssetPrices:
-        params = {"appid": app_id, "currency": (currency or self.currency).name}
-
-        data: dict[Literal["result"], app.AssetPrices] = await self.get(
-            api_route("ISteamEconomy/GetAssetPrices"), params=params
-        )
-        return data["result"]
-
-    async def get_clan_members(self, clan_id64: ID64) -> AsyncGenerator[ID32, None]:
-        url = f"{ID(clan_id64).community_url}/members"
-        page = 1
-        number_of_pages = None
-
-        while number_of_pages is None or page <= number_of_pages:
-            resp = await self.get(url, params={"p": page, "content_only": "true"})
-            soup = BeautifulSoup(resp, HTML_PARSER)
-            if not number_of_pages:
-                page_select = soup.find("div", class_="group_paging")
-                assert page_select is not None
-                number_of_pages = int(re.findall(r"\d* - (\d*)", page_select.text)[0])
-
-            for s in soup.find_all("div", id="memberList"):
-                for user in s.find_all("div", class_="member_block"):
-                    yield int(user["data-miniprofile"])  # type: ignore
-            page += 1
-
     async def get_clan_invitees(
         self,
     ) -> dict[ID64, ID64]:  # TODO what about the case where you've been invited by multiple peopl