Skip to content

Commit 3cdc93d

Browse files
committed
Cut SendOnFarmingFinished spam
Allow only one trade to be sent if we didn't farm anything
1 parent 36e99d9 commit 3cdc93d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

ArchiSteamFarm/Bot.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ internal sealed class Bot {
6565

6666
internal bool KeepRunning { get; private set; }
6767

68-
private bool InvalidPassword, LoggedInElsewhere;
68+
private bool InvalidPassword, LoggedInElsewhere, FirstTradeSent;
6969
private string AuthCode, TwoFactorCode;
7070

7171
internal static async Task RefreshCMs(uint cellID) {
@@ -319,8 +319,9 @@ internal async Task<bool> RefreshSession() {
319319
return true;
320320
}
321321

322-
internal async Task OnFarmingFinished() {
323-
if (BotConfig.SendOnFarmingFinished) {
322+
internal async Task OnFarmingFinished(bool farmedSomething) {
323+
if ((farmedSomething || !FirstTradeSent) && BotConfig.SendOnFarmingFinished) {
324+
FirstTradeSent = true;
324325
await ResponseSendTrade(BotConfig.SteamMasterID).ConfigureAwait(false);
325326
}
326327

@@ -1422,6 +1423,8 @@ private async void OnDisconnected(SteamClient.DisconnectedCallback callback) {
14221423
}
14231424

14241425
Logging.LogGenericInfo("Disconnected from Steam!", BotName);
1426+
1427+
FirstTradeSent = false;
14251428
CardsFarmer.StopFarming().Forget();
14261429

14271430
// If we initiated disconnect, do not attempt to reconnect

ArchiSteamFarm/CardsFarmer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ internal async Task StartFarming() {
9494
if (!await IsAnythingToFarm().ConfigureAwait(false)) {
9595
FarmingSemaphore.Release(); // We have nothing to do, don't forget to release semaphore
9696
Logging.LogGenericInfo("We don't have anything to farm on this account!", Bot.BotName);
97-
await Bot.OnFarmingFinished().ConfigureAwait(false);
97+
await Bot.OnFarmingFinished(false).ConfigureAwait(false);
9898
return;
9999
}
100100

@@ -145,7 +145,7 @@ internal async Task StartFarming() {
145145
NowFarming = false;
146146

147147
Logging.LogGenericInfo("Farming finished!", Bot.BotName);
148-
await Bot.OnFarmingFinished().ConfigureAwait(false);
148+
await Bot.OnFarmingFinished(true).ConfigureAwait(false);
149149
}
150150

151151
internal async Task StopFarming() {

0 commit comments

Comments
 (0)