Merge branch 'main' into temp

ezhevita · Feb 27, 2024 · ffef9ef · ffef9ef
2 parents 743b136 + 1c119a4
commit ffef9ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -57,6 +57,6 @@ jobs:
         id: github_release
         uses: ncipollo/release-action@v1.13.0
         with:
-          artifacts: "out/*"
+          artifacts: "out/*.zip"
           makeLatest: true
-          release_name: ${{ github.event.repository.name }} V${{ github.ref_name }}
+          name: ${{ github.event.repository.name }} V${{ github.ref_name }}
diff --git a/GameRemover/Directory.Build.props b/GameRemover/Directory.Build.props
@@ -4,6 +4,7 @@
 
 	<PropertyGroup>
 		<Description>ASF plugin to remove games from account.</Description>
+		<NoWarn>$(NoWarn),CA1863</NoWarn>
 		<Version>2.3.0</Version>
 	</PropertyGroup>
 

diff --git a/GameRemover/GameRemoverPlugin.cs b/GameRemover/GameRemoverPlugin.cs
@@ -4,7 +4,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using ArchiSteamFarm.Core;
@@ -23,10 +22,6 @@ namespace GameRemover;
 [UsedImplicitly]
 public class GameRemoverPlugin : IBotCommand2
 {
-	private static readonly CompositeFormat ErrorIsInvalid = CompositeFormat.Parse(Strings.ErrorIsInvalid);
-	private static readonly CompositeFormat ErrorObjectIsNull = CompositeFormat.Parse(Strings.ErrorObjectIsNull);
-	private static readonly CompositeFormat BotNotFound = CompositeFormat.Parse(Strings.BotNotFound);
-
 	public Task OnLoaded()
 	{
 		ASF.ArchiLogger.LogGenericInfo($"{Name} by ezhevita | Support & source code: https://github.com/ezhevita/{Name}");
@@ -64,7 +59,7 @@ public Task OnLoaded()
 		{
 			if (!uint.TryParse(appIDText, out var appID) || (appID == 0) || !appIDs.Add(appID))
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorIsInvalid, appIDText));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsInvalid, appIDText));
 			}
 		}
 
@@ -75,18 +70,18 @@ public Task OnLoaded()
 			using var responseDeleteGamePage = (await bot.ArchiWebHandler.UrlGetToHtmlDocumentWithSession(uriDeleteGamePage).ConfigureAwait(false))?.Content;
 			if (responseDeleteGamePage == null)
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorObjectIsNull, nameof(responseDeleteGamePage)));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorObjectIsNull, nameof(responseDeleteGamePage)));
 			}
 
 			var node = responseDeleteGamePage.SelectSingleNode<IElement>("//input[@id='packageid']");
 			if (node == null)
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorObjectIsNull, nameof(node)));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorObjectIsNull, nameof(node)));
 			}
 
 			if (!uint.TryParse(node.GetAttribute("value"), out var packageID) || (packageID == 0))
 			{
-				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, ErrorIsInvalid, nameof(packageID)));
+				return bot.Commands.FormatBotResponse(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsInvalid, nameof(packageID)));
 			}
 
 			Dictionary<string, string> data = new(3)
@@ -110,7 +105,7 @@ public Task OnLoaded()
 		var bots = Bot.GetBots(botNames);
 		if ((bots == null) || (bots.Count == 0))
 		{
-			return access >= EAccess.Owner ? Commands.FormatStaticResponse(string.Format(CultureInfo.CurrentCulture, BotNotFound, botNames)) : null;
+			return access >= EAccess.Owner ? Commands.FormatStaticResponse(string.Format(CultureInfo.CurrentCulture, Strings.BotNotFound, botNames)) : null;
 		}
 
 		var results = await Utilities.InParallel(bots.Select(bot => ResponseDeleteGame(bot, Commands.GetProxyAccess(bot, access, steamID), appIDsText))).ConfigureAwait(false);