Skip to content

Fixes Sending Cancel Ping if Trade Rolled Back #340

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

Merged
merged 1 commit into from
Aug 12, 2025
Merged

Fixes Sending Cancel Ping if Trade Rolled Back #340

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
2 changes: 1 addition & 1 deletion src/lib/alarms/csfloat_trade_pings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ async function pingUpdates(pendingTrades: Trade[]): Promise<UpdateErrors> {
}

try {
await pingCancelTrades(pendingTrades);
await pingCancelTrades(pendingTrades, tradeHistory);
} catch (e) {
console.error('failed to ping cancel ping trade offers', e);
}
Expand Down
27 changes: 20 additions & 7 deletions src/lib/alarms/trade_offer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {TradeOfferState} from '../types/steam_constants';
import {TradeOfferState, TradeStatus} from '../types/steam_constants';
import {Trade, TradeState} from '../types/float_market';
import {OfferStatus, TradeOfferStatus, TradeOffersType} from '../bridge/handlers/trade_offer_status';
import {clearAccessTokenFromStorage, getAccessToken} from './access_token';
Expand All @@ -9,6 +9,7 @@ import {FetchSteamUser} from '../bridge/handlers/fetch_steam_user';
import {rgDescription} from '../types/steam';
import {HasPermissions} from '../bridge/handlers/has_permissions';
import {convertSteamID32To64} from '../utils/userinfo';
import {TradeHistoryStatus} from '../bridge/handlers/trade_history_status';

export async function pingSentTradeOffers(pendingTrades: Trade[]) {
const {offers, type} = await getSentTradeOffers();
Expand Down Expand Up @@ -67,7 +68,7 @@ export async function pingSentTradeOffers(pendingTrades: Trade[]) {
}
}

export async function pingCancelTrades(pendingTrades: Trade[]) {
export async function pingCancelTrades(pendingTrades: Trade[], tradeHistory: TradeHistoryStatus[]) {
const hasWaitForCancelPing = pendingTrades.find((e) => e.state === TradeState.PENDING && e.wait_for_cancel_ping);
if (!hasWaitForCancelPing) {
// Nothing to process/ping, exit
Expand All @@ -88,14 +89,26 @@ export async function pingCancelTrades(pendingTrades: Trade[]) {
}

const tradeOffer = allTradeOffers.find((e) => e.offer_id === trade.steam_offer.id);
if (
tradeOffer &&
(tradeOffer.state === TradeOfferState.Active || tradeOffer.state === TradeOfferState.Accepted)
) {
// We don't want to send a cancel ping if the offer is active or valid
if (tradeOffer?.state === TradeOfferState.Active) {
// We don't want to send a cancel ping if the offer is active since it can still become accepted
continue;
}

if (tradeOffer?.state === TradeOfferState.Accepted) {
// We want to check whether the trade was rolled back from the buyer's perspective -- if so, we still want to ping
const rolledBackTrade = (tradeHistory || []).find(
(e) =>
e.status === TradeStatus.TradeProtectionRollback &&
!!e.received_assets.find((a) => a.asset_id === trade.contract?.item?.asset_id)
);
if (!rolledBackTrade) {
// no rollback, trade offer was accepted, shouldn't cancel
continue;
}
}

// No active/accepted offer, or it was rolled back

try {
await PingCancelTrade.handleRequest({trade_id: trade.id, steam_id: tradeOffers.steam_id}, {});
} catch (e) {
Expand Down