Merge branch 'master' into IPC

Author: idinium96

.example/options.json

@@ -117,6 +117,9 @@
         },
         "priceAge": {
             "maxInSeconds": 28800
+        },
+        "rewriteFile": {
+            "count": 1
         }
     },
     "bypass": {

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "tf2autobot",
-    "version": "5.8.4",
+    "version": "5.9.0",
     "description": "Fully automated TF2 trading bot advertising on www.backpack.tf using prices from www.prices.tf, Originally made by Nicklason.",
     "main": "dist/app.js",
     "scripts": {
@@ -30,12 +30,12 @@
         "@tf2autobot/bptf-login": "^2.3.6",
         "@tf2autobot/filter-axios-error": "^1.5.2",
         "@tf2autobot/jsonlint": "^1.0.0",
-        "@tf2autobot/steamcommunity": "^3.47.0",
+        "@tf2autobot/steamcommunity": "^3.47.2",
         "@tf2autobot/tf2": "^1.3.5",
         "@tf2autobot/tf2-currencies": "^2.0.1",
         "@tf2autobot/tf2-schema": "^4.2.15",
         "@tf2autobot/tf2-sku": "^2.0.4",
-        "@tf2autobot/tradeoffer-manager": "^2.15.0",
+        "@tf2autobot/tradeoffer-manager": "^2.15.2",
         "async": "^3.2.4",
         "axios": "^1.4.0",
         "bluebird": "^3.7.2",
@@ -65,9 +65,9 @@
         "retry": "^0.13.1",
         "semver": "^7.5.4",
         "socket.io-client": "^4.7.1",
-        "steam-session": "^1.4.1",
+        "steam-session": "^1.7.1",
         "steam-totp": "^2.1.2",
-        "steam-user": "^5.0.1",
+        "steam-user": "^5.0.2",
         "steamid": "^2.0.0",
         "url": "^0.11.1",
         "valid-url": "^1.0.9",

package.json

@@ -67,7 +67,7 @@ const botManager = new BotManager(
 
 import ON_DEATH from 'death';
 import * as inspect from 'util';
-import { Webhook } from './lib/DiscordWebhook/interfaces';
+import { Webhook } from './classes/DiscordWebhook/interfaces';
 import axios, { AxiosError } from 'axios';
 import { uptime } from './lib/tools/time';
 import filterAxiosError from '@tf2autobot/filter-axios-error';

src/app.ts

@@ -4,7 +4,7 @@ import Bot from '../Bot';
 import { EntryData, KeyPrices, PricelistChangedSource } from '../Pricelist';
 import log from '../../lib/logger';
 import { currPure } from '../../lib/tools/pure';
-import sendAlert from '../../lib/DiscordWebhook/sendAlert';
+import sendAlert from '../DiscordWebhook/sendAlert';
 
 export interface OverallStatus {
     isBuyingKeys: boolean;

src/classes/Autokeys/Autokeys.ts

@@ -39,7 +39,7 @@ import Groups from './Groups';
 
 import log from '../lib/logger';
 import Bans, { IsBanned } from '../lib/bans';
-import { sendStats } from '../lib/DiscordWebhook/export';
+import { sendStats } from './DiscordWebhook/export';
 
 import Options from './Options';
 import IPricer from './IPricer';

src/classes/Bot.ts

@@ -9,7 +9,7 @@ import Bot from '../Bot';
 import Pricelist from '../Pricelist';
 import { BPTFGetUserInfo } from '../MyHandler/interfaces';
 import log from '../../lib/logger';
-import { sendAlert } from '../../lib/DiscordWebhook/export';
+import { sendAlert } from '../DiscordWebhook/export';
 import filterAxiosError from '@tf2autobot/filter-axios-error';
 
 /**

src/classes/Carts/Cart.ts

@@ -5,7 +5,7 @@ import pluralize from 'pluralize';
 import Cart from './Cart';
 import Bot from '../Bot';
 import log from '../../lib/logger';
-import { sendAlert } from '../../lib/DiscordWebhook/export';
+import { sendAlert } from '../DiscordWebhook/export';
 import { uptime } from '../../lib/tools/export';
 import { isBptfBanned } from '../../lib/bans';
 

src/classes/Carts/CartQueue.ts

@@ -514,15 +514,34 @@ export default class UserCart extends Cart {
         };
 
         // Add their items
-        for (const sku in this.their) {
+        for (let sku in this.their) {
             if (!Object.prototype.hasOwnProperty.call(this.their, sku)) {
                 continue;
             }
 
-            let alteredMessage: string;
+            let findByPartialSku = false;
+            let elevatedStrange = false;
+            const item_object = SKU.fromString(sku);
+            if (item_object.quality == 5 && !item_object.effect) {
+                log.debug('Generic Unusual in their cart, finding by partial sku');
+                findByPartialSku = true;
+                if (item_object.quality2 == 11) {
+                    elevatedStrange = true;
+                }
+            }
 
+            let theirAssetids: string[];
             let amount = this.getTheirCount(sku);
-            const theirAssetids = theirInventory.findBySKU(sku, true);
+            if (findByPartialSku) {
+                theirAssetids = theirInventory.findByPartialSku(sku, elevatedStrange);
+                if (theirAssetids.length > 0) {
+                    sku = theirInventory.findByAssetid(theirAssetids[0]);
+                }
+            } else {
+                theirAssetids = theirInventory.findBySKU(sku, true);
+            }
+
+            let alteredMessage: string;
             const theirAssetidsCount = theirAssetids.length;
 
             if (amount > theirAssetidsCount) {
@@ -745,8 +764,23 @@ export default class UserCart extends Cart {
                 continue;
             }
 
+            const item_object = SKU.fromString(sku);
+            let findByPartialSku = false;
+            let elevatedStrange = false;
+            if (item_object.quality == 5 && !item_object.effect) {
+                findByPartialSku = true;
+                if (item_object.quality2 == 11) {
+                    elevatedStrange = true;
+                }
+            }
+
+            let assetids: string[];
             const amount = this.their[sku];
-            let assetids = theirInventory.findBySKU(sku, true);
+            if (findByPartialSku) {
+                assetids = theirInventory.findByPartialSku(sku, elevatedStrange);
+            } else {
+                assetids = theirInventory.findBySKU(sku, true);
+            }
 
             const addToDupeCheckList =
                 this.bot.pricelist

src/classes/Carts/UserCart.ts

@@ -969,11 +969,7 @@ export default class ManagerCommands {
                     );
 
                     this.bot.sendMessage(steamID, '⌛ Installing packages...');
-                    await exec(
-                        `npm install${
-                            process.env.RUN_ON_ANDROID === 'true' ? ' --no-bin-links --force' : ''
-                        } --no-audit`
-                    );
+                    await exec(`npm install${process.env.RUN_ON_ANDROID === 'true' ? ' --no-bin-links --force' : ''}`);
 
                     this.bot.sendMessage(steamID, '⌛ Compiling TypeScript codes into JavaScript...');
                     await exec('npm run build');

src/classes/Commands/sub-classes/Manager.ts

@@ -3,7 +3,7 @@ import Bot from '../../Bot';
 import CommandParser from '../../CommandParser';
 import log from '../../../lib/logger';
 import { generateLinks, timeNow } from '../../../lib/tools/export';
-import { sendPartnerMessage, sendAdminMessage } from '../../../lib/DiscordWebhook/export';
+import { sendPartnerMessage, sendAdminMessage } from '../../DiscordWebhook/export';
 
 export default class MessageCommand {
     constructor(private readonly bot: Bot) {

src/classes/Commands/sub-classes/Message.ts

@@ -6,7 +6,7 @@ import * as timersPromises from 'timers/promises';
 import Bot from '../../Bot';
 import CommandParser from '../../CommandParser';
 import { stats, profit, itemStats, testPriceKey } from '../../../lib/tools/export';
-import { sendStats } from '../../../lib/DiscordWebhook/export';
+import { sendStats } from '../../DiscordWebhook/export';
 import loadPollData, { deletePollData } from '../../../lib/tools/polldata';
 import SteamTradeOfferManager from '@tf2autobot/tradeoffer-manager';
 

src/classes/Commands/sub-classes/Status.ts

@@ -5,10 +5,11 @@ import * as timersPromises from 'timers/promises';
 import { UnknownDictionary } from '../../types/common';
 import { Webhook, sendWebhook } from './export';
 
-import log from '../logger';
-import { BuyAndSell } from '../../classes/Pricelist';
-import Options from '../../classes/Options';
+import log from '../../lib/logger';
+import { BuyAndSell } from '../Pricelist';
+import Options from '../Options';
 import { WebhookError } from './utils';
+import { BotInfo } from '../MyHandler/MyHandler';
 
 const australiumImageURL: { [defindex: number]: string } = {
     // Australium Ambassador
@@ -1789,7 +1790,8 @@ export default function sendWebHookPriceUpdateV1(
     conversion: number,
     buyChangesValue: number | null,
     sellChangesValue: number | null,
-    isCustomPricer: boolean
+    isCustomPricer: boolean,
+    botInfo: BotInfo
 ): void {
     const baseItemData = schema.getItemBySKU(sku);
     const item = SKU.fromString(sku);
@@ -1884,8 +1886,8 @@ export default function sendWebHookPriceUpdateV1(
 
     const opt = options.discordWebhook;
     const priceUpdate: Webhook = {
-        username: opt.displayName,
-        avatar_url: opt.avatarURL,
+        username: opt.displayName || botInfo.name,
+        avatar_url: opt.avatarURL || botInfo.avatarURL,
         content: '',
         embeds: [
             {