misc

Author: chr233

ASFOAuth/ASFOAuth.cs

@@ -1,21 +1,27 @@
 using ArchiSteamFarm.Core;
 using ArchiSteamFarm.Plugins.Interfaces;
 using ArchiSteamFarm.Steam;
+using ArchiSteamFarm.Web.GitHub;
 using ASFOAuth.Data;
 using System.ComponentModel;
 using System.Composition;
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
+using static ArchiSteamFarm.Storage.GlobalConfig;
 
 namespace ASFOAuth;
 
 [Export(typeof(IPlugin))]
-internal sealed class ASFOAuth : IASF, IBotCommand2
+internal sealed class ASFOAuth : IASF, IBotCommand2, IGitHubPluginUpdates
 {
     public string Name => "ASF OAuth";
     public Version Version => MyVersion;
 
+    public bool CanUpdate => true;
+    public string RepositoryName => "chr233/ASFOAuth";
+
+
     private bool ASFEBridge;
 
     public static PluginConfig Config => Utils.Config;
@@ -226,4 +232,60 @@ public Task OnLoaded()
             return ex.StackTrace;
         }
     }
+
+    /// <inheritdoc/>
+    public async Task<Uri?> GetTargetReleaseURL(Version asfVersion, string asfVariant, bool asfUpdate, EUpdateChannel updateChannel, bool forced)
+    {
+        var releaseResponse = await GitHubService.GetLatestRelease(RepositoryName, updateChannel == EUpdateChannel.Stable, default).ConfigureAwait(false);
+        if (releaseResponse == null)
+        {
+            return null;
+        }
+
+        //Version newVersion = new(releaseResponse.Tag);
+        //if (!forced && (Version >= newVersion))
+        //{
+        //    ASFLogger.LogGenericInfo(string.Format(Langs.UpdatePluginListItemName, Name, Langs.AlreadyLatest));
+        //    return null;
+        //}
+
+        //if (releaseResponse.Assets.Count == 0)
+        //{
+        //    ASFLogger.LogGenericWarning(Langs.NoAssetFoundInReleaseInfo);
+        //    return null;
+        //}
+
+        //ASFLogger.LogGenericInfo(string.Format(Langs.UpdatePluginListItemName, Name, Langs.CanUpdate));
+        //ASFLogger.LogGenericInfo(string.Format(Langs.UpdatePluginListItemVersion, Version, newVersion));
+        //if (!string.IsNullOrEmpty(releaseResponse.MarkdownBody))
+        //{
+        //    ASFLogger.LogGenericInfo(string.Format(Langs.UpdatePluginListItemReleaseNote, releaseResponse.MarkdownBody));
+        //}
+
+        if (releaseResponse.Assets.Count == 0)
+        {
+            return null;
+        }
+
+        //优先下载当前语言的版本
+        foreach (var asset in releaseResponse.Assets)
+        {
+            if (asset.Name.Contains(Langs.CurrentLanguage))
+            {
+                return asset.DownloadURL;
+            }
+        }
+
+        //优先下载英文版本
+        foreach (var asset in releaseResponse.Assets)
+        {
+            if (asset.Name.Contains("en-US"))
+            {
+                return asset.DownloadURL;
+            }
+        }
+
+        //如果没有找到当前语言的版本, 则下载第一个
+        return releaseResponse.Assets.FirstOrDefault()?.DownloadURL;
+    }
 }

ASFOAuth/Core/WebRequest.cs

@@ -6,9 +6,6 @@ namespace ASFOAuth.Core;
 
 internal static partial class WebRequest
 {
-    [GeneratedRegex(@"(?:(openid\.[a-z_.]+)=([^&]+))")]
-    private static partial Regex OpenIdMatchQueries();
-
     [GeneratedRegex(@"(?:([a-z_.]+)=([^&]+))")]
     private static partial Regex OAuthMatchQueries();
 
@@ -20,8 +17,14 @@ internal static partial class WebRequest
     /// <returns></returns>
     internal static async Task<string> LoginViaSteamOpenId(Bot bot, string url)
     {
+        url = url.Replace("%26", "&");
+
+        if (!url.Contains("openid"))
+        {
+            return "OpenId链接无效";
+        }
 
-        var regex = OpenIdMatchQueries();
+        var regex = OAuthMatchQueries();
         var matches = regex.Matches(url);
 
         var queries = new List<string>();
@@ -35,7 +38,7 @@ internal static async Task<string> LoginViaSteamOpenId(Bot bot, string url)
             return "OpenId链接无效";
         }
 
-        var request = new Uri(SteamCommunityURL, "/openid/login?" + string.Join('&', queries));
+        var request = new Uri(SteamCommunityURL, "/openid/login?" + string.Join("%26", queries));
         var response = await bot.ArchiWebHandler.UrlGetToHtmlDocumentWithSession(request).ConfigureAwait(false);
 
         var eles = response?.Content?.QuerySelectorAll("#openidForm>input[name][value]");
@@ -69,6 +72,7 @@ internal static async Task<string> LoginViaSteamOpenId(Bot bot, string url)
     /// <returns></returns>
     internal static async Task<string> LoginViaSteamOAuth(Bot bot, string url)
     {
+        //url = url.Replace("%26", "&");
 
         var regex = OAuthMatchQueries();
         var matches = regex.Matches(url);

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>1.4.0.0</Version>
+		<Version>1.4.1.0</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>