steamutils 1.3.25 → 1.3.26

package/index.js

@@ -5816,17 +5816,18 @@ class SteamUser {
 
         $('.profile_subpage_selector > a').each(function () {
             const text = $(this).text()
-            const link = $(this).attr('href')
+            const link = _.trimEnd($(this).attr('href'), '/')
             let count = 0
             let offer = {}
             if (text.includes('(') && text.includes(')')) {
                 count = parseInt(text.split('(')[1].split(')')[0].trim())
             }
-            if (text.startsWith('Incoming Offers')) {
+            if (link.endsWith('tradeoffers')) {
                 offer = IncomingOffers
-            } else if (text.startsWith('Sent Offers')) {
+            } else if (link.endsWith('tradeoffers/sent')) {
                 offer = SentOffers
             } else {
+                console.error("getTradeOffer", link);
                 //invalid text
             }
             offer.link = link
@@ -5841,30 +5842,65 @@ class SteamUser {
         $('.profile_leftcol > .tradeoffer').each(function () {
             const $1 = $(this);
             const id = $1.attr('id')
-            if (id.startsWith('tradeofferid_')) {
-                const tradeofferid = parseInt(id.split('tradeofferid_')[1])
-                let partner = $1.html().split('ReportTradeScam(')[1].split(');')[0].trim()
-                for (const s of [`"`, `'`, `"`]) {
-                    partner = _.trim(partner, s);
-                }
-                const partnerSteamId = partner.split(`',`)[0].trim()
-                let partnerName = partner.split(`', "`)[1].trim();
-                const playerAvatar = $1.find('.playerAvatar')
-                const avatar = playerAvatar.find('img')?.attr('src')
-                const link = playerAvatar.find('a')?.attr('href')
-                const header = StringUtils.cleanSpace($1.find('.tradeoffer_header').text())
-                const active = $1.find('.tradeoffer_items_ctn').hasClass("active")
-
-                tradeOffers.push({
-                    tradeofferid, partner: {
-                        steamId: partnerSteamId,
-                        name: partnerName,
-                        avatar,
-                        link,
-                        header,
-                    },
-                })
+            if (!id.startsWith('tradeofferid_')) {
+                return;
             }
+            const tradeofferid = parseInt(id.split('tradeofferid_')[1])
+            if(!tradeofferid){
+                return
+            }
+            let partner = $1.html().split('ReportTradeScam(')[1].split(');')[0].trim()
+            for (const s of [`"`, `'`, `"`]) {
+                partner = _.trim(partner, s);
+            }
+            const partnerSteamId = partner.split(`',`)[0].trim()
+            const partnerName = partner.split(`', "`)[1].trim();
+            const playerAvatar = $1.find('.playerAvatar')
+            const avatar = playerAvatar.find('img')?.attr('src')
+            const link = playerAvatar.find('a')?.attr('href')
+            const header = StringUtils.cleanSpace($1.find('.tradeoffer_header').text())
+            const active = $1.find('.tradeoffer_items_ctn').hasClass("active")
+            const tradeoffer_items_primary = $1.find('.tradeoffer_items_ctn .tradeoffer_items.primary')
+            const tradeoffer_items_secondary = $1.find('.tradeoffer_items_ctn .tradeoffer_items.secondary')
+            const primarySteamId = (SteamID.fromIndividualAccountID(parseInt(tradeoffer_items_primary.find("a.tradeoffer_avatar").attr("data-miniprofile")))).getSteamID64()
+            const primaryItems = [...tradeoffer_items_primary.find(".tradeoffer_item_list > .trade_item")].map(function (el) {
+                el = $(el)
+                const economyItem = el.attr("data-economy-item")//classinfo/730/310777338/302028390
+                const img = el.find("img").attr("src")
+                return {
+                    economyItem,
+                    img
+                }
+            })
+            const secondarySteamId = (SteamID.fromIndividualAccountID(parseInt(tradeoffer_items_secondary.find("a.tradeoffer_avatar").attr("data-miniprofile")))).getSteamID64()
+            const secondaryItems = [...tradeoffer_items_secondary.find(".tradeoffer_item_list > .trade_item")].map(function (el) {
+                el = $(el)
+                const economyItem = el.attr("data-economy-item")//classinfo/730/310777338/302028390
+                const img = el.find("img").attr("src")
+                return {
+                    economyItem,
+                    img
+                }
+            })
+            tradeOffers.push({
+                tradeofferid,
+                partner: {
+                    steamId: partnerSteamId,
+                    name: partnerName,
+                    avatarHash: SteamUser.GetAvatarHashFromURL(avatar),
+                    link,
+                    header,
+                },
+                active,
+                primary: {
+                    steamId: primarySteamId,
+                    items: primaryItems
+                },
+                secondary: {
+                    steamId: secondarySteamId,
+                    items: secondaryItems
+                }
+            })
         })
 
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.3.25",
+  "version": "1.3.26",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.5",