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

Merge pull request #500 from TheSergiooo/master

Browse Source 
Added SteamOperatorID property
This commit is contained in:
Łukasz Domeradzki
2017-03-14 15:52:44 +01:00
committed by GitHub
parent 6c8a123b68 3be60fc638
commit 7ebc134ba0
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ArchiSteamFarm/Bot.cs
View File

@@ -1070,6 +1070,15 @@ namespace ArchiSteamFarm {
return false;
}
private bool IsOperator(ulong steamID) {
if (steamID != 0) {
return (steamID == BotConfig.SteamOperatorID) || IsMaster(steamID);
}
ArchiLogger.LogNullError(nameof(steamID));
return false;
}
private bool IsMasterClanID(ulong steamID) {
if (steamID != 0) {
return steamID == BotConfig.SteamMasterClanID;
@@ -1382,7 +1391,7 @@ namespace ArchiSteamFarm {
ArchiHandler.AcceptClanInvite(friend.SteamID, false);
}
} else {
if (IsMaster(friend.SteamID)) {
if (IsOperator(friend.SteamID)) {
SteamFriends.AddFriend(friend.SteamID);
} else if (BotConfig.IsBotAccount) {
SteamFriends.RemoveFriend(friend.SteamID);
@@ -1890,7 +1899,7 @@ namespace ArchiSteamFarm {
return null;
}
if (!IsMaster(steamID)) {
if (!IsOperator(steamID)) {
return null;
}
@@ -1935,7 +1944,7 @@ namespace ArchiSteamFarm {
return null;
}
if (!IsMaster(steamID)) {
if (!IsOperator(steamID)) {
return null;
}
@@ -2087,7 +2096,7 @@ namespace ArchiSteamFarm {
private string ResponseHelp(ulong steamID) {
if (steamID != 0) {
return IsMaster(steamID) ? FormatBotResponse("https://github.com/" + SharedInfo.GithubRepo + "/wiki/Commands") : null;
return IsOperator(steamID) ? FormatBotResponse("https://github.com/" + SharedInfo.GithubRepo + "/wiki/Commands") : null;
}
ArchiLogger.LogNullError(nameof(steamID));
@@ -2280,7 +2289,7 @@ namespace ArchiSteamFarm {
return null;
}
if (!IsMaster(steamID)) {
if (!IsOperator(steamID)) {
return null;
}
@@ -2566,7 +2575,7 @@ namespace ArchiSteamFarm {
return null;
}
if (!IsMaster(steamID)) {
if (!IsOperator(steamID)) {
return null;
}
@@ -2904,7 +2913,7 @@ namespace ArchiSteamFarm {
return null;
}
if (!IsMaster(steamID)) {
if (!IsOperator(steamID)) {
return null;
}
@@ -3033,7 +3042,7 @@ namespace ArchiSteamFarm {
private string ResponseUnknown(ulong steamID) {
if (steamID != 0) {
return IsMaster(steamID) ? FormatBotResponse(Strings.UnknownCommand) : null;
return IsOperator(steamID) ? FormatBotResponse(Strings.UnknownCommand) : null;
}
ArchiLogger.LogNullError(nameof(steamID));
@@ -3056,7 +3065,7 @@ namespace ArchiSteamFarm {
private string ResponseVersion(ulong steamID) {
if (steamID != 0) {
return IsMaster(steamID) ? FormatBotResponse(string.Format(Strings.BotVersion, SharedInfo.ASF, SharedInfo.Version)) : null;
return IsOperator(steamID) ? FormatBotResponse(string.Format(Strings.BotVersion, SharedInfo.ASF, SharedInfo.Version)) : null;
}
ArchiLogger.LogNullError(nameof(steamID));

3
ArchiSteamFarm/BotConfig.cs
View File

@@ -100,6 +100,9 @@ namespace ArchiSteamFarm {
[JsonProperty(Required = Required.DisallowNull)]
internal readonly ulong SteamMasterID = 0;
[JsonProperty(Required = Required.DisallowNull)]
internal readonly ulong SteamOperatorID = 0;
[JsonProperty]
internal readonly string SteamTradeToken = null;

1
ArchiSteamFarm/config/example.json
View File

@@ -24,6 +24,7 @@
"SteamLogin": null,
"SteamMasterClanID": 0,
"SteamMasterID": 0,
"SteamOperatorID": 0,
"SteamParentalPIN": "0",
"SteamPassword": null,
"SteamTradeToken": null,

4
ConfigGenerator/BotConfig.cs
View File

@@ -116,6 +116,10 @@ namespace ConfigGenerator {
[JsonProperty(Required = Required.DisallowNull)]
public ulong SteamMasterID { get; set; } = 0;
[LocalizedCategory("Access")]
[JsonProperty(Required = Required.DisallowNull)]
public ulong SteamOperatorID { get; set; } = 0;
[LocalizedCategory("Access")]
[JsonProperty]
public string SteamParentalPIN { get; set; } = "0";