Merge remote-tracking branch 'dspng/main'

Author: Lulalaby

.editorconfig

@@ -3,8 +3,8 @@ root = true
 
 #### Core EditorConfig Options ####
 
-# All files 
-[*] 
+# All files
+[*]
 
 # General
 charset = utf-8
@@ -39,7 +39,7 @@ tab_width = 4
 # Organize usings
 dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
-file_header_template = This file is part of the DSharpPlus project.\n\nCopyright (c) 2015 Mike Santiago\nCopyright (c) 2016-2021 DSharpPlus Contributors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.
+file_header_template = This file is part of the DSharpPlusNextGen project.\n\nCopyright (c) 2021 AITSYS\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.
 
 # this. and Me. preferences
 dotnet_style_qualification_for_event = true:error
@@ -215,19 +215,19 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 
 dotnet_naming_symbols.interface.applicable_kinds = interface
 dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers = 
+dotnet_naming_symbols.interface.required_modifiers =
 
 dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field
 dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected
-dotnet_naming_symbols.private_or_internal_field.required_modifiers = 
+dotnet_naming_symbols.private_or_internal_field.required_modifiers =
 
 dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
 dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers = 
+dotnet_naming_symbols.types.required_modifiers =
 
 dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
 dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers = 
+dotnet_naming_symbols.non_field_members.required_modifiers =
 
 dotnet_naming_symbols.async_methods.applicable_kinds = method
 dotnet_naming_symbols.async_methods.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
@@ -239,22 +239,22 @@ dotnet_naming_symbols.const_fields.required_modifiers = const
 
 # Naming styles
 
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.required_prefix =
+dotnet_naming_style.pascal_case.required_suffix =
+dotnet_naming_style.pascal_case.word_separator =
 dotnet_naming_style.pascal_case.capitalization = pascal_case
 
 dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix = 
-dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.required_suffix =
+dotnet_naming_style.begins_with_i.word_separator =
 dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
 dotnet_naming_style.underscore_prefixed_camel_case.required_prefix = _
-dotnet_naming_style.underscore_prefixed_camel_case.required_suffix = 
-dotnet_naming_style.underscore_prefixed_camel_case.word_separator = 
+dotnet_naming_style.underscore_prefixed_camel_case.required_suffix =
+dotnet_naming_style.underscore_prefixed_camel_case.word_separator =
 dotnet_naming_style.underscore_prefixed_camel_case.capitalization = camel_case
 
-dotnet_naming_style.async_suffix.required_prefix = 
+dotnet_naming_style.async_suffix.required_prefix =
 dotnet_naming_style.async_suffix.required_suffix = Async
-dotnet_naming_style.async_suffix.word_separator = 
+dotnet_naming_style.async_suffix.word_separator =
 dotnet_naming_style.async_suffix.capitalization = pascal_case

.github/FUNDING.yml

@@ -1,19 +1,5 @@
-# These are supported funding model platforms
-
-#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-github: 
- - Naamloos
- - Emzi0767
-#patreon: # Replace with a single Patreon username
-#open_collective: # Replace with a single Open Collective username
-#ko_fi: # Replace with a single Ko-fi username
-#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-#liberapay: # Replace with a single Liberapay username
-#issuehunt: # Replace with a single IssueHunt username
-#otechie: # Replace with a single Otechie username
+github:
+ - Lulalaby
+patreon: aiko_it_systems
 custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
- - https://ko-fi.com/naamloos
- - https://ko-fi.com/emzi0767
- - https://paypal.me/Emzi0767/5USD
-# insert Neuheit here
+ - https://paypal.me/aitsys

.github/workflows/codeinspector.yml

@@ -0,0 +1,21 @@
+on: [push]
+
+jobs:
+  check-quality:
+    runs-on: ubuntu-latest
+    name: A job to check the code quality
+    steps:
+    - name: Check code meets quality standards
+      id: code-inspector
+      uses: codeinspectorio/github-action@master
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        code_inspector_access_key: ${{ secrets.CODE_INSPECTOR_ACCESS_KEY }}
+        code_inspector_secret_key: ${{ secrets.CODE_INSPECTOR_SECRET_KEY }}
+        min_quality_grade: 'WARNING'
+        min_quality_score: '30'
+        max_defects_rate: '0.1'
+        max_complex_functions_rate: '0.1'
+        max_long_functions_rate: '0.1'
+        project_name: 'DSharpPlusNextGen'
+        max_timeout_sec: '600'

.github/workflows/dotnet.yml

