Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-16 00:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Announce MatchableTypes

Browse Source
This commit is contained in:
JustArchi
2017-07-10 23:04:33 +02:00
parent 0f6cf10179
commit 6d22b19ef3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ArchiSteamFarm/Statistics.cs
View File

@@ -28,13 +28,14 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using ArchiSteamFarm.JSON; using ArchiSteamFarm.JSON;
using Newtonsoft.Json;
using SteamKit2; using SteamKit2;
namespace ArchiSteamFarm { namespace ArchiSteamFarm {
internal sealed class Statistics : IDisposable { internal sealed class Statistics : IDisposable {
private const byte MinAnnouncementCheckTTL = 6; // Minimum amount of hours we must wait before checking eligibility for Announcement, should be lower than MinPersonaStateTTL private const byte MinAnnouncementCheckTTL = 6; // Minimum amount of hours we must wait before checking eligibility for Announcement, should be lower than MinPersonaStateTTL
private const byte MinCardsCount = 100; // Minimum amount of cards to be eligible for public listing
private const byte MinHeartBeatTTL = 10; // Minimum amount of minutes we must wait before sending next HeartBeat private const byte MinHeartBeatTTL = 10; // Minimum amount of minutes we must wait before sending next HeartBeat
private const byte MinItemsCount = 100; // Minimum amount of items to be eligible for public listing
private const byte MinPersonaStateTTL = 8; // Minimum amount of hours we must wait before requesting persona state update private const byte MinPersonaStateTTL = 8; // Minimum amount of hours we must wait before requesting persona state update
private const string URL = "https://" + SharedInfo.StatisticsServer; private const string URL = "https://" + SharedInfo.StatisticsServer;
@@ -97,7 +98,7 @@ namespace ArchiSteamFarm {
// Don't announce if we don't meet conditions // Don't announce if we don't meet conditions
string tradeToken; string tradeToken;
if (!Bot.HasMobileAuthenticator || !Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.SteamTradeMatcher) || !await Bot.ArchiWebHandler.HasValidApiKey().ConfigureAwait(false) || !await Bot.ArchiWebHandler.HasPublicInventory().ConfigureAwait(false) || string.IsNullOrEmpty(tradeToken = await Bot.ArchiWebHandler.GetTradeToken().ConfigureAwait(false))) { if (!Bot.HasMobileAuthenticator || !Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.SteamTradeMatcher) || (Bot.BotConfig.MatchableTypes.Count == 0) || !await Bot.ArchiWebHandler.HasValidApiKey().ConfigureAwait(false) || !await Bot.ArchiWebHandler.HasPublicInventory().ConfigureAwait(false) || string.IsNullOrEmpty(tradeToken = await Bot.ArchiWebHandler.GetTradeToken().ConfigureAwait(false))) {
LastAnnouncementCheck = DateTime.UtcNow; LastAnnouncementCheck = DateTime.UtcNow;
ShouldSendHeartBeats = false; ShouldSendHeartBeats = false;
return; return;
@@ -113,8 +114,6 @@ namespace ArchiSteamFarm {
} }
} }
bool matchEverything = Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.MatchEverything);
await Semaphore.WaitAsync().ConfigureAwait(false); await Semaphore.WaitAsync().ConfigureAwait(false);
try { try {
@@ -122,7 +121,7 @@ namespace ArchiSteamFarm {
return; return;
} }
HashSet<Steam.Item> inventory = await Bot.ArchiWebHandler.GetMySteamInventory(true, new HashSet<Steam.Item.EType> { Steam.Item.EType.TradingCard }).ConfigureAwait(false); HashSet<Steam.Item> inventory = await Bot.ArchiWebHandler.GetMySteamInventory(true, Bot.BotConfig.MatchableTypes).ConfigureAwait(false);
// This is actually inventory failure, so we'll stop sending heartbeats but not record it as valid check // This is actually inventory failure, so we'll stop sending heartbeats but not record it as valid check
if (inventory == null) { if (inventory == null) {
@@ -131,21 +130,22 @@ namespace ArchiSteamFarm {
} }
// This is actual inventory // This is actual inventory
if (inventory.Count < MinCardsCount) { if (inventory.Count < MinItemsCount) {
LastAnnouncementCheck = DateTime.UtcNow; LastAnnouncementCheck = DateTime.UtcNow;
ShouldSendHeartBeats = false; ShouldSendHeartBeats = false;
return; return;
} }
const string request = URL + "/api/Announce"; const string request = URL + "/api/Announce";
Dictionary<string, string> data = new Dictionary<string, string>(7) { Dictionary<string, string> data = new Dictionary<string, string>(8) {
{ "SteamID", Bot.SteamID.ToString() }, { "SteamID", Bot.SteamID.ToString() },
{ "Guid", Program.GlobalDatabase.Guid.ToString("N") }, { "Guid", Program.GlobalDatabase.Guid.ToString("N") },
{ "Nickname", nickname }, { "Nickname", nickname },
{ "AvatarHash", avatarHash }, { "AvatarHash", avatarHash },
{ "MatchEverything", matchEverything ? "1" : "0" }, { "MatchableTypes", JsonConvert.SerializeObject(Bot.BotConfig.MatchableTypes) },
{ "MatchEverything", Bot.BotConfig.TradingPreferences.HasFlag(BotConfig.ETradingPreferences.MatchEverything) ? "1" : "0" },
{ "TradeToken", tradeToken }, { "TradeToken", tradeToken },
{ "CardsCount", inventory.Count.ToString() } { "ItemsCount", inventory.Count.ToString() }
}; };
// We don't need retry logic here // We don't need retry logic here