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

fix bot crash when backpack.tf or Steam down #44

Merged
merged 3 commits into from
Aug 2, 2020
Merged

fix bot crash when backpack.tf or Steam down #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24cf715
fix bot crashed here
idinium96 Aug 1, 2020
23c5d3d
change it to be like this
idinium96 Aug 1, 2020
f21ef28
add note to owner
idinium96 Aug 1, 2020
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
15 changes: 7 additions & 8 deletions src/classes/DiscordWebhook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ export = class DiscordWebhook {

sendOfferReview(
offer: TradeOffer,
reason: string,
reasons: string,
pureStock: string[],
time: string,
Expand Down Expand Up @@ -260,13 +259,13 @@ export = class DiscordWebhook {
},
title: '',
description:
`⚠️ An offer sent by ${partnerNameNoFormat} is waiting for review.\nReason: ${
reason === '⬜BACKPACKTF_DOWN'
? '⬜BACKPACKTF_DOWN - failed to check banned status'
: reason === '⬜STEAM_DOWN'
? '⬜STEAM_DOWN - failed to check escrow status'
: reasons
}\n\n__Offer Summary__:\n` +
`⚠️ An offer sent by ${partnerNameNoFormat} is waiting for review.\nReason: ${reasons}` +
(reasons.includes('⬜BACKPACKTF_DOWN')
? '\n\nBackpack.tf down, please manually check if this person is banned before accepting the offer.'
: reasons.includes('⬜STEAM_DOWN')
? '\n\nSteam down, please manually check if this person have escrow.'
: '') +
`\n\n__Offer Summary__:\n` +
tradeSummary.replace('Asked:', '**Asked:**').replace('Offered:', '**Offered:**') +
(value.diff > 0
? `\n📈 ***Profit from overpay:*** ${value.diffRef} ref` +
Expand Down
52 changes: 39 additions & 13 deletions src/classes/MyHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,14 @@ export = class MyHandler extends Handler {
reason: '🟫DUPED_ITEMS';
assetid: string;
}
| {
reason: '⬜STEAM_DOWN';
error?: string;
}
| {
reason: '⬜BACKPACKTF_DOWN';
error?: string;
}
)[] = [];

let assetidsToCheck = [];
Expand Down Expand Up @@ -954,7 +962,17 @@ export = class MyHandler extends Handler {
}
} catch (err) {
log.warn('Failed to check escrow: ', err);
return { action: 'skip', reason: '⬜STEAM_DOWN' };
const reasons = wrongAboutOffer.map(wrong => wrong.reason);
const uniqueReasons = reasons.filter(reason => reasons.includes(reason));

return {
action: 'skip',
reason: '⬜STEAM_DOWN',
meta: {
uniqueReasons: uniqueReasons,
reasons: wrongAboutOffer
}
};
}

offer.log('info', 'checking bans...');
Expand All @@ -968,7 +986,17 @@ export = class MyHandler extends Handler {
}
} catch (err) {
log.warn('Failed to check banned: ', err);
return { action: 'skip', reason: '⬜BACKPACKTF_DOWN' };
const reasons = wrongAboutOffer.map(wrong => wrong.reason);
const uniqueReasons = reasons.filter(reason => reasons.includes(reason));

return {
action: 'skip',
reason: '⬜BACKPACKTF_DOWN',
meta: {
uniqueReasons: uniqueReasons,
reasons: wrongAboutOffer
}
};
}

if (this.dupeCheckEnabled && assetidsToCheck.length > 0) {
Expand Down Expand Up @@ -1469,12 +1497,12 @@ export = class MyHandler extends Handler {
(itemsList.their.includes('5021;6') ? `${value.diffKey}]` : `${value.diffRef} ref]`);
}
// Notify partner and admin that the offer is waiting for manual review
if (reason === '⬜BACKPACKTF_DOWN' || reason === '⬜STEAM_DOWN') {
if (reasons.includes('⬜BACKPACKTF_DOWN') || reasons.includes('⬜STEAM_DOWN')) {
this.bot.sendMessage(
offer.partner,
(reason === '⬜BACKPACKTF_DOWN' ? 'Backpack.tf' : 'Steam') +
(reasons.includes('⬜BACKPACKTF_DOWN') ? 'Backpack.tf' : 'Steam') +
' is down and I failed to check your ' +
(reason === '⬜BACKPACKTF_DOWN' ? 'backpack.tf' : 'Escrow') +
(reasons.includes('⬜BACKPACKTF_DOWN') ? 'backpack.tf' : 'Escrow') +
' status, please wait for my owner to manually accept/decline your offer.'
);
} else {
Expand Down Expand Up @@ -1513,7 +1541,6 @@ export = class MyHandler extends Handler {
) {
this.discord.sendOfferReview(
offer,
reason,
reasons.join(', '),
pureStock,
timeWithEmojis.time,
Expand All @@ -1531,13 +1558,12 @@ export = class MyHandler extends Handler {
const offerMessage = offer.message;
this.bot.messageAdmins(
`⚠️ Offer #${offer.id} from ${offer.partner} is waiting for review.` +
`\nReason: ${
reason === '⬜BACKPACKTF_DOWN'
? '⬜BACKPACKTF_DOWN - failed to check banned status'
: reason === '⬜STEAM_DOWN'
? '⬜STEAM_DOWN - failed to check escrow status'
: meta.uniqueReasons.join(', ')
}` +
`\nReason: ${meta.uniqueReasons.join(', ')}` +
(reasons.includes('⬜BACKPACKTF_DOWN')
? '\nBackpack.tf down, please manually check if this person is banned before accepting the offer.'
: reasons.includes('⬜STEAM_DOWN')
? '\nSteam down, please manually check if this person have escrow.'
: '') +
`\n\nOffer Summary:\n${offer.summarize(this.bot.schema)}${
value.diff > 0
? `\n📈 Profit from overpay: ${value.diffRef} ref` +
Expand Down