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

Open more PublicAPI interfaces

Browse Source
This commit is contained in:
JustArchi
2019-01-17 16:37:16 +01:00
parent bc56b8ac8c
commit d5259c230e
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArchiSteamFarm/BotConfig.cs
View File

@@ -145,6 +145,9 @@ namespace ArchiSteamFarm {
[JsonProperty(Required = Required.DisallowNull)]
public readonly bool UseLoginKeys = DefaultUseLoginKeys;
[JsonProperty(Required = Required.DisallowNull)]
public ulong SteamMasterClanID { get; private set; } = DefaultSteamMasterClanID;
[JsonExtensionData]
internal Dictionary<string, JToken> AdditionalProperties {
get;
@@ -199,9 +202,6 @@ namespace ArchiSteamFarm {
}
}
[JsonProperty(Required = Required.DisallowNull)]
internal ulong SteamMasterClanID { get; private set; } = DefaultSteamMasterClanID;
[JsonProperty]
internal string SteamParentalCode {
get => _SteamParentalCode;

12
ArchiSteamFarm/GlobalConfig.cs
View File

@@ -186,6 +186,12 @@ namespace ArchiSteamFarm {
}
}
[JsonProperty(Required = Required.DisallowNull)]
public ulong SteamOwnerID { get; private set; } = DefaultSteamOwnerID;
[JsonProperty(Required = Required.DisallowNull)]
public ProtocolTypes SteamProtocols { get; private set; } = DefaultSteamProtocols;
[JsonExtensionData]
internal Dictionary<string, JToken> AdditionalProperties {
get;
@@ -197,12 +203,6 @@ namespace ArchiSteamFarm {
internal bool ShouldSerializeEverything { private get; set; } = true;
internal bool ShouldSerializeHelperProperties { private get; set; } = true;
[JsonProperty(Required = Required.DisallowNull)]
internal ulong SteamOwnerID { get; private set; } = DefaultSteamOwnerID;
[JsonProperty(Required = Required.DisallowNull)]
internal ProtocolTypes SteamProtocols { get; private set; } = DefaultSteamProtocols;
[JsonProperty]
internal string WebProxyPassword {
get => _WebProxyPassword;

27
ArchiSteamFarm/WebBrowser.cs
View File

@@ -74,6 +74,20 @@ namespace ArchiSteamFarm {
HttpClientHandler.Dispose();
}
[NotNull]
[PublicAPI]
public HttpClient GenerateDisposableHttpClient(bool extendedTimeout = false) {
HttpClient result = new HttpClient(HttpClientHandler) {
Timeout = TimeSpan.FromSeconds(extendedTimeout ? ExtendedTimeoutMultiplier * ASF.GlobalConfig.ConnectionTimeout : ASF.GlobalConfig.ConnectionTimeout)
};
// Most web services expect that UserAgent is set, so we declare it globally
// If you by any chance came here with a very "clever" idea of hiding your ass by changing default ASF user-agent then here is a very good advice from me: don't, for your own safety - you've been warned
result.DefaultRequestHeaders.UserAgent.ParseAdd(SharedInfo.PublicIdentifier + "/" + SharedInfo.Version + " (+" + SharedInfo.ProjectURL + ")");
return result;
}
[ItemCanBeNull]
[PublicAPI]
public async Task<HtmlDocumentResponse> UrlGetToHtmlDocument(string request, string referer = null, byte maxTries = MaxTries) {
@@ -275,19 +289,6 @@ namespace ArchiSteamFarm {
return null;
}
[NotNull]
internal HttpClient GenerateDisposableHttpClient(bool extendedTimeout = false) {
HttpClient result = new HttpClient(HttpClientHandler) {
Timeout = TimeSpan.FromSeconds(extendedTimeout ? ExtendedTimeoutMultiplier * ASF.GlobalConfig.ConnectionTimeout : ASF.GlobalConfig.ConnectionTimeout)
};
// Most web services expect that UserAgent is set, so we declare it globally
// If you by any chance came here with a very "clever" idea of hiding your ass by changing default ASF user-agent then here is a very good advice from me: don't, for your own safety - you've been warned
result.DefaultRequestHeaders.UserAgent.ParseAdd(SharedInfo.PublicIdentifier + "/" + SharedInfo.Version + " (+" + SharedInfo.ProjectURL + ")");
return result;
}
internal static void Init() {
// Set max connection limit from default of 2 to desired value
ServicePointManager.DefaultConnectionLimit = MaxConnections;