This commit is contained in:
JustArchi
2019-10-05 22:35:39 +02:00
parent b416e30612
commit 97f67711ee
5 changed files with 22 additions and 24 deletions

View File

@@ -6,7 +6,7 @@
<Copyright>Copyright © ArchiSteamFarm 2015-2019</Copyright> <Copyright>Copyright © ArchiSteamFarm 2015-2019</Copyright>
<DefaultItemExcludes>$(DefaultItemExcludes);debug/**;out/**</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);debug/**;out/**</DefaultItemExcludes>
<ErrorReport>none</ErrorReport> <ErrorReport>none</ErrorReport>
<LangVersion>latest</LangVersion> <LangVersion>8.0</LangVersion>
<NoWarn /> <NoWarn />
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<PackageIconUrl>https://github.com/JustArchiNET/ArchiSteamFarm/raw/master/resources/ASF.ico</PackageIconUrl> <PackageIconUrl>https://github.com/JustArchiNET/ArchiSteamFarm/raw/master/resources/ASF.ico</PackageIconUrl>

View File

@@ -7,7 +7,7 @@
<DefaultItemExcludes>$(DefaultItemExcludes);debug/**;out/**</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);debug/**;out/**</DefaultItemExcludes>
<Description>ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.</Description> <Description>ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.</Description>
<ErrorReport>none</ErrorReport> <ErrorReport>none</ErrorReport>
<LangVersion>latest</LangVersion> <LangVersion>8.0</LangVersion>
<NoWarn /> <NoWarn />
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<PackageIconUrl>https://github.com/JustArchiNET/ArchiSteamFarm/raw/master/resources/ASF.ico</PackageIconUrl> <PackageIconUrl>https://github.com/JustArchiNET/ArchiSteamFarm/raw/master/resources/ASF.ico</PackageIconUrl>

View File

@@ -12,7 +12,7 @@
<ErrorReport>none</ErrorReport> <ErrorReport>none</ErrorReport>
<FileVersion>4.1.0.2</FileVersion> <FileVersion>4.1.0.2</FileVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>latest</LangVersion> <LangVersion>8.0</LangVersion>
<NoWarn>1591</NoWarn> <NoWarn>1591</NoWarn>
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments> <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>

View File

@@ -448,8 +448,7 @@ namespace ArchiSteamFarm {
return true; return true;
} }
return permission switch return permission switch {
{
BotConfig.EPermission.FamilySharing when SteamFamilySharingIDs.Contains(steamID) => true, BotConfig.EPermission.FamilySharing when SteamFamilySharingIDs.Contains(steamID) => true,
_ => BotConfig.SteamUserPermissions.TryGetValue(steamID, out BotConfig.EPermission realPermission) && (realPermission >= permission), _ => BotConfig.SteamUserPermissions.TryGetValue(steamID, out BotConfig.EPermission realPermission) && (realPermission >= permission),
}; };
@@ -1866,15 +1865,14 @@ namespace ArchiSteamFarm {
return false; return false;
} }
switch (paymentMethod) { // Complimentary is also a flag
case EPaymentMethod.ActivationCode: return paymentMethod switch {
case EPaymentMethod.Complimentary: // This is also a flag EPaymentMethod.ActivationCode => false,
case EPaymentMethod.GuestPass: EPaymentMethod.Complimentary => false,
case EPaymentMethod.HardwarePromo: EPaymentMethod.GuestPass => false,
return false; EPaymentMethod.HardwarePromo => false,
default: _ => !paymentMethod.HasFlag(EPaymentMethod.Complimentary)
return !paymentMethod.HasFlag(EPaymentMethod.Complimentary); };
}
} }
private async Task JoinMasterChatGroupID() { private async Task JoinMasterChatGroupID() {