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

Always distribute from the current bot onwards

Browse Source 
Forwarding stays the same
This commit is contained in:
JustArchi
2019-02-23 08:35:48 +01:00
parent 57272c2b31
commit cebda5b689
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ArchiSteamFarm/Bot.cs
View File

@@ -58,12 +58,11 @@ namespace ArchiSteamFarm {
public static IReadOnlyDictionary<string, Bot> BotsReadOnly => Bots;
internal static ConcurrentDictionary<string, Bot> Bots { get; private set; }
internal static StringComparer BotsComparer { get; private set; }
private static readonly SemaphoreSlim BotsSemaphore = new SemaphoreSlim(1, 1);
private static readonly SemaphoreSlim LoginSemaphore = new SemaphoreSlim(1, 1);
private static RegexOptions BotsRegex;
[PublicAPI]
public readonly Actions Actions;
@@ -330,10 +329,18 @@ namespace ArchiSteamFarm {
}
if (botName.StartsWith("r!", StringComparison.OrdinalIgnoreCase)) {
string botPattern = botName.Substring(2);
string botsPattern = botName.Substring(2);
try {
Regex regex = new Regex(botPattern, BotsRegex);
RegexOptions botsRegex = RegexOptions.None;
if ((BotsComparer == StringComparer.InvariantCulture) || (BotsComparer == StringComparer.Ordinal)) {
botsRegex |= RegexOptions.CultureInvariant;
} else if ((BotsComparer == StringComparer.InvariantCultureIgnoreCase) || (BotsComparer == StringComparer.OrdinalIgnoreCase)) {
botsRegex |= RegexOptions.CultureInvariant | RegexOptions.IgnoreCase;
}
Regex regex = new Regex(botsPattern, botsRegex);
IEnumerable<Bot> regexMatches = Bots.Where(kvp => regex.IsMatch(kvp.Key)).Select(kvp => kvp.Value);
result.UnionWith(regexMatches);
@@ -816,13 +823,8 @@ namespace ArchiSteamFarm {
return;
}
BotsComparer = botsComparer;
Bots = new ConcurrentDictionary<string, Bot>(botsComparer);
if ((botsComparer == StringComparer.InvariantCulture) || (botsComparer == StringComparer.Ordinal)) {
BotsRegex |= RegexOptions.CultureInvariant;
} else if ((botsComparer == StringComparer.InvariantCultureIgnoreCase) || (botsComparer == StringComparer.OrdinalIgnoreCase)) {
BotsRegex |= RegexOptions.CultureInvariant | RegexOptions.IgnoreCase;
}
}
internal bool IsBlacklistedFromIdling(uint appID) {