prepare v5.1.0

package.json

@@ -26,9 +26,9 @@
     "updateMessage": "Bug fixed",
     "homepage": "https://github.com/TF2Autobot/tf2autobot#readme",
     "dependencies": {
-        "@tf2autobot/bptf-listings": "^5.6.1",
+        "@tf2autobot/bptf-listings": "^5.6.2",
         "@tf2autobot/bptf-login": "^2.3.3",
-        "@tf2autobot/filter-axios-error": "^1.3.0",
+        "@tf2autobot/filter-axios-error": "^1.3.1",
         "@tf2autobot/jsonlint": "^1.0.0",
         "@tf2autobot/steamcommunity": "^3.45.3",
         "@tf2autobot/tf2": "^1.2.1",

src/classes/Bot.ts

@@ -1239,9 +1239,6 @@ export default class Bot {
     }
 
     sendMessage(steamID: SteamID | string, message: string): void {
-        const steamID64 = steamID.toString();
-        const friend = this.friends.getFriend(steamID64);
-
         if (steamID instanceof SteamID && steamID.redirectAnswerTo) {
             const origMessage = steamID.redirectAnswerTo;
             if (origMessage instanceof DiscordMessage) {
@@ -1252,6 +1249,9 @@ export default class Bot {
             return;
         }
 
+        const steamID64 = steamID.toString();
+        const friend = this.friends.getFriend(steamID64);
+
         if (!friend) {
             // If not friend, we send message with chatMessage
             this.client.chatMessage(steamID, message);

src/classes/Commands/Commands.ts

@@ -97,13 +97,16 @@ export default class Commands {
         const command = CommandParser.getCommand(message.toLowerCase());
         const isAdmin = this.bot.isAdmin(steamID);
         const isWhitelisted = this.bot.isWhitelisted(steamID);
+        const isInvalidType = steamID.type === 0;
 
         const checkMessage = message.split(' ').filter(word => word.includes(`!${command}`)).length;
 
         if (checkMessage > 1 && !isAdmin) {
             return this.bot.sendMessage(steamID, "⛔ Don't spam");
         }
 
+        log.debug('Read processMessage');
+
         if (message.startsWith('!')) {
             if (command === 'help') {
                 void this.help.helpCommand(steamID);
@@ -112,34 +115,65 @@ export default class Commands {
             } else if (['price', 'pc'].includes(command)) {
                 this.priceCommand(steamID, message);
             } else if (['buy', 'b', 'sell', 's'].includes(command)) {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.buyOrSellCommand(steamID, message, command as Instant);
             } else if (command === 'buycart') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.buyCartCommand(steamID, message);
             } else if (command === 'sellcart') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.sellCartCommand(steamID, message);
             } else if (command === 'cart') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.cartCommand(steamID);
             } else if (command === 'clearcart') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.clearCartCommand(steamID);
             } else if (command === 'checkout') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.checkoutCommand(steamID);
             } else if (command === 'cancel') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.cancelCommand(steamID);
             } else if (command === 'queue') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
                 this.queueCommand(steamID);
             } else if (['time', 'uptime', 'pure', 'rate', 'owner', 'discord', 'stock'].includes(command)) {
                 if (command === 'stock') {
                     return this.misc.miscCommand(steamID, command as Misc, message);
                 }
                 this.misc.miscCommand(steamID, command as Misc);
+            } else if (['link', 'links'].includes(command)) {
+                this.misc.links(steamID);
+            } else if (command === 'sku') {
+                this.getSKU(steamID, message);
+            } else if (command === 'message') {
+                if (isInvalidType) {
+                    return this.bot.sendMessage(steamID, '❌ Command not available.');
+                }
+                this.message.message(steamID, message);
             } else if (command === 'paints' && isAdmin) {
                 this.misc.paintsCommand(steamID);
             } else if (command === 'more') {
                 this.help.moreCommand(steamID);
             } else if (command === 'autokeys') {
                 this.manager.autokeysCommand(steamID);
-            } else if (command === 'message') {
-                this.message.message(steamID, message);
             } else if (['craftweapon', 'craftweapons', 'uncraftweapon', 'uncraftweapons'].includes(command)) {
                 void this.misc.weaponCommand(
                     steamID,
@@ -247,8 +281,6 @@ export default class Commands {
                 this.donateCartCommand(steamID);
             } else if (command === 'premium' && isAdmin) {
                 this.buyBPTFPremiumCommand(steamID, message);
-            } else if (command === 'sku' && isAdmin) {
-                this.getSKU(steamID, message);
             } else if (command === 'refreshschema' && isAdmin) {
                 this.manager.refreshSchema(steamID);
             } else if (command === 'crafttoken' && isAdmin) {

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

@@ -11,6 +11,25 @@ export default class HelpCommands {
         const isAdmin = this.bot.isAdmin(steamID);
         const isCustomPricer = this.bot.pricelist.isUseCustomPricer;
 
+        if (steamID instanceof SteamID && steamID.redirectAnswerTo && steamID.type === 0) {
+            return this.bot.sendMessage(
+                steamID,
+                `\nDo not include characters <> nor [ ] - <> means required and [] means optional.` +
+                    "\n\n📜 Here's a list of my commands:" +
+                    '\n- ' +
+                    [
+                        '!help - Get a list of commands.',
+                        '!how2trade - Guide on how to trade with the bot.',
+                        "!links - Links to the bot's Steam, Backpack.tf, and Rep.tf.",
+                        '!price [amount] <name> - Get the price and stock of an item.',
+                        "!sku <Full Item Name|Item's sku> - Get the sku of an item.",
+                        "!owner - Get the owner's Steam profile and Backpack.tf links.",
+                        "!discord - Get a link to join TF2Autobot and/or the owner's discord server.",
+                        '!more - Show more available commands list.'
+                    ].join('\n- ')
+            );
+        }
+
         this.bot.sendMessage(
             steamID,
             `📌 Note 📌${

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

@@ -8,6 +8,8 @@ import CommandParser from '../../CommandParser';
 import Bot from '../../Bot';
 import { Discord, Stock } from '../../Options';
 import { pure, timeNow, uptime, testPriceKey } from '../../../lib/tools/export';
+import { killstreakersData, sheensData, spellsData } from '../../../lib/data';
+import { Paints, StrangeParts } from '@tf2autobot/tf2-schema';
 
 type Misc = 'time' | 'uptime' | 'pure' | 'rate' | 'owner' | 'discord' | 'stock';
 type CraftUncraft = 'craftweapon' | 'uncraftweapon';
@@ -17,6 +19,17 @@ export default class MiscCommands {
         this.bot = bot;
     }
 
+    links(SteamID: SteamID): void {
+        const botSteamID = this.bot.client.steamID.getSteamID64();
+
+        this.bot.sendMessage(
+            SteamID,
+            `Steam: <https://steamcommunity.com/profiles/${botSteamID}>` +
+                `\nBackpack.tf: <https://backpack.tf/u/${botSteamID}>` +
+                `\nRep.tf: <https://rep.tf/${botSteamID}>`
+        );
+    }
+
     miscCommand(steamID: SteamID, command: Misc, message?: string): void {
         const opt = this.bot.options.commands[command];
         if (!opt.enable) {
@@ -98,31 +111,60 @@ export default class MiscCommands {
         } else {
             const itemNameOrSku = CommandParser.removeCommand(removeLinkProtocol(message));
             let reply = '';
-            let isWithSomething = false;
 
             if (itemNameOrSku !== '!sku') {
-                if (!testPriceKey(itemNameOrSku)) {
-                    // Receive name
-                    const sku = this.bot.schema.getSkuFromName(itemNameOrSku);
-                    if (itemNameOrSku !== '!stock') {
+                // I don't remember why not `!sku` here.
+                let sku: string = itemNameOrSku;
+                if (itemNameOrSku !== '!stock') {
+                    if (!testPriceKey(itemNameOrSku)) {
+                        // Receive name
+                        sku = this.bot.schema.getSkuFromName(itemNameOrSku);
+
                         if (sku.includes('null') || sku.includes('undefined')) {
-                            reply = `/pre Generated sku: ${sku}\nPlease check the name. If correct, please let us know. Thank you.`;
-                            isWithSomething = true;
-                        } else {
-                            const assetids = this.bot.inventoryManager.getInventory.findBySKU(sku);
-                            reply = `/pre I currently have ${assetids.length} of ${itemNameOrSku} (${sku}).`;
-                            isWithSomething = true;
+                            return this.bot.sendMessage(
+                                steamID,
+                                `/pre ❌ Generated sku: ${sku}\nPlease check the name. If correct, please let us know. Thank you.`
+                            );
                         }
                     }
-                } else {
-                    // Receive sku
-                    const assetids = this.bot.inventoryManager.getInventory.findBySKU(itemNameOrSku);
-                    const name = this.bot.schema.getName(SKU.fromString(itemNameOrSku), false);
 
-                    reply = `/pre I currently have ${assetids.length} of ${name} (${itemNameOrSku}).`;
-                    isWithSomething = true;
+                    const itemDicts = this.bot.inventoryManager.getInventory.getItems[sku] ?? [];
+                    const name = this.bot.schema.getName(SKU.fromString(sku), false);
+
+                    reply = `/pre I currently have ${itemDicts.length} of ${name} (${sku}).`;
+
+                    const assetids: string[] = [];
+                    if (itemDicts.length > 0) {
+                        const hv: string[] = [];
+                        itemDicts.forEach(item => {
+                            if (item.hv) {
+                                Object.keys(item.hv).forEach(attachment => {
+                                    for (const pSku in item.hv[attachment]) {
+                                        if (!Object.prototype.hasOwnProperty.call(item.hv[attachment], pSku)) {
+                                            continue;
+                                        }
+
+                                        const hvName = getAttachmentName(
+                                            attachment,
+                                            pSku,
+                                            this.bot.schema.paints,
+                                            this.bot.strangeParts
+                                        );
+
+                                        hv.push(hvName);
+                                    }
+                                });
+                            }
+
+                            assetids.push(`${item.id}${hv.length > 0 ? ` (${hv.join(', ')})` : ''}`);
+                        });
+                    }
+
+                    reply += assetids.length > 0 ? '\n\nAssetids:\n- ' + assetids.join('\n- ') : '';
+                    return this.bot.sendMessage(steamID, reply);
                 }
             }
+
             const inventory = this.bot.inventoryManager.getInventory;
             const dict = inventory.getItems;
             const items: { amount: number; name: string }[] = [];
@@ -196,7 +238,7 @@ export default class MiscCommands {
             reply += custom
                 ? custom.replace(/%stocklist%/g, stock.join(', \n'))
                 : `${
-                      isWithSomething ? '\n\n' : steamID.redirectAnswerTo instanceof DiscordMessage ? '/pre2' : '/pre '
+                      steamID.redirectAnswerTo instanceof DiscordMessage ? '/pre2' : '/pre '
                   }📜 Here's a list of all the items that I have in my inventory:\n${stock.join(', \n')}`;
 
             if (left > 0) {
@@ -332,3 +374,15 @@ export default class MiscCommands {
         return stock;
     }
 }
+
+function getKeyByValue(object: { [key: string]: any }, value: any): string {
+    return Object.keys(object).find(key => object[key] === value);
+}
+
+function getAttachmentName(attachment: string, pSku: string, paints: Paints, parts: StrangeParts): string {
+    if (attachment === 's') return getKeyByValue(spellsData, pSku);
+    else if (attachment === 'sp') return getKeyByValue(parts, pSku);
+    else if (attachment === 'ke') return getKeyByValue(killstreakersData, pSku);
+    else if (attachment === 'ks') return getKeyByValue(sheensData, pSku);
+    else if (attachment === 'p') return getKeyByValue(paints, parseInt(pSku.replace('p', '')));
+}

src/classes/DiscordBot.ts

@@ -58,19 +58,27 @@ export default class DiscordBot {
             return; // Ignore webhook messages
         }
 
+        if (!message.content.startsWith('!')) {
+            return; // Ignore message that not start with !
+        }
+
         log.info(
             `Got new message ${String(message.content)} from ${message.author.tag} (${String(message.author.id)})`
         );
-        if (!this.isDiscordAdmin(message.author.id)) {
-            return; // obey only admins
-        }
 
         if (!this.bot.isReady) {
             this.sendAnswer(message, '🛑 The bot is still booting up, please wait');
             return;
         }
 
         try {
+            if (!this.isDiscordAdmin(message.author.id)) {
+                // Will return default invalid value
+                const dummySteamID = new SteamID(null);
+                dummySteamID.redirectAnswerTo = message;
+                return await this.bot.handler.onMessage(dummySteamID, message.content);
+            }
+
             const adminID = this.getAdminBy(message.author.id);
             adminID.redirectAnswerTo = message;
             await this.bot.handler.onMessage(adminID, message.content);