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 issue #222 #225

Merged
merged 3 commits into from
Sep 26, 2024
Merged

Fix issue #222 #225

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f944a8f
Fix issues/222
SeRi0uS007 Aug 19, 2024
15489b5
Fix issue #222
SeRi0uS007 Aug 20, 2024
c6a87b2
Fix issue #222
SeRi0uS007 Aug 20, 2024
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
40 changes: 23 additions & 17 deletions code.user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
requestStorageHash = `${requestStorageHash}:steamcommunity.com/market`;
delayBetweenRequests = 1000;
}

const lastRequest = JSON.parse(getLocalStorageItem(requestStorageHash) || JSON.stringify({ time: new Date(0), limited: false }));
const timeSinceLastRequest = Date.now() - new Date(lastRequest.time).getTime();

Expand Down Expand Up @@ -150,7 +150,7 @@
callback(error, data);
} else {
callback(null, data)
}
}
},
error: (xhr) => {
if (xhr.status === 429) {
Expand Down Expand Up @@ -500,7 +500,7 @@
// Price is before fees.
SteamMarket.prototype.sellItem = function(item, price, callback /*err, data*/) {
const url = `${window.location.origin}/market/sellitem/`;

const options = {
method: 'POST',
data: {
Expand All @@ -520,15 +520,15 @@
// Removes an item.
// Item is the unique item id.
SteamMarket.prototype.removeListing = function(item, isBuyOrder, callback /*err, data*/) {
const url = isBuyOrder
? `${window.location.origin}/market/cancelbuyorder/`
const url = isBuyOrder
? `${window.location.origin}/market/cancelbuyorder/`
: `${window.location.origin}/market/removelisting/${item}`;

const options = {
method: 'POST',
data: {
sessionid: readCookie('sessionid'),
...(isBuyOrder ? { buy_orderid: item } : {})
data: {
sessionid: readCookie('sessionid'),
...(isBuyOrder ? { buy_orderid: item } : {})
},
responseType: 'json'
};
Expand Down Expand Up @@ -735,7 +735,7 @@
};

request(
url,
url,
options,
(error, data) => {
if (error) {
Expand Down Expand Up @@ -800,7 +800,7 @@
const options = { method: 'GET' };

request(
url,
url,
options,
(error, data) => {
if (error) {
Expand Down Expand Up @@ -1333,7 +1333,7 @@

logDOM(`${padLeft} - ${itemName} not added to market${message ? ` because: ${message.charAt(0).toLowerCase()}${message.slice(1)}` : '.'}`);
$(`#${task.item.appid}_${task.item.contextid}_${itemId}`).css('background', COLOR_ERROR);

callback();
}
);
Expand Down Expand Up @@ -2566,6 +2566,12 @@
}
}

// Match number part from any currency format
const getPriceValueAsInt = listing =>
unsafeWindow.GetPriceValueAsInt(
listing.match(/(?<price>[0-9][0-9 .,]*)/)?.groups?.price ?? 0
);

const marketListingsQueue = async.queue((listing, next) => {
marketListingsQueueWorker(
listing,
Expand Down Expand Up @@ -2634,7 +2640,7 @@
const listingUI = $(getListingFromLists(listing.listingid).elm);

const game_name = asset.type;
const price = unsafeWindow.GetPriceValueAsInt($('.market_listing_price > span:nth-child(1) > span:nth-child(1)', listingUI).text());
const price = getPriceValueAsInt($('.market_listing_price > span:nth-child(1) > span:nth-child(1)', listingUI).text());

if (price <= getSettingWithDefault(SETTING_PRICE_MIN_CHECK_PRICE) * 100) {
$('.market_listing_my_price', listingUI).last().css('background', COLOR_PRICE_NOT_CHECKED);
Expand Down Expand Up @@ -2883,7 +2889,7 @@
increaseMarketProgress();
next();
};

if (success) {
setTimeout(callback, getRandomInt(50, 100));
} else {
Expand Down Expand Up @@ -3075,8 +3081,8 @@
return {};
}

const priceBuyer = unsafeWindow.GetPriceValueAsInt($('.market_listing_price > span:nth-child(1) > span:nth-child(1)', listing.elm).text());
const priceSeller = unsafeWindow.GetPriceValueAsInt($('.market_listing_price > span:nth-child(1) > span:nth-child(3)', listing.elm).text());
const priceBuyer = getPriceValueAsInt($('.market_listing_price > span:nth-child(1) > span:nth-child(1)', listing.elm).text());
const priceSeller = getPriceValueAsInt($('.market_listing_price > span:nth-child(1) > span:nth-child(3)', listing.elm).text());
const itemIds = actionButton.split(',');
const appid = replaceNonNumbers(itemIds[2]);
const contextid = replaceNonNumbers(itemIds[3]);
Expand Down Expand Up @@ -3349,8 +3355,8 @@
let listingPriceB = $(b.values().market_listing_price).text();
listingPriceB = listingPriceB.substr(0, listingPriceB.indexOf('('));

const firstPrice = unsafeWindow.GetPriceValueAsInt(listingPriceA);
const secondPrice = unsafeWindow.GetPriceValueAsInt(listingPriceB);
const firstPrice = getPriceValueAsInt(listingPriceA);
const secondPrice = getPriceValueAsInt(listingPriceB);

return firstPrice - secondPrice;
}
Expand Down