Fix IDE errors

Author: OoLunar

Controllers/MainHandler.cs

@@ -1,26 +1,26 @@
-// This file is part of the DSharpPlus project.
-//
-// Copyright (c) 2015 Mike Santiago
-// Copyright (c) 2016-2022 DSharpPlus Contributors
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
+// This file is part of the DSharpPlus project.
+//
+// Copyright (c) 2015 Mike Santiago
+// Copyright (c) 2016-2022 DSharpPlus Contributors
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 using System.Threading.Tasks;
 using DSharpPlus;
 using DSharpPlusDocs.Handlers;
@@ -48,7 +48,5 @@ public async Task InitializeEarlyAsync()
             await CommandHandler.InitializeAsync(this);
             QueryHandler.Initialize();
         }
-
-        public MainHandler() => new MainHandler();
     }
 }

EmbedExtension/PaginatorBuilder.cs

@@ -22,7 +22,7 @@
 // SOFTWARE.
 
 using System.Collections.Generic;
-using DSharpPlus.Entities;
+using DSharpPlus.Entities;
 
 namespace DSharpPlusDocs.EmbedExtension
 {

Handlers/CommandHandler.cs

@@ -1,26 +1,26 @@
-// This file is part of the DSharpPlus project.
-//
-// Copyright (c) 2015 Mike Santiago
-// Copyright (c) 2016-2022 DSharpPlus Contributors
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
+// This file is part of the DSharpPlus project.
+//
+// Copyright (c) 2015 Mike Santiago
+// Copyright (c) 2016-2022 DSharpPlus Contributors
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 using System;
 using System.Threading.Tasks;
 using DSharpPlus;
@@ -43,13 +43,13 @@ public class CommandHandler
         private DiscordClient _client;
         private MainHandler _mainHandler;
         private IServiceProvider _services;
-        private readonly MemoryCache cache = new MemoryCache(new MemoryCacheOptions { ExpirationScanFrequency = TimeSpan.FromMinutes(3) });
+        private readonly MemoryCache cache = new(new MemoryCacheOptions { ExpirationScanFrequency = TimeSpan.FromMinutes(3) });
 
         public Task InitializeAsync(MainHandler mainHandler)
         {
             _mainHandler = mainHandler;
             _client = mainHandler.Client;
-            ServiceCollection services = new ServiceCollection();
+            ServiceCollection services = new();
             services.AddSingleton(mainHandler);
             services.AddSingleton(new PaginationService(_client));
             _services = services.BuildServiceProvider();
@@ -66,42 +66,42 @@ public Task InitializeAsync(MainHandler mainHandler)
             _commands.RegisterCommands<GeneralCommands>();
 
             _client.MessageUpdated += HandleUpdate;
-            _commands.CommandErrored += _commands_CommandErrored;
+            _commands.CommandErrored += CommandErroredAsync;
 
             return Task.CompletedTask;
         }
 
-        private async Task _commands_CommandErrored(CommandsNextExtension commandsNext, CommandErrorEventArgs e)
+        private async Task CommandErroredAsync(CommandsNextExtension commandsNext, CommandErrorEventArgs e)
         {
             if (e.Exception is CommandNotFoundException)
             {
-                (string, DiscordEmbedBuilder, PaginatedMessage) reply = await BuildReply(e.Context.Message, e.Context.Message.Content.Substring(e.Context.Message.GetMentionPrefixLength(_client.CurrentUser)));
-                if (reply.Item1 == null && reply.Item2 == null && reply.Item3 == null)
-                {
-                    return;
-                }
-
-                DiscordMessage message = reply.Item3 != null
-                    ? await e.Context.Services.GetService<PaginationService>().SendPaginatedMessageAsync(e.Context.Channel, reply.Item3)
+                (string, DiscordEmbedBuilder, PaginatedMessage) reply = await BuildReplyAsync(e.Context.Message, e.Context.Message.Content[e.Context.Message.GetMentionPrefixLength(_client.CurrentUser)..]);
+                if (reply.Item1 == null && reply.Item2 == null && reply.Item3 == null)
+                {
+                    return;
+                }
+
+                DiscordMessage message = reply.Item3 != null
+                    ? await e.Context.Services.GetService<PaginationService>().SendPaginatedMessageAsync(e.Context.Channel, reply.Item3)
                     : await e.Context.RespondAsync(reply.Item1, embed: reply.Item2);
                 AddCache(e.Context.Message.Id, message.Id);
             }
-            else
-            {
-                Console.WriteLine(e.Exception);
-            }
+            else
+            {
+                Console.WriteLine(e.Exception);
+            }
         }
 
         public Task<int> HandleCommand(DiscordMessage msg)
         {
-            if (!msg.Channel.IsPrivate && msg.Channel.Guild.Id == 81384788765712384)
-            {
-                if (msg.Channel.Name != "dotnet_dsharpplus" && msg.Channel.Name != "testing" && msg.Channel.Name != "playground")
-                {
-                    return Task.FromResult(-1);
-                }
-            }
-
+            if (!msg.Channel.IsPrivate && msg.Channel.Guild.Id == 81384788765712384)
+            {
+                if (msg.Channel.Name is not "dotnet_dsharpplus" and not "testing" and not "playground")
+                {
+                    return Task.FromResult(-1);
+                }
+            }
+
             return Task.FromResult(msg.GetMentionPrefixLength(_client.CurrentUser));
         }
 
@@ -113,36 +113,36 @@ private Task HandleUpdate(DiscordClient client, MessageUpdateEventArgs e)
                 if ((id = GetOurMessageIdFromCache(e.Message.Id)) != null)
                 {
                     DiscordMessage botMessage = await e.Channel.GetMessageAsync(id.Value);
-                    if (botMessage == null)
-                    {
-                        return;
-                    }
-
+                    if (botMessage == null)
+                    {
+                        return;
+                    }
+
                     int argPos = 0;
-                    if ((argPos = await HandleCommand(e.Message)) == -1)
-                    {
-                        return;
-                    }
-
-                    (string, DiscordEmbedBuilder, PaginatedMessage) reply = await BuildReply(e.Message, e.Message.Content.Substring(argPos));
+                    if ((argPos = await HandleCommand(e.Message)) == -1)
+                    {
+                        return;
+                    }
+
+                    (string, DiscordEmbedBuilder, PaginatedMessage) reply = await BuildReplyAsync(e.Message, e.Message.Content[argPos..]);
+
+                    if (reply.Item1 == null && reply.Item2 == null && reply.Item3 == null)
+                    {
+                        return;
+                    }
 
-                    if (reply.Item1 == null && reply.Item2 == null && reply.Item3 == null)
-                    {
-                        return;
-                    }
-
                     PaginationService pagination = _services.GetService<PaginationService>();
                     bool isPaginatedMessage = pagination.IsPaginatedMessage(id.Value);
                     if (reply.Item3 != null)
                     {
-                        if (isPaginatedMessage)
-                        {
-                            await pagination.UpdatePaginatedMessageAsync(botMessage, reply.Item3);
-                        }
-                        else
-                        {
-                            await pagination.EditMessageToPaginatedMessageAsync(botMessage, reply.Item3);
-                        }
+                        if (isPaginatedMessage)
+                        {
+                            await pagination.UpdatePaginatedMessageAsync(botMessage, reply.Item3);
+                        }
+                        else
+                        {
+                            await pagination.EditMessageToPaginatedMessageAsync(botMessage, reply.Item3);
+                        }
                     }
                     else
                     {
@@ -158,7 +158,7 @@ private Task HandleUpdate(DiscordClient client, MessageUpdateEventArgs e)
             return Task.CompletedTask;
         }
 
-        private async Task<(string, DiscordEmbedBuilder, PaginatedMessage)> BuildReply(DiscordMessage msg, string message)
+        private async Task<(string, DiscordEmbedBuilder, PaginatedMessage)> BuildReplyAsync(DiscordMessage msg, string message)
         {
             if (!_mainHandler.QueryHandler.IsReady())
             {
@@ -171,13 +171,13 @@ private Task HandleUpdate(DiscordClient client, MessageUpdateEventArgs e)
                     (string, object) tuple = await _mainHandler.QueryHandler.RunAsync(message);
                     if (tuple.Item2 is PaginatorBuilder pag)
                     {
-                        PaginatedMessage paginated = new PaginatedMessage(pag.Pages, "Results", user: msg.Author, options: new AppearanceOptions { Timeout = TimeSpan.FromMinutes(10) });
+                        PaginatedMessage paginated = new(pag.Pages, "Results", user: msg.Author, options: new AppearanceOptions { Timeout = TimeSpan.FromMinutes(10) });
                         return (null, null, paginated);
                     }
-                    else
-                    {
-                        return (tuple.Item1, tuple.Item2 as DiscordEmbedBuilder, null);
-                    }
+                    else
+                    {
+                        return (tuple.Item1, tuple.Item2 as DiscordEmbedBuilder, null);
+                    }
                 }
                 catch (Exception e)
                 {

Handlers/QueryHandler.cs

@@ -21,42 +21,42 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System.Threading.Tasks;
-using DSharpPlusDocs.Query;
-using DSharpPlusDocs.Query.Results;
-
-namespace DSharpPlusDocs.Handlers
-{
-    public class QueryHandler
-    {
-        public Cache Cache { get; private set; }
-        public static string DocsBaseUrl { get; set; } = "https://dsharpplus.emzi0767.com/";
-
-        public QueryHandler() => Cache = new Cache();
-
-        public void Initialize() => Cache.Initialize();
-
-        public async Task<(string, object)> RunAsync(string text)
-        {
-            InterpreterResult interpreterResult = new TextInterpreter(text).Run();
+using System.Threading.Tasks;
+using DSharpPlusDocs.Query;
+using DSharpPlusDocs.Query.Results;
+
+namespace DSharpPlusDocs.Handlers
+{
+    public class QueryHandler
+    {
+        public Cache Cache { get; private set; }
+        public static string DocsBaseUrl { get; set; } = "https://dsharpplus.emzi0767.com/";
+
+        public QueryHandler() => Cache = new Cache();
+
+        public void Initialize() => Cache.Initialize();
+
+        public async Task<(string, object)> RunAsync(string text)
+        {
+            InterpreterResult interpreterResult = new TextInterpreter(text).Run();
             if (!interpreterResult.IsSuccess)
             {
                 return ($"{interpreterResult.Error}", null);
             }
 
-            object result = interpreterResult.Search == SearchType.JUST_NAMESPACE
-                ? await SearchAsync(interpreterResult, SearchType.NONE) ?? await SearchAsync(interpreterResult, SearchType.JUST_NAMESPACE) ?? await SearchAsync(interpreterResult, SearchType.JUST_TEXT) ?? await SearchAsync(interpreterResult, SearchType.ALL)
-                : await SearchAsync(interpreterResult, SearchType.NONE) ?? await SearchAsync(interpreterResult, SearchType.JUST_TEXT) ?? await SearchAsync(interpreterResult, SearchType.JUST_NAMESPACE) ?? await SearchAsync(interpreterResult, SearchType.ALL);
-            return result == null ? ($"No results found for `{text}`.", null) : ("", result);
-        }
-
-        private async Task<object> SearchAsync(InterpreterResult interpreterResult, SearchType type)
-        {
-            interpreterResult.Search = type;
-            SearchResult<object> searchResult = new Search(interpreterResult, Cache).Run();
-            return searchResult.Count != 0 ? await new ResultDisplay(searchResult, Cache, interpreterResult.IsList).RunAsync() : null;
-        }
-
-        public bool IsReady() => Cache.IsReady();
-    }
-}
+            object result = interpreterResult.Search == SearchType.JustNamespace
+                ? await SearchAsync(interpreterResult, SearchType.None) ?? await SearchAsync(interpreterResult, SearchType.JustNamespace) ?? await SearchAsync(interpreterResult, SearchType.JustText) ?? await SearchAsync(interpreterResult, SearchType.All)
+                : await SearchAsync(interpreterResult, SearchType.None) ?? await SearchAsync(interpreterResult, SearchType.JustText) ?? await SearchAsync(interpreterResult, SearchType.JustNamespace) ?? await SearchAsync(interpreterResult, SearchType.All);
+            return result == null ? ($"No results found for `{text}`.", null) : ("", result);
+        }
+
+        private async Task<object> SearchAsync(InterpreterResult interpreterResult, SearchType type)
+        {
+            interpreterResult.Search = type;
+            SearchResult<object> searchResult = new Search(interpreterResult, Cache).Run();
+            return searchResult.Count != 0 ? await new ResultDisplay(searchResult, Cache, interpreterResult.IsList).RunAsync() : null;
+        }
+
+        public bool IsReady() => Cache.IsReady();
+    }
+}