casually update this bot

github-actions[bot] · github-actions[bot] · commit fb333cec876e · 2023-08-19T19:16:36.000+05:00
diff --git a/Modules/Commands.cs b/Modules/Commands.cs
@@ -280,7 +280,7 @@ public async Task EvalAsync(CommandContext ctx, [RemainingText] string code)
         [RequireOwner]
         public async Task SetDocsUrlAsync(CommandContext ctx, [RemainingText] string url)
         {
-            if (!url.EndsWith("/"))
+            if (!url.EndsWith('/'))
             {
                 url += "/";
             }
diff --git a/Query/Extensions/BaseDisplay.cs b/Query/Extensions/BaseDisplay.cs
@@ -44,7 +44,7 @@ private static async Task<DocsHttpResult> GetWebDocsAsync(string url, object o)
             string html = result.Item2;
             if (result.Item1 && !string.IsNullOrEmpty(html))
             {
-                string block = (o is TypeInfoWrapper) ? html[html.IndexOf($"<h1 id=\"{search}")..] : html[html.IndexOf($"<h4 id=\"{search}")..];
+                string block = o is TypeInfoWrapper ? html[html.IndexOf($"<h1 id=\"{search}")..] : html[html.IndexOf($"<h4 id=\"{search}")..];
                 string anchor = block[(block.IndexOf('"') + 1)..];
                 anchor = anchor[..anchor.IndexOf('"')];
                 summary = block[(block.IndexOf("summary\">") + 9)..];
@@ -89,9 +89,9 @@ private static async Task<DocsHttpResult> GetWebDocsAsync(string url, object o)
                     }
                 }
             }
-            using (HttpClient httpClient = new()
-            { Timeout = TimeSpan.FromSeconds(6) })
+            using (HttpClient httpClient = new())
             {
+                httpClient.Timeout = TimeSpan.FromSeconds(6);
                 HttpResponseMessage res = await httpClient.GetAsync(url);
                 if (!res.IsSuccessStatusCode)
                 {
@@ -236,7 +236,7 @@ private static string FormatDocsUrl(string url)
         {
             int idx = url.IndexOf('#');
             string[] arr = idx == -1 ? url[..].Split('.') : url[..idx].Split('.');
-            return $"[{arr.ElementAt(arr.Length - 2)}.html]({url})";
+            return $"[{arr[^2]}.html]({url})";
         }
     }
 }
diff --git a/Query/Extensions/MethodDisplay.cs b/Query/Extensions/MethodDisplay.cs
@@ -102,7 +102,7 @@ private static string BuildMethod(MethodInfoWrapper methodWrapper)
         {
             MethodInfo mi = methodWrapper.Method;
             ParameterInfo[] parametersInfo = mi.GetParameters();
-            IEnumerable<string> parameters = mi.IsDefined(typeof(ExtensionAttribute)) && parametersInfo.First().ParameterType.IsAssignableFrom(methodWrapper.Parent.TypeInfo.AsType())
+            IEnumerable<string> parameters = mi.IsDefined(typeof(ExtensionAttribute)) && parametersInfo[0].ParameterType.IsAssignableFrom(methodWrapper.Parent.TypeInfo.AsType())
                 ? parametersInfo.Skip(1).Select(x => $"{BuildPreParameter(x)}{Utils.BuildType(x.ParameterType)} {x.Name}{GetParameterDefaultValue(x)}")
                 : parametersInfo.Select(x => $"{BuildPreParameter(x)}{Utils.BuildType(x.ParameterType)} {x.Name}{GetParameterDefaultValue(x)}");
             return $"{Utils.BuildType(mi.ReturnType)} {mi.Name}({string.Join(", ", parameters)})";
diff --git a/Query/ResultDisplay.cs b/Query/ResultDisplay.cs
@@ -67,7 +67,7 @@ private async Task<DiscordEmbedBuilder> ShowAsync(IEnumerable<object> o)
 
         private async Task<DiscordEmbedBuilder> ShowMultipleAsync(IEnumerable<IEnumerable<object>> obj)
         {
-            DiscordEmbedBuilder eb = new();
+            DiscordEmbedBuilder eb;
             IEnumerable<object> singleList = obj.Select(x => x.First());
             IEnumerable<IGrouping<string, object>> same = singleList.GroupBy(x => GetSimplePath(x));
             if (same.Count() == 1)
diff --git a/Query/TextInterpreter.cs b/Query/TextInterpreter.cs
@@ -27,7 +27,7 @@
 
 namespace DSharpPlusDocs.Query
 {
-    public class TextInterpreter
+    public partial class TextInterpreter
     {
         private static readonly Regex rgx = new("[^0-9a-z_ ]", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ECMAScript);
 
@@ -61,7 +61,7 @@ public InterpreterResult Run()
                     searchEvents = false;
                 }
 
-                Regex rgx = new("( property | method | type | event )", RegexOptions.IgnoreCase);
+                Regex rgx = TypeRegex();
                 _text = rgx.Replace(_text, " ");
             }
             if (_text.IndexOf(" list ", StringComparison.OrdinalIgnoreCase) != -1)
@@ -112,5 +112,8 @@ public InterpreterResult Run()
                 ? new InterpreterResult("No text to search.")
                 : new InterpreterResult(_text, nspace, search, searchTypes, searchMethods, searchProperties, searchEvents, isList);
         }
+
+        [GeneratedRegex("( property | method | type | event )", RegexOptions.IgnoreCase, "ru-RU")]
+        private static partial Regex TypeRegex();
     }
 }
