🔀Merge pull request #421 from TF2Autobot/show-amount-offered

🎨 show amount offering/offered/taking/taken in overstocked/understocked review/trade summary
TF2Autobot · Mar 6, 2021 · b2c6102 · b2c6102
2 parents 4ea0561 + c526099
commit b2c6102
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/src/classes/MyHandler/MyHandler.ts b/src/classes/MyHandler/MyHandler.ts
@@ -1091,7 +1091,8 @@ export default class MyHandler extends Handler {
                                     sku: sku,
                                     buying: isBuying,
                                     diff: diff,
-                                    amountCanTrade: amountCanTrade
+                                    amountCanTrade: amountCanTrade,
+                                    amountOffered: amount
                                 });
 
                                 this.bot.listings.checkBySKU(match.sku, null, which === 'their', true);
@@ -1120,7 +1121,8 @@ export default class MyHandler extends Handler {
                                     sku: sku,
                                     selling: !isBuying,
                                     diff: diff,
-                                    amountCanTrade: amountCanTrade
+                                    amountCanTrade: amountCanTrade,
+                                    amountTaking: amount
                                 });
 
                                 this.bot.listings.checkBySKU(match.sku, null, which === 'their', true);
@@ -1289,7 +1291,8 @@ export default class MyHandler extends Handler {
                         sku: '5021;6',
                         buying: isBuying,
                         diff: diff,
-                        amountCanTrade: amountCanTrade
+                        amountCanTrade: amountCanTrade,
+                        amountOffered: itemsDict['their']['5021;6']
                     });
 
                     log.debug('OVERSTOCKED', {
@@ -1312,7 +1315,8 @@ export default class MyHandler extends Handler {
                         sku: '5021;6',
                         selling: !isBuying,
                         diff: diff,
-                        amountCanTrade: amountCanTrade
+                        amountCanTrade: amountCanTrade,
+                        amountTaking: itemsDict['our']['5021;6']
                     });
 
                     this.bot.listings.checkBySKU('5021;6', null, false, true);

diff --git a/src/classes/MyHandler/offer/accepted/processAccepted.ts b/src/classes/MyHandler/offer/accepted/processAccepted.ts
@@ -67,7 +67,7 @@ export default function processAccepted(
                             isWebhookEnabled
                                 ? `_${bot.schema.getName(SKU.fromString(el.sku), false)}_`
                                 : bot.schema.getName(SKU.fromString(el.sku), false)
-                        } (amount can buy was ${el.amountCanTrade})`
+                        } (amount can buy was ${el.amountCanTrade}, offered ${el.amountOffered})`
                     );
                 });
             }
@@ -81,7 +81,7 @@ export default function processAccepted(
                             isWebhookEnabled
                                 ? `_${bot.schema.getName(SKU.fromString(el.sku), false)}_`
                                 : bot.schema.getName(SKU.fromString(el.sku), false)
-                        } (amount can sell was ${el.amountCanTrade})`
+                        } (amount can sell was ${el.amountCanTrade}, taken ${el.amountTaking})`
                     );
                 });
             }

diff --git a/src/classes/MyHandler/offer/review/reasons/overstocked.ts b/src/classes/MyHandler/offer/review/reasons/overstocked.ts
@@ -11,11 +11,15 @@ export default function overstocked(meta: Meta, bot: Bot): { note: string; name:
     (meta.reasons.filter(el => el.reason.includes('🟦_OVERSTOCKED')) as Overstocked[]).forEach(el => {
         if (opt.enable && opt.url !== '') {
             overstockedForOur.push(
-                `_${bot.schema.getName(SKU.fromString(el.sku), false)}_ (can only buy ${el.amountCanTrade})`
+                `_${bot.schema.getName(SKU.fromString(el.sku), false)}_ (can only buy ${el.amountCanTrade}, offering ${
+                    el.amountOffered
+                })`
             );
         } else {
             overstockedForOur.push(
-                `${bot.schema.getName(SKU.fromString(el.sku), false)} (can only buy ${el.amountCanTrade})`
+                `${bot.schema.getName(SKU.fromString(el.sku), false)} (can only buy ${el.amountCanTrade}, offering ${
+                    el.amountOffered
+                })`
             );
         }
         overstockedForTheir.push(`${el.amountCanTrade} - ${bot.schema.getName(SKU.fromString(el.sku), false)}`);

diff --git a/src/classes/MyHandler/offer/review/reasons/understocked.ts b/src/classes/MyHandler/offer/review/reasons/understocked.ts
@@ -11,11 +11,15 @@ export default function understocked(meta: Meta, bot: Bot): { note: string; name
     (meta.reasons.filter(el => el.reason.includes('🟩_UNDERSTOCKED')) as Understocked[]).forEach(el => {
         if (opt.enable && opt.url !== '') {
             understockedForOur.push(
-                `_${bot.schema.getName(SKU.fromString(el.sku), false)}_ (can only sell ${el.amountCanTrade})`
+                `_${bot.schema.getName(SKU.fromString(el.sku), false)}_ (can only sell ${el.amountCanTrade}, taking ${
+                    el.amountTaking
+                })`
             );
         } else {
             understockedForOur.push(
-                `${bot.schema.getName(SKU.fromString(el.sku), false)} (can only sell ${el.amountCanTrade})`
+                `${bot.schema.getName(SKU.fromString(el.sku), false)} (can only sell ${el.amountCanTrade}, taking ${
+                    el.amountTaking
+                })`
             );
         }
         understockedForTheir.push(`${el.amountCanTrade} - ${bot.schema.getName(SKU.fromString(el.sku), false)}`);

diff --git a/src/types/modules/@tf2autobot/tradeoffer-manager/index.d.ts b/src/types/modules/@tf2autobot/tradeoffer-manager/index.d.ts
@@ -160,6 +160,7 @@ declare module '@tf2autobot/tradeoffer-manager' {
             buying: boolean;
             diff: number;
             amountCanTrade: number;
+            amountOffered: number;
         }
 
         export interface Understocked {
@@ -168,6 +169,7 @@ declare module '@tf2autobot/tradeoffer-manager' {
             selling: boolean;
             diff: number;
             amountCanTrade: number;
+            amountTaking: number;
         }
 
         export interface DisabledItems {