Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🎨 show amount offering/offered/taking/taken in overstocked/understocked review/trade summary #421

Merged
merged 1 commit into from
Mar 6, 2021
Merged

🎨 show amount offering/offered/taking/taken in overstocked/understocked review/trade summary #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/classes/MyHandler/MyHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,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);
Expand Down Expand Up @@ -1124,7 +1125,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);
Expand Down Expand Up @@ -1293,7 +1295,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', {
Expand All @@ -1316,7 +1319,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);
Expand Down
4 changes: 2 additions & 2 deletions src/classes/MyHandler/offer/accepted/processAccepted.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})`
);
});
}
Expand All @@ -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})`
);
});
}
Expand Down
8 changes: 6 additions & 2 deletions src/classes/MyHandler/offer/review/reasons/overstocked.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}`);
Expand Down
8 changes: 6 additions & 2 deletions src/classes/MyHandler/offer/review/reasons/understocked.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}`);
Expand Down
2 changes: 2 additions & 0 deletions src/types/modules/@tf2autobot/tradeoffer-manager/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ declare module '@tf2autobot/tradeoffer-manager' {
buying: boolean;
diff: number;
amountCanTrade: number;
amountOffered: number;
}

export interface Understocked {
Expand All @@ -168,6 +169,7 @@ declare module '@tf2autobot/tradeoffer-manager' {
selling: boolean;
diff: number;
amountCanTrade: number;
amountTaking: number;
}

export interface DisabledItems {
Expand Down