diff --git a/Rest/GithubRest.cs b/Rest/GithubRest.cs
@@ -36,16 +36,11 @@ namespace DSharpPlusDocs.Rest
     public class GithubRest
     {
         private const string ApiUrl = "https://api.github.com";
-        private const string AcceptHeader = "application/vnd.github.v3+json";
-
         private static async Task<JObject> SendRequestAsync(HttpMethod method, string endpoint, string extra = null, string acceptHeader = null)
         {
             using HttpClient http = new();
             HttpRequestMessage request = new(method, $"{ApiUrl}{endpoint}{extra}");
-            if (acceptHeader == null)
-            {
-                acceptHeader = "application/vnd.github.v3+json";
-            }
+            acceptHeader ??= "application/vnd.github.v3+json";
 
             request.Headers.Add("Accept", acceptHeader);
             request.Headers.Add("User-Agent", "DSharpPlus Docs Bot/1.0");
@@ -89,20 +84,20 @@ private static async Task<List<GitSearchResult>> SearchAsync(string search, stri
         public static async Task<string> GetTypeUrlAsync(TypeInfoWrapper type)
         {
             List<GitSearchResult> search = await SearchAsync(type.Name, $"{type.Name}.cs");
-            return search.FirstOrDefault(x => x.Name == $"{type.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl ?? null; //null = Not found
+            return search.Find(x => x.Name == $"{type.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl ?? null; //null = Not found
         }
 
         public static async Task<string> GetEventUrlAsync(EventInfoWrapper ev)
         {
             List<GitSearchResult> search = await SearchAsync(ev.Parent.Name, $"{ev.Parent.Name}.cs");
-            string result = search.FirstOrDefault(x => x.Name == $"{ev.Parent.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl;
+            string result = search.Find(x => x.Name == $"{ev.Parent.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl;
             if (result != null)
             {
                 using HttpClient client = new();
                 string url = result.Replace("/blob/", "/raw/");
                 string code = await client.GetStringAsync(url);
                 Microsoft.CodeAnalysis.SyntaxTree tree = CSharpSyntaxTree.ParseText(code);
-                CompilationUnitSyntax root = (CompilationUnitSyntax)tree.GetRoot();
+                CompilationUnitSyntax root = (CompilationUnitSyntax)await tree.GetRootAsync();
                 EventDeclarationSyntax source = root.DescendantNodes().OfType<EventDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText == ev.Event.Name);
                 if (source == null)
                 {
@@ -119,14 +114,14 @@ public static async Task<string> GetEventUrlAsync(EventInfoWrapper ev)
         public static async Task<string> GetMethodUrlAsync(MethodInfoWrapper method)
         {
             List<GitSearchResult> search = await SearchAsync(method.Method.Name, $"{method.Parent.Name}.cs");
-            string result = search.FirstOrDefault(x => x.Name == $"{method.Parent.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl;
+            string result = search.Find(x => x.Name == $"{method.Parent.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl;
             if (result != null)
             {
                 using HttpClient client = new();
                 string url = result.Replace("/blob/", "/raw/");
                 string code = await client.GetStringAsync(url);
                 Microsoft.CodeAnalysis.SyntaxTree tree = CSharpSyntaxTree.ParseText(code);
-                CompilationUnitSyntax root = (CompilationUnitSyntax)tree.GetRoot();
+                CompilationUnitSyntax root = (CompilationUnitSyntax)await tree.GetRootAsync();
                 MethodDeclarationSyntax source = root.DescendantNodes().OfType<MethodDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText == method.Method.Name);
                 if (source == null)
                 {
@@ -143,14 +138,14 @@ public static async Task<string> GetMethodUrlAsync(MethodInfoWrapper method)
         public static async Task<string> GetPropertyUrlAsync(PropertyInfoWrapper property)
         {
             List<GitSearchResult> search = await SearchAsync(property.Property.Name, $"{property.Parent.Name}.cs");
-            string result = search.FirstOrDefault(x => x.Name == $"{property.Parent.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl;
+            string result = search.Find(x => x.Name == $"{property.Parent.Name}.cs")?.HtmlUrl ?? search.FirstOrDefault()?.HtmlUrl;
             if (result != null)
             {
                 using HttpClient client = new();
                 string url = result.Replace("/blob/", "/raw/");
                 string code = await client.GetStringAsync(url);
                 Microsoft.CodeAnalysis.SyntaxTree tree = CSharpSyntaxTree.ParseText(code);
-                CompilationUnitSyntax root = (CompilationUnitSyntax)tree.GetRoot();
+                CompilationUnitSyntax root = (CompilationUnitSyntax)await tree.GetRootAsync();
                 PropertyDeclarationSyntax source = root.DescendantNodes().OfType<PropertyDeclarationSyntax>().FirstOrDefault(x => x.Identifier.ValueText == property.Property.Name);
                 if (source == null)
                 {

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ public async Task EvalAsync(CommandContext ctx, [RemainingText] string code)`
`280`	`280`	`[RequireOwner]`
`281`	`281`	`public async Task SetDocsUrlAsync(CommandContext ctx, [RemainingText] string url)`
`282`	`282`	`{`
`283`		`- if (!url.EndsWith("/"))`
	`283`	`+ if (!url.EndsWith('/'))`
`284`	`284`	`{`
`285`	`285`	`url += "/";`
`286`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private static async Task<DocsHttpResult> GetWebDocsAsync(string url, object o)`
`44`	`44`	`string html = result.Item2;`
`45`	`45`	`if (result.Item1 && !string.IsNullOrEmpty(html))`
`46`	`46`	`{`
`47`		`- string block = (o is TypeInfoWrapper) ? html[html.IndexOf($"<h1 id=\"{search}")..] : html[html.IndexOf($"<h4 id=\"{search}")..];`
	`47`	`+ string block = o is TypeInfoWrapper ? html[html.IndexOf($"<h1 id=\"{search}")..] : html[html.IndexOf($"<h4 id=\"{search}")..];`
`48`	`48`	`string anchor = block[(block.IndexOf('"') + 1)..];`
`49`	`49`	`anchor = anchor[..anchor.IndexOf('"')];`
`50`	`50`	`summary = block[(block.IndexOf("summary\">") + 9)..];`
`@@ -89,9 +89,9 @@ private static async Task<DocsHttpResult> GetWebDocsAsync(string url, object o)`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`- using (HttpClient httpClient = new()`
`93`		`- { Timeout = TimeSpan.FromSeconds(6) })`
	`92`	`+ using (HttpClient httpClient = new())`
`94`	`93`	`{`
	`94`	`+ httpClient.Timeout = TimeSpan.FromSeconds(6);`
`95`	`95`	`HttpResponseMessage res = await httpClient.GetAsync(url);`
`96`	`96`	`if (!res.IsSuccessStatusCode)`
`97`	`97`	`{`
`@@ -236,7 +236,7 @@ private static string FormatDocsUrl(string url)`
`236`	`236`	`{`
`237`	`237`	`int idx = url.IndexOf('#');`
`238`	`238`	`string[] arr = idx == -1 ? url[..].Split('.') : url[..idx].Split('.');`
`239`		`- return $"[{arr.ElementAt(arr.Length - 2)}.html]({url})";`
	`239`	`+ return $"[{arr[^2]}.html]({url})";`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private static string BuildMethod(MethodInfoWrapper methodWrapper)`
`102`	`102`	`{`
`103`	`103`	`MethodInfo mi = methodWrapper.Method;`
`104`	`104`	`ParameterInfo[] parametersInfo = mi.GetParameters();`
`105`		`- IEnumerable<string> parameters = mi.IsDefined(typeof(ExtensionAttribute)) && parametersInfo.First().ParameterType.IsAssignableFrom(methodWrapper.Parent.TypeInfo.AsType())`
	`105`	`+ IEnumerable<string> parameters = mi.IsDefined(typeof(ExtensionAttribute)) && parametersInfo[0].ParameterType.IsAssignableFrom(methodWrapper.Parent.TypeInfo.AsType())`
`106`	`106`	`? parametersInfo.Skip(1).Select(x => $"{BuildPreParameter(x)}{Utils.BuildType(x.ParameterType)} {x.Name}{GetParameterDefaultValue(x)}")`
`107`	`107`	`: parametersInfo.Select(x => $"{BuildPreParameter(x)}{Utils.BuildType(x.ParameterType)} {x.Name}{GetParameterDefaultValue(x)}");`
`108`	`108`	`return $"{Utils.BuildType(mi.ReturnType)} {mi.Name}({string.Join(", ", parameters)})";`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private async Task<DiscordEmbedBuilder> ShowAsync(IEnumerable<object> o)`
`67`	`67`
`68`	`68`	`private async Task<DiscordEmbedBuilder> ShowMultipleAsync(IEnumerable<IEnumerable<object>> obj)`
`69`	`69`	`{`
`70`		`- DiscordEmbedBuilder eb = new();`
	`70`	`+ DiscordEmbedBuilder eb;`
`71`	`71`	`IEnumerable<object> singleList = obj.Select(x => x.First());`
`72`	`72`	`IEnumerable<IGrouping<string, object>> same = singleList.GroupBy(x => GetSimplePath(x));`
`73`	`73`	`if (same.Count() == 1)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`namespace DSharpPlusDocs.Query`
`29`	`29`	`{`
`30`		`- public class TextInterpreter`
	`30`	`+ public partial class TextInterpreter`
`31`	`31`	`{`
`32`	`32`	`private static readonly Regex rgx = new("[^0-9a-z_ ]", RegexOptions.Compiled \| RegexOptions.IgnoreCase \| RegexOptions.ECMAScript);`
`33`	`33`
`@@ -61,7 +61,7 @@ public InterpreterResult Run()`
`61`	`61`	`searchEvents = false;`
`62`	`62`	`}`
`63`	`63`
`64`		`- Regex rgx = new("( property \| method \| type \| event )", RegexOptions.IgnoreCase);`
	`64`	`+ Regex rgx = TypeRegex();`
`65`	`65`	`_text = rgx.Replace(_text, " ");`
`66`	`66`	`}`
`67`	`67`	`if (_text.IndexOf(" list ", StringComparison.OrdinalIgnoreCase) != -1)`
`@@ -112,5 +112,8 @@ public InterpreterResult Run()`
`112`	`112`	`? new InterpreterResult("No text to search.")`
`113`	`113`	`: new InterpreterResult(_text, nspace, search, searchTypes, searchMethods, searchProperties, searchEvents, isList);`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ [GeneratedRegex("( property \| method \| type \| event )", RegexOptions.IgnoreCase, "ru-RU")]`
	`117`	`+ private static partial Regex TypeRegex();`
`115`	`118`	`}`
`116`	`119`	`}`