Merge pull request #226 from wangxingzhen/charm

Add support keychain and Bumps globaloffensive from 3.1.0 to 3.2.0.

Author: Step7750

index.js

@@ -247,6 +247,7 @@ queue.process(CONFIG.logins.length, botController, async (job) => {
 
     itemData.iteminfo = utils.removeNullValues(itemData.iteminfo);
     itemData.iteminfo.stickers = itemData.iteminfo.stickers.map((s) => utils.removeNullValues(s));
+    itemData.iteminfo.keychains = itemData.iteminfo.keychains.map((s) => utils.removeNullValues(s));
 
     job.data.job.setResponse(job.data.link.getParams().a, itemData.iteminfo);
 

lib/game_data.js

@@ -192,6 +192,17 @@ class GameData {
 
             if (name) sticker.name = name;
         }
+        // Get keychain name
+        const keychainDefinitions = this.items_game.keychain_definitions;
+        for (const keychain of iteminfo.keychains || []) {
+            const kit = keychainDefinitions[keychain.sticker_id];
+
+            if (!kit) continue;
+
+            let name = this.csgo_english[kit.loc_name.replace('#', '')];
+
+            if (name) keychain.name = name;
+        }
 
         // Get the skin name
         let skin_name = '';
@@ -330,6 +341,8 @@ class GameData {
 
         if (iteminfo.weapon_type === 'Sticker' || iteminfo.weapon_type === 'Sealed Graffiti') {
             name += `| ${iteminfo.stickers[0].name}`;
+        } else if (iteminfo.weapon_type === 'Charm') {
+            name += `| ${iteminfo.keychains[0].name}`;
         }
 
         // Vanilla items have an item_name of '-'

lib/postgres.js

@@ -84,6 +84,7 @@ class Postgres {
         ALTER TABLE items ADD COLUMN IF NOT EXISTS floatid BIGINT;
         ALTER TABLE items ADD COLUMN IF NOT EXISTS price INTEGER;
         ALTER TABLE items ADD COLUMN IF NOT EXISTS listed_price INTEGER;
+        ALTER TABLE items ADD COLUMN IF NOT EXISTS keychains JSONB;
         ALTER TABLE history ADD COLUMN IF NOT EXISTS price INTEGER;
 
         -- Float ID is defined as the first asset id we've seen for an item
@@ -249,6 +250,35 @@ class Postgres {
                 }
             }
 
+            const keychains = item.keychains.length > 0 ? item.keychains.map((s) => {
+                const res = {s: s.slot, i: s.sticker_id};
+                if (s.wear) {
+                    res.w = s.wear;
+                }
+                if (s.scale) {
+                    res.sc = s.scale;
+                }
+                if (s.rotation) {
+                    res.r = s.rotation;
+                }
+                if (s.tint_id) {
+                    res.t = s.tint_id;
+                }
+                if (s.offset_x) {
+                    res.x = s.offset_x;
+                }
+                if (s.offset_y) {
+                    res.y = s.offset_y;
+                }
+                if (s.offset_z) {
+                    res.z = s.offset_z;
+                }
+                if (s.pattern) {
+                    res.p = s.pattern;
+                }
+                return res;
+            }) : null;
+
             const ms = item.s !== '0' ? item.s : item.m;
             const isStattrak = item.killeatervalue !== null;
             const isSouvenir = item.quality === 12;
@@ -266,7 +296,7 @@ class Postgres {
             }
 
             values.push([ms, item.a, item.d, item.paintseed, item.paintwear, item.defindex, item.paintindex, isStattrak,
-                isSouvenir, props, JSON.stringify(stickers), item.rarity, price]);
+                isSouvenir, props, JSON.stringify(stickers), JSON.stringify(keychains), item.rarity, price]);
         }
 
         if (values.length === 0) {
@@ -286,13 +316,13 @@ class Postgres {
         const values = [];
         let i = 1;
 
-        // Builds binding pattern such as ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11::jsonb, now(), $12, NULL, $13)
+        // Builds binding pattern such as ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11::jsonb, $12::jsonb, now(), $13, NULL, $14)
         for (let c = 0; c < itemCount; c++) {
-            values.push(`($${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}::jsonb, now(), $${i++}, NULL, $${i++})`);
+            values.push(`($${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}, $${i++}::jsonb, $${i++}::jsonb, now(), $${i++}, NULL, $${i++})`);
         }
 
-        return `INSERT INTO items (ms, a, d, paintseed, paintwear, defindex, paintindex, stattrak, souvenir, props, stickers, updated, rarity, floatid, price)
-                VALUES ${values.join(', ')} ON CONFLICT(defindex, paintindex, paintwear, paintseed) DO UPDATE SET ms=excluded.ms, a=excluded.a, d=excluded.d, stickers=excluded.stickers, updated=now()`;
+        return `INSERT INTO items (ms, a, d, paintseed, paintwear, defindex, paintindex, stattrak, souvenir, props, stickers, keychains, updated, rarity, floatid, price)
+                VALUES ${values.join(', ')} ON CONFLICT(defindex, paintindex, paintwear, paintseed) DO UPDATE SET ms=excluded.ms, a=excluded.a, d=excluded.d, stickers=excluded.stickers, keychains=excluded.keychains, updated=now()`;
     }
 
     updateItemPrice(assetId, price) {
@@ -359,6 +389,22 @@ class Postgres {
                 }
             });
 
+            item.keychains = item.keychains || [];
+            item.keychains = item.keychains.map((s) => {
+                return {
+                    sticker_id: s.i,
+                    slot: s.s,
+                    wear: s.w,
+                    scale: s.sc,
+                    rotation: s.r,
+                    tint_id: s.t,
+                    offset_x: s.x,
+                    offset_y: s.y,
+                    offset_z: s.z,
+                    pattern: s.p,
+                }
+            });
+
             item = Object.assign(Postgres.extractProperties(item.props), item);
 
             const buf = Buffer.alloc(4);