From 3887959430da571068fee5667ca0ae7bc78b466a Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Sat, 20 Jul 2024 11:09:22 +0300 Subject: [PATCH] Prefer arrow functions --- code.user.js | 270 +++++++++++++++++++++++----------------------- eslint.config.mjs | 1 + 2 files changed, 136 insertions(+), 135 deletions(-) diff --git a/code.user.js b/code.user.js index 0b493c2..46a1bbc 100644 --- a/code.user.js +++ b/code.user.js @@ -300,7 +300,7 @@ // Highest average price in the last xx hours. const timeAgo = Date.now() - getSettingWithDefault(SETTING_PRICE_HISTORY_HOURS) * 60 * 60 * 1000; - history.forEach(function(historyItem) { + history.forEach((historyItem) => { const d = new Date(historyItem[0]); if (d.getTime() > timeAgo) { highest += historyItem[1] * historyItem[2]; @@ -529,14 +529,14 @@ const storage_hash = 'pricehistory_' + appid + '+' + market_name; storageSession.getItem(storage_hash). - then(function(value) { + then((value) => { if (value != null) { callback(ERROR_SUCCESS, value, true); } else { market.getCurrentPriceHistory(appid, market_name, callback); } }). - catch(function() { + catch(() => { market.getCurrentPriceHistory(appid, market_name, callback); }); } else { @@ -672,7 +672,7 @@ $.get( url, - function(data) { + (data) => { if (!data || !data.success || !data.prices) { callback(ERROR_DATA); return; @@ -692,7 +692,7 @@ }, 'json' ). - fail(function(data) { + fail((data) => { if (!data || !data.responseJSON) { return callback(ERROR_FAILED); } @@ -719,14 +719,14 @@ const storage_hash = 'itemnameid_' + appid + '+' + market_name; storagePersistent.getItem(storage_hash). - then(function(value) { + then((value) => { if (value != null) { callback(ERROR_SUCCESS, value); } else { return market.getCurrentMarketItemNameId(appid, market_name, callback); } }). - catch(function() { + catch(() => { return market.getCurrentMarketItemNameId(appid, market_name, callback); }); } catch { @@ -739,7 +739,7 @@ const url = window.location.origin + '/market/listings/' + appid + '/' + market_name; $.get( url, - function(page) { + (page) => { const matches = (/Market_LoadOrderSpread\( (\d+) \);/).exec(page); if (matches == null) { callback(ERROR_DATA); @@ -755,7 +755,7 @@ callback(ERROR_SUCCESS, item_nameid); } ). - fail(function(e) { + fail((e) => { return callback(ERROR_FAILED, e.status); }); }; @@ -791,14 +791,14 @@ if (cache) { const storage_hash = 'itemordershistogram_' + appid + '+' + market_name; storageSession.getItem(storage_hash). - then(function(value) { + then((value) => { if (value != null) { callback(ERROR_SUCCESS, value, true); } else { market.getCurrentItemOrdersHistogram(item, market_name, callback); } }). - catch(function() { + catch(() => { market.getCurrentItemOrdersHistogram(item, market_name, callback); }); } else { @@ -814,7 +814,7 @@ SteamMarket.prototype.getCurrentItemOrdersHistogram = function(item, market_name, callback) { market.getMarketItemNameId( item, - function(error, item_nameid) { + (error, item_nameid) => { if (error) { if (item_nameid != 429) { // 429 = Too many requests made. callback(ERROR_DATA); @@ -834,7 +834,7 @@ $.get( url, - function(histogram) { + (histogram) => { // Store the histogram in the session storage. const storage_hash = 'itemordershistogram_' + item.appid + '+' + market_name; storageSession.setItem(storage_hash, histogram); @@ -842,7 +842,7 @@ callback(ERROR_SUCCESS, histogram, false); } ). - fail(function() { + fail(() => { return callback(ERROR_FAILED, null); }); } @@ -947,7 +947,7 @@ : null; if (tags != null) { let isTaggedAsCrate = false; - tags.forEach(function(arrayItem) { + tags.forEach((arrayItem) => { if (arrayItem.category == 'Type') { if (arrayItem.internal_name == 'Supply Crate') { isTaggedAsCrate = true; @@ -973,7 +973,7 @@ : null; if (tags != null) { let isTaggedAsTradingCard = false; - tags.forEach(function(arrayItem) { + tags.forEach((arrayItem) => { if (arrayItem.category == 'item_class') { if (arrayItem.internal_name == 'item_class_2') { // trading card. isTaggedAsTradingCard = true; @@ -1021,7 +1021,7 @@ : null; if (tags != null) { let isTaggedAsFoilTradingCard = false; - tags.forEach(function(arrayItem) { + tags.forEach((arrayItem) => { if (arrayItem.category == 'cardborder' && arrayItem.internal_name == 'cardborder_1') { // foil border. isTaggedAsFoilTradingCard = true; } @@ -1223,11 +1223,11 @@ } const sellQueue = async.queue( - function(task, next) { + (task, next) => { market.sellItem( task.item, task.sellPrice, - function(err, data) { + (err, data) => { totalNumberOfProcessedQueueItems++; const digits = getNumberOfDigits(totalNumberOfQueuedItems); @@ -1263,7 +1263,7 @@ sellQueue.unshift(task); sellQueue.pause(); - setTimeout(function() { + setTimeout(() => { sellQueue.resume(); }, getRandomInt(30000, 45000)); } else { @@ -1295,11 +1295,11 @@ function sellAllItems() { loadAllInventories().then( - function() { + () => { const items = getInventoryItems(); const filteredItems = []; - items.forEach(function(item) { + items.forEach((item) => { if (!item.marketable) { return; } @@ -1309,7 +1309,7 @@ sellItems(filteredItems); }, - function() { + () => { logDOM('Could not retrieve the inventory...'); } ); @@ -1317,12 +1317,12 @@ function sellAllDuplicateItems() { loadAllInventories().then( - function() { + () => { const items = getInventoryItems(); const marketableItems = []; let filteredItems = []; - items.forEach(function(item) { + items.forEach((item) => { if (!item.marketable) { return; } @@ -1334,7 +1334,7 @@ sellItems(filteredItems); }, - function() { + () => { logDOM('Could not retrieve the inventory...'); } ); @@ -1342,14 +1342,14 @@ function gemAllDuplicateItems() { loadAllInventories().then( - function() { + () => { const items = getInventoryItems(); let filteredItems = []; let numberOfQueuedItems = 0; filteredItems = items.filter((e, i) => items.map((m) => m.classid).indexOf(e.classid) !== i); - filteredItems.forEach(function(item) { + filteredItems.forEach((item) => { if (item.queued != null) { return; } @@ -1384,7 +1384,7 @@ ''); } }, - function() { + () => { logDOM('Could not retrieve the inventory...'); } ); @@ -1392,11 +1392,11 @@ function sellAllCards() { loadAllInventories().then( - function() { + () => { const items = getInventoryItems(); const filteredItems = []; - items.forEach(function(item) { + items.forEach((item) => { if (!getIsTradingCard(item) || !item.marketable) { return; } @@ -1406,7 +1406,7 @@ sellItems(filteredItems); }, - function() { + () => { logDOM('Could not retrieve the inventory...'); } ); @@ -1414,10 +1414,10 @@ function sellAllCrates() { loadAllInventories().then( - function() { + () => { const items = getInventoryItems(); const filteredItems = []; - items.forEach(function(item) { + items.forEach((item) => { if (!getIsCrate(item) || !item.marketable) { return; } @@ -1426,16 +1426,16 @@ sellItems(filteredItems); }, - function() { + () => { logDOM('Could not retrieve the inventory...'); } ); } - const scrapQueue = async.queue(function(item, next) { - scrapQueueWorker(item, function(success) { + const scrapQueue = async.queue((item, next) => { + scrapQueueWorker(item, (success) => { if (success) { - setTimeout(function() { + setTimeout(() => { next(); }, 250); } else { @@ -1447,7 +1447,7 @@ numberOfFailedRequests = 0; } - setTimeout(function() { + setTimeout(() => { next(); }, delay); } @@ -1464,7 +1464,7 @@ market.getGooValue( item, - function(err, goo) { + (err, goo) => { totalNumberOfProcessedQueueItems++; const digits = getNumberOfDigits(totalNumberOfQueuedItems); @@ -1482,7 +1482,7 @@ market.grindIntoGoo( item, - function(err) { + (err) => { if (err != ERROR_SUCCESS) { logConsole('Failed to turn item into gems for ' + itemName); logDOM(padLeft + ' - ' + itemName + ' not turned into gems due to unknown error.'); @@ -1507,10 +1507,10 @@ ); } - const boosterQueue = async.queue(function(item, next) { - boosterQueueWorker(item, function(success) { + const boosterQueue = async.queue((item, next) => { + boosterQueueWorker(item, (success) => { if (success) { - setTimeout(function() { + setTimeout(() => { next(); }, 250); } else { @@ -1522,7 +1522,7 @@ numberOfFailedRequests = 0; } - setTimeout(function() { + setTimeout(() => { next(); }, delay); } @@ -1539,7 +1539,7 @@ market.unpackBoosterPack( item, - function(err) { + (err) => { totalNumberOfProcessedQueueItems++; const digits = getNumberOfDigits(totalNumberOfQueuedItems); @@ -1566,11 +1566,11 @@ function turnSelectedItemsIntoGems() { const ids = getSelectedItems(); - loadAllInventories().then(function() { + loadAllInventories().then(() => { const items = getInventoryItems(); let numberOfQueuedItems = 0; - items.forEach(function(item) { + items.forEach((item) => { // Ignored queued items. if (item.queued != null) { return; @@ -1608,7 +1608,7 @@ '
Processing ' + numberOfQueuedItems + ' items
' + ''); } - }, function() { + }, () => { logDOM('Could not retrieve the inventory...'); }); } @@ -1617,11 +1617,11 @@ function unpackSelectedBoosterPacks() { const ids = getSelectedItems(); - loadAllInventories().then(function() { + loadAllInventories().then(() => { const items = getInventoryItems(); let numberOfQueuedItems = 0; - items.forEach(function(item) { + items.forEach((item) => { // Ignored queued items. if (item.queued != null) { return; @@ -1659,13 +1659,13 @@ '
Processing ' + numberOfQueuedItems + ' items
' + ''); } - }, function() { + }, () => { logDOM('Could not retrieve the inventory...'); }); } function sellSelectedItems() { - getInventorySelectedMarketableItems(function(items) { + getInventorySelectedMarketableItems((items) => { sellItems(items); }); } @@ -1676,7 +1676,7 @@ const contextid = items[0].contextid; let hasInvalidItem = false; - items.forEach(function(item) { + items.forEach((item) => { if (item.contextid != contextid || item.commodity == false) { hasInvalidItem = true; } @@ -1686,7 +1686,7 @@ } function sellSelectedItemsManually() { - getInventorySelectedMarketableItems(function(items) { + getInventorySelectedMarketableItems((items) => { // We have to construct an URL like this // https://steamcommunity.com/market/multisell?appid=730&contextid=2&items[]=Falchion%20Case&qty[]=100 @@ -1695,7 +1695,7 @@ const itemsWithQty = {}; - items.forEach(function(item) { + items.forEach((item) => { itemsWithQty[item.market_hash_name] = itemsWithQty[item.market_hash_name] + 1 || 1; }); @@ -1708,8 +1708,8 @@ const redirectUrl = baseUrl + '?appid=' + appid + '&contextid=' + contextid + itemsString; const dialog = unsafeWindow.ShowDialog('Steam Economy Enhancer', ''); - dialog.OnDismiss(function() { - items.forEach(function(item) { + dialog.OnDismiss(() => { + items.forEach((item) => { const itemId = item.assetid || item.id; $('#' + item.appid + '_' + item.contextid + '_' + itemId).css('background', COLOR_PENDING); }); @@ -1726,7 +1726,7 @@ let numberOfQueuedItems = 0; - items.forEach(function(item) { + items.forEach((item) => { // Ignored queued items. if (item.queued != null) { return; @@ -1749,14 +1749,14 @@ } } - const itemQueue = async.queue(function(item, next) { + const itemQueue = async.queue((item, next) => { itemQueueWorker( item, item.ignoreErrors, - function(success, cached) { + (success, cached) => { if (success) { setTimeout( - function() { + () => { next(); }, cached ? 0 : getRandomInt(1000, 1500) @@ -1776,7 +1776,7 @@ } setTimeout( - function() { + () => { next(); }, cached ? 0 : delay @@ -1795,7 +1795,7 @@ market.getPriceHistory( item, true, - function(err, history, cachedHistory) { + (err, history, cachedHistory) => { if (err) { logConsole('Failed to get price history for ' + itemName); @@ -1807,7 +1807,7 @@ market.getItemOrdersHistogram( item, true, - function(err, histogram, cachedListings) { + (err, histogram, cachedListings) => { if (err) { logConsole('Failed to get orders histogram for ' + itemName); @@ -1859,7 +1859,7 @@ $('.games_list_tabs').on( 'click', '*', - function() { + () => { updateInventoryUI(isOwnInventory); } ); @@ -1935,11 +1935,11 @@ function getInventorySelectedMarketableItems(callback) { const ids = getSelectedItems(); - loadAllInventories().then(function() { + loadAllInventories().then(() => { const items = getInventoryItems(); const filteredItems = []; - items.forEach(function(item) { + items.forEach((item) => { if (!item.marketable) { return; } @@ -1951,7 +1951,7 @@ }); callback(filteredItems); - }, function() { + }, () => { logDOM('Could not retrieve the inventory...'); }); } @@ -1960,11 +1960,11 @@ function getInventorySelectedGemsItems(callback) { const ids = getSelectedItems(); - loadAllInventories().then(function() { + loadAllInventories().then(() => { const items = getInventoryItems(); const filteredItems = []; - items.forEach(function(item) { + items.forEach((item) => { let canTurnIntoGems = false; for (const owner_action in item.owner_actions) { if (item.owner_actions[owner_action].link != null && item.owner_actions[owner_action].link.includes('GetGooValue')) { @@ -1983,7 +1983,7 @@ }); callback(filteredItems); - }, function() { + }, () => { logDOM('Could not retrieve the inventory...'); }); } @@ -1992,11 +1992,11 @@ function getInventorySelectedBoosterPackItems(callback) { const ids = getSelectedItems(); - loadAllInventories().then(function() { + loadAllInventories().then(() => { const items = getInventoryItems(); const filteredItems = []; - items.forEach(function(item) { + items.forEach((item) => { let canOpenBooster = false; for (const owner_action in item.owner_actions) { if (item.owner_actions[owner_action].link != null && item.owner_actions[owner_action].link.includes('OpenBooster')) { @@ -2015,14 +2015,14 @@ }); callback(filteredItems); - }, function() { + }, () => { logDOM('Could not retrieve the inventory...'); }); } // Updates the (selected) sell ... items button. function updateSellSelectedButton() { - getInventorySelectedMarketableItems(function(items) { + getInventorySelectedMarketableItems((items) => { const selectedItems = items.length; if (items.length == 0) { $('.sell_selected').hide(); @@ -2042,7 +2042,7 @@ // Updates the (selected) turn into ... gems button. function updateTurnIntoGemsButton() { - getInventorySelectedGemsItems(function(items) { + getInventorySelectedGemsItems((items) => { const selectedItems = items.length; if (items.length == 0) { $('.turn_into_gems').hide(); @@ -2056,7 +2056,7 @@ // Updates the (selected) open ... booster packs button. function updateOpenBoosterPacksButton() { - getInventorySelectedBoosterPackItems(function(items) { + getInventorySelectedBoosterPackItems((items) => { const selectedItems = items.length; if (items.length == 0) { $('.unpack_booster_packs').hide(); @@ -2141,7 +2141,7 @@ market.getItemOrdersHistogram( item, false, - function(err, histogram) { + (err, histogram) => { if (err) { logConsole('Failed to get orders histogram for ' + (selectedItem.name || selectedItem.description.name)); return; @@ -2181,7 +2181,7 @@ prices = prices.filter((v, i) => prices.indexOf(v) === i).sort((a, b) => a - b); let buttons = ' '; - prices.forEach(function(e) { + prices.forEach((e) => { buttons += '