Merge remote-tracking branch 'upstream/main' into feat/voice-status

# Conflicts:
#	Backend/Remora.Discord.API.Abstractions/API/Objects/Permissions/DiscordPermission.cs

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "docfx": {
-      "version": "2.62.2",
+      "version": "2.76.0",
       "commands": [
         "docfx"
       ]

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,12 +1,11 @@
 # Based on an issue template from the Discord API documentation.
 name: Bug Report
 description: A bug has been found in the library
-title: "[Bug]: "
 labels: ["bug"]
 body:
   - type: markdown
     attributes:
-      value: "Before opening a new issue, please search existing issues:  https://github.com/Nihlus/Remora.Discord/issues"
+      value: "Before opening a new issue, please search existing issues: https://github.com/Remora/Remora.Discord/issues?q=is%3Aissue+label%3Abug"
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Developer Documentation
-    url: https://nihlus.github.io/Remora.Discord/
-    about: Need documentation and examples for the API? Head over to Discord's developer documentation.
+    url: https://remora.github.io/Remora.Discord/main/articles/intro.html
+    about: Need documentation and examples for the API? Head over to Remora.Discord's documentation.
   - name: Discord Server
     url: https://discord.gg/dyYmwashVs
     about: Need help with the library? Talk to us in our Discord server.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,11 +1,11 @@
 # Based on an issue template from the Discord API documentation.
 name: Feature Request
 description: Suggestions for new or different behavior in the library
-labels: ["feature request"]
+labels: ["enhancement"]
 body:
   - type: markdown
     attributes:
-      value: "Before opening a new issue, please search existing issues:  https://github.com/Nihlus/Remora.Discord/issues"
+      value: "Before opening a new issue, please search existing issues: https://github.com/Remora/Remora.Discord/issues?q=is%3Aissue+label%3Aenhancement"
   - type: textarea
     id: description
     attributes:
@@ -33,4 +33,4 @@ body:
       label: Additional Details
       description: Is there anything else you can add about this feature request?
     validations:
-      required: false
+      required: false

.github/workflows/dotnet.yml

@@ -18,47 +18,59 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: |
-          6.0.x
-          7.0.x
-
-    - name: Build
-      run: |
-        dotnet restore
-        dotnet build -c Release --no-restore
-
-    - name: Test
-      run: dotnet test -c Release --no-restore --no-build --verbosity minimal
-
-    - name: Package
-      if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-      run: dotnet pack -c Release --no-restore --no-build --version-suffix "github$GITHUB_RUN_ID"
-
-    - uses: actions/upload-artifact@v3
-      if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-      with:
-        name: nupkg
-        path: nuget/*
-
-    - name: Build Docs
-      if: github.event_name == 'push'
-      run: |
-        dotnet tool restore
-        cd ./docfx
-        sed -i -E "s/%APP_VERSION%/${GITHUB_REF_NAME}/" docfx_project/docfx.json
-        dotnet docfx docfx_project/docfx.json
-
-    - uses: actions/upload-artifact@v3
-      if: github.event_name == 'push'
-      with:
-        name: docfx-site
-        path: docfx/docfx_project/_site/
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            6.0.x
+            7.0.x
+            8.0.x
+
+      - name: Build
+        run: |
+          dotnet restore
+          dotnet build -c Release --no-restore
+
+      - name: Test
+        run: dotnet test -c Release --no-restore --no-build --verbosity minimal
+
+      - name: Inspect
+        uses: JetBrains/[email protected]
+        with:
+          tool-version: 2023.3.4
+          solution: Remora.Discord.sln
+          build: false
+          no-build: true
+          telemetry-optout: true
+
+      - name: Package
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        run: dotnet pack -c Release --no-restore --no-build --version-suffix "github$GITHUB_RUN_ID"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: nupkg
+          path: nuget/*
+
+      - name: Build Docs
+        if: github.event_name == 'push'
+        run: |
+          dotnet tool restore
+          cd ./docfx
+          sed -i -E "s/%APP_VERSION%/${GITHUB_REF_NAME}/" docfx_project/docfx.json
+          dotnet docfx docfx_project/docfx.json
+
+      - uses: actions/upload-artifact@v4
+        if: github.event_name == 'push'
+        with:
+          name: docfx-site
+          path: docfx/docfx_project/_site/
+
+    permissions:
+      security-events: write
 
   publish_docs:
     name: Publish Documentation
@@ -71,12 +83,12 @@ jobs:
 
     steps:
       - name: Checkout triggering branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: base
 
       - name: Checkout gh-pages
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: gh-pages
           path: site
@@ -85,7 +97,7 @@ jobs:
         run: bash base/docfx/scripts/prepare.sh
 
       - name: Download documentation artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docfx-site
           path: site/${{ github.ref_name }}
@@ -107,15 +119,17 @@ jobs:
 
     steps:
       - name: Download package artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nupkg
           path: nuget
 
       # To ensure that the current version being pushed does not get pruned we prune first.
       - name: Prune packages older than 4 versions (new version is the 5th)
-        uses: smartsquaregmbh/delete-old-packages@v0.6.0
+        uses: smartsquaregmbh/delete-old-packages@v0.8.0
         with:
+          organization: Remora
+          type: nuget
           keep: 4
           names: |
             Remora.Discord

Backend/Remora.Discord.API.Abstractions/API/Gateway/Bidirectional/IHeartbeatAcknowledge.cs

@@ -30,6 +30,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Bidirectional;
 /// Represents a heartbeat acknowledgement. This interface defines no data.
 /// </summary>
 [PublicAPI]
-public interface IHeartbeatAcknowledge : IGatewayEvent, IGatewayCommand
-{
-}
+public interface IHeartbeatAcknowledge : IGatewayEvent, IGatewayCommand;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Commands/IGatewayCommand.cs

@@ -28,6 +28,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Commands;
 /// Represents a marker interface for gateway commands.
 /// </summary>
 [PublicAPI]
-public interface IGatewayCommand : IGatewayPayloadData
-{
-}
+public interface IGatewayCommand : IGatewayPayloadData;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/ApplicationCommands/IApplicationCommandPermissionsUpdate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents an update to the permissions of a command.
 /// </summary>
 [PublicAPI]
-public interface IApplicationCommandPermissionsUpdate : IGatewayEvent, IGuildApplicationCommandPermissions
-{
-}
+public interface IApplicationCommandPermissionsUpdate : IGatewayEvent, IGuildApplicationCommandPermissions;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/AuditLog/IGuildAuditLogEntryCreate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the creation of an audit log entry.
 /// </summary>
 [PublicAPI]
-public interface IGuildAuditLogEntryCreate : IGatewayEvent, IAuditLogEntry
-{
-}
+public interface IGuildAuditLogEntryCreate : IGatewayEvent, IAuditLogEntry;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/AutoModeration/IAutoModerationRuleCreate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the update of an auto moderation rule.
 /// </summary>
 [PublicAPI]
-public interface IAutoModerationRuleCreate : IGatewayEvent, IAutoModerationRule
-{
-}
+public interface IAutoModerationRuleCreate : IGatewayEvent, IAutoModerationRule;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/AutoModeration/IAutoModerationRuleDelete.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the deletion of an auto moderation rule.
 /// </summary>
 [PublicAPI]
-public interface IAutoModerationRuleDelete : IGatewayEvent, IAutoModerationRule
-{
-}
+public interface IAutoModerationRuleDelete : IGatewayEvent, IAutoModerationRule;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/AutoModeration/IAutoModerationRuleUpdate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the creation of an auto moderation rule.
 /// </summary>
 [PublicAPI]
-public interface IAutoModerationRuleUpdate : IGatewayEvent, IAutoModerationRule
-{
-}
+public interface IAutoModerationRuleUpdate : IGatewayEvent, IAutoModerationRule;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IChannelCreate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the creation of a channel.
 /// </summary>
 [PublicAPI]
-public interface IChannelCreate : IGatewayEvent, IChannel
-{
-}
+public interface IChannelCreate : IGatewayEvent, IChannel;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IChannelDelete.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the deletion of a channel.
 /// </summary>
 [PublicAPI]
-public interface IChannelDelete : IGatewayEvent, IChannel
-{
-}
+public interface IChannelDelete : IGatewayEvent, IChannel;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IChannelUpdate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the update of a channel.
 /// </summary>
 [PublicAPI]
-public interface IChannelUpdate : IGatewayEvent, IChannel
-{
-}
+public interface IChannelUpdate : IGatewayEvent, IChannel;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IStageInstanceCreate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the creation of a stage instance.
 /// </summary>
 [PublicAPI]
-public interface IStageInstanceCreate : IStageInstance, IGatewayEvent
-{
-}
+public interface IStageInstanceCreate : IStageInstance, IGatewayEvent;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IStageInstanceDelete.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents a deletion of a stage instance.
 /// </summary>
 [PublicAPI]
-public interface IStageInstanceDelete : IStageInstance, IGatewayEvent
-{
-}
+public interface IStageInstanceDelete : IStageInstance, IGatewayEvent;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IStageInstanceUpdate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents an update of a stage instance.
 /// </summary>
 [PublicAPI]
-public interface IStageInstanceUpdate : IStageInstance, IGatewayEvent
-{
-}
+public interface IStageInstanceUpdate : IStageInstance, IGatewayEvent;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IThreadDelete.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the creation of a channel.
 /// </summary>
 [PublicAPI]
-public interface IThreadDelete : IGatewayEvent, IPartialChannel
-{
-}
+public interface IThreadDelete : IGatewayEvent, IPartialChannel;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/Channels/IThreadUpdate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents the creation of a channel.
 /// </summary>
 [PublicAPI]
-public interface IThreadUpdate : IGatewayEvent, IChannel
-{
-}
+public interface IThreadUpdate : IGatewayEvent, IChannel;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/ConnectingResuming/IReconnect.cs

@@ -28,6 +28,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents a reconnection request. This interface defines no data.
 /// </summary>
 [PublicAPI]
-public interface IReconnect : IGatewayEvent
-{
-}
+public interface IReconnect : IGatewayEvent;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/ConnectingResuming/IResumed.cs

@@ -28,6 +28,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Represents an event that marks the completion of a session resumption.
 /// </summary>
 [PublicAPI]
-public interface IResumed : IGatewayEvent
-{
-}
+public interface IResumed : IGatewayEvent;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/GuildScheduledEvents/IGuildScheduledEventCreate.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Sent when a scheduled event is created.
 /// </summary>
 [PublicAPI]
-public interface IGuildScheduledEventCreate : IGatewayEvent, IGuildScheduledEvent
-{
-}
+public interface IGuildScheduledEventCreate : IGatewayEvent, IGuildScheduledEvent;

Backend/Remora.Discord.API.Abstractions/API/Gateway/Events/GuildScheduledEvents/IGuildScheduledEventDelete.cs

@@ -29,6 +29,4 @@ namespace Remora.Discord.API.Abstractions.Gateway.Events;
 /// Sent when a scheduled event is deleted.
 /// </summary>
 [PublicAPI]
-public interface IGuildScheduledEventDelete : IGatewayEvent, IGuildScheduledEvent
-{
-}
+public interface IGuildScheduledEventDelete : IGatewayEvent, IGuildScheduledEvent;