@@ -0,0 +1,25 @@
+name: .NET
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

.gitignore

@@ -296,10 +296,6 @@ artifacts/
 
 ### Test files
 config.json
-libsodium.dll
-libopus.dll
-sodium.dll
-opus.dll
 ffmpeg.exe
 *.pcm
-appveyor-test.ps1
+appveyor-test.ps1

.vscode/tasks.json

@@ -1,6 +1,4 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
         {
@@ -47,4 +45,4 @@
             "problemMatcher": "$msCompile"
         }
     ]
-}
+}

BUILDING.md

@@ -1,5 +1,5 @@
 # Building DSharpPlus
-These are detailed instructions on how to build the DSharpPlus library under various environmnets.
+These are detailed instructions on how to build the DSharpPlusNextGen library under various environmnets.
 
 It is recommended you have prior experience with multi-target .NET Core/Standard projects, as well as the `dotnet` CLI utility, and MSBuild.
 
@@ -55,20 +55,20 @@ Building through Visual Studio yields just binaries you can use in your projects
 #### Building with the build script
 Building this way outputs NuGet packages, and a documentation package. Ensure you have an internet connection available, as the script will install programs necessary to build the documentation.
 
-1. Open PowerShell and navigate to the directory which you cloned DSharpPlus to.
+1. Open PowerShell and navigate to the directory which you cloned DSharpPlusNextGen to.
 2. Execute `.\rebuild-all.ps1 -configuration Release` and wait for the script to finish execution.
-3. Once it's done, the artifacts will be available in *dsp-artifacts* directory, next to the directory to which the repository is cloned.
+3. Once it's done, the artifacts will be available in *dsp-ng-artifacts* directory, next to the directory to which the repository is cloned.
 
 ### GNU/Linux
 When all necessary prerequisites are installed, you can proceed to building. There are technically 2 ways to build the library, though both of them perform the same steps, they are just invoked slightly differently.
 
 #### Through Visual Studio Code
-1. Open Visual Studio Code and open the folder to which you cloned DSharpPlus as your workspace.
+1. Open Visual Studio Code and open the folder to which you cloned DSharpPlusNextGen as your workspace.
 2. Select Build > Run Task...
 3. Select `buildRelease` task and wait for it to finish.
-4. The artifacts will be placed in *dsp-artifacts* directory, next to whoch the repository is cloned.
+4. The artifacts will be placed in *dsp-ng-artifacts* directory, next to whoch the repository is cloned.
 
 #### Through PowerShell
-1. Open PowerShell (`pwsh`) and navigate to the directory which you cloned DSharpPlus to.
+1. Open PowerShell (`pwsh`) and navigate to the directory which you cloned DSharpPlusNextGen to.
 2. Execute `.\rebuild-all.ps1 -configuration Release` and wait for the script to finish execution.
-3. Once it's done, the artifacts will be available in *dsp-artifacts* directory, next to the directory to which the repository is cloned.
+3. Once it's done, the artifacts will be available in *dsp-ng-artifacts* directory, next to the directory to which the repository is cloned.

CONTRIBUTING.md

@@ -1,18 +1,18 @@
-# Contributing to DSharpPlus
+# Contributing to DSharpPlus-NextGen
 We're really happy to accept contributions. However we also ask that you follow several rules when doing so.
 
 # Proper base
-When opening a PR, please make sure your branch targets the latest release branch, in this case it would be `release/4.0`. Also make sure your branch is even with the target branch, to avoid unnecessary surprises.
+When opening a PR, please make sure your branch targets the latest release branch, in this case it would be `main`. Also make sure your branch is even with the target branch, to avoid unnecessary surprises.
 
 # Versioning
-We follow [SemVer](https://semver.org/) versioning when it comes to pushing stable releases. Ideally, this means you should only be creating PRs for `patch` and `minor` changes. If you wish to introduce a `major` (breaking) change, please discuss it beforehand so we can determine how to integrate it into our next major version. If this involves removing a public facing property/method, mark it with the `Obsolete` attribute instead on the latest release branch. 
+We follow [SemVer](https://semver.org/) versioning when it comes to pushing stable releases. Ideally, this means you should only be creating PRs for `patch` and `minor` changes. If you wish to introduce a `major` (breaking) change, please discuss it beforehand so we can determine how to integrate it into our next major version. If this involves removing a public facing property/method, mark it with the `Obsolete` attribute instead on the latest release branch.
 
 # Proper titles
-When opening issues, make sure the title reflects the purpose of the issue or the pull request. Prefer past tense, and 
+When opening issues, make sure the title reflects the purpose of the issue or the pull request. Prefer past tense, and
 be brief. Further description belongs inside the issue or PR.
 
 # Descriptive changes
-We require the commits describe the change made. It can be a short description. If you fixed or resolved an open issue, 
+We require the commits describe the change made. It can be a short description. If you fixed or resolved an open issue,
 please reference it by using the # notation.
 
 Examples of good commit messages:
@@ -23,7 +23,7 @@ Examples of good commit messages:
 * `Fixed a potential NRE.`
 * ```
   Changed message cache behaviour:
-  
+
   - Messages are now stored globally.
   - Cache now deletes messages when they are deleted from discord.
   - Cache itself is now a ring buffer.
@@ -37,23 +37,23 @@ Examples of bad commit messages:
 * `Oops.`
 
 # Code style
-We use [Microsoft C# Coding Conventions](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/inside-a-program/coding-conventions) 
+We use [Microsoft C# Coding Conventions](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/inside-a-program/coding-conventions)
 throughout the repository, with several exceptions:
 
 * Preference of `this`. While this one is not required, it's ill-advised to remove the existing instances thereof.
-* When working with async code, and your method consists of a single `await` statement not in any `if`, `while`, etc. 
+* When working with async code, and your method consists of a single `await` statement not in any `if`, `while`, etc.
   blocks, pass the task through instead of awaiting it. For example:
-  
+
   ```cs
   public Task DoSomethingAsync()
     => this.DoAnotherThingAsync();
-      
+
   public Task DoAnotherThingAsync()
   {
       Console.WriteLine("42");
       return this.DoYetAnotherThingAsync(42);
   }
-  
+
   public async Task DoYetAnotherThingAsync(int num)
   {
       if (num == 42)
@@ -71,15 +71,15 @@ In addition to these, we also have several preferences:
       StringNumber = "fourty-two",
       Number = 42
   };
-  
+
   var b = new Dictionary<string, int>()
   {
       ["fourty-two"] = 42,
       ["sixty-nine"] = 69
   };
-  
+
   var c = new List<int>() { 42, 69 };
-  
+
   var d = new[] { 42, 69 };
   ```
 * Inline `out` declarations when possible: `SomeOutMethod(42, out var stringified);`
@@ -107,17 +107,17 @@ In addition to these, we also have several preferences:
    * Non-public events.
 
 # Code changes
-One of our requirements is that all code change commits must build successfully. This is verified by our CI. When you 
-open a pull request, AppVeyor will start a build. You can view its summary by visiting it from the checks section on 
+One of our requirements is that all code change commits must build successfully. This is verified by our CI. When you
+open a pull request, AppVeyor will start a build. You can view its summary by visiting it from the checks section on
 the PR overview page.
 
 PRs that do not build will not be accepted.
 
 Furthermore we require that methods you implement on Discord entities have a reflection in the Discord API.
 
-In the event your code change is a style change, XML doc change, or otherwise does not change how the code works, tag 
+In the event your code change is a style change, XML doc change, or otherwise does not change how the code works, tag
 the commit with `[ci skip]`.
 
 # Non-code changes
-In the event you change something outside of code (i.e. a meta-change or documentation), you must tag your commit with 
+In the event you change something outside of code (i.e. a meta-change or documentation), you must tag your commit with
 `[ci skip]`.

DSharpPlusNextGen.CommandsNext/Attributes/AliasesAttribute.cs

@@ -0,0 +1,54 @@
+// This file is part of the DSharpPlus project.
+//
+// Copyright (c) 2015 Mike Santiago
+// Copyright (c) 2016-2021 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.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace DSharpPlusNextGen.CommandsNext.Attributes
+{
+    /// <summary>
+    /// Adds aliases to this command or group.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false)]
+    public sealed class AliasesAttribute : Attribute
+    {
+        /// <summary>
+        /// Gets this group's aliases.
+        /// </summary>
+        public IReadOnlyList<string> Aliases { get; }
+
+        /// <summary>
+        /// Adds aliases to this command or group.
+        /// </summary>
+        /// <param name="aliases">Aliases to add to this command or group.</param>
+        public AliasesAttribute(params string[] aliases)
+        {
+            if (aliases.Any(xa => xa == null || xa.Any(xc => char.IsWhiteSpace(xc))))
+                throw new ArgumentException("Aliases cannot contain whitespace characters or null strings.", nameof(aliases));
+
+            this.Aliases = new ReadOnlyCollection<string>(aliases);
+        }
+    }
+}