diff --git a/Backend/Remora.Discord.Gateway/Extensions/ServiceCollectionExtensions.cs b/Backend/Remora.Discord.Gateway/Extensions/ServiceCollectionExtensions.cs index e7e8f95c55..9e122d0d20 100644 --- a/Backend/Remora.Discord.Gateway/Extensions/ServiceCollectionExtensions.cs +++ b/Backend/Remora.Discord.Gateway/Extensions/ServiceCollectionExtensions.cs @@ -49,18 +49,24 @@ public static class ServiceCollectionExtensions /// /// The service collection. /// A function that retrieves the bot token. + /// The base API endpoint. + /// The base path to the CDN. + /// The type of token to register. /// Extra options to configure the rest client. /// The service collection, with the services added. public static IServiceCollection AddDiscordGateway ( this IServiceCollection serviceCollection, Func tokenFactory, + Uri apiBasePath, + Uri cdnBasePath, + DiscordTokenType tokenType = DiscordTokenType.Bot, Action? buildClient = null ) { serviceCollection.AddSingleton ( - ctx => new StaticTokenStore(tokenFactory(ctx), DiscordTokenType.Bot) + ctx => new StaticTokenStore(tokenFactory(ctx), tokenType, apiBasePath, cdnBasePath) ); return serviceCollection.AddDiscordGateway(buildClient); diff --git a/Backend/Remora.Discord.Rest/Constants.cs b/Backend/Remora.Discord.Rest/Constants.cs index 3d71206d1e..3f6229a771 100644 --- a/Backend/Remora.Discord.Rest/Constants.cs +++ b/Backend/Remora.Discord.Rest/Constants.cs @@ -35,7 +35,7 @@ public static class Constants /// /// Gets the base API URL. /// - public static Uri BaseURL { get; } = new($"https://discord.com/api/v{(int)DiscordAPIVersion.V10}/"); + public static Uri DiscordBaseURL { get; } = new($"https://discord.com/api/v{(int)DiscordAPIVersion.V10}/"); /// /// Gets the name of the audit log reason header. diff --git a/Backend/Remora.Discord.Rest/DiscordTokenType.cs b/Backend/Remora.Discord.Rest/DiscordTokenType.cs index ddaa63ccf1..268ca74556 100644 --- a/Backend/Remora.Discord.Rest/DiscordTokenType.cs +++ b/Backend/Remora.Discord.Rest/DiscordTokenType.cs @@ -38,5 +38,14 @@ public enum DiscordTokenType /// /// The token gained through OAuth2 API. /// - Bearer + Bearer, + + /// + /// The token gained by authenticating as a user. + /// + /// + /// This kind of token doesn't actually exist. The type is simply not transmitted in this case. + /// This value is provided only for use internal to Remora.Discord. + /// + User } diff --git a/Backend/Remora.Discord.Rest/Extensions/ServiceCollectionExtensions.cs b/Backend/Remora.Discord.Rest/Extensions/ServiceCollectionExtensions.cs index d59d36d5f3..8a9c42a1f6 100644 --- a/Backend/Remora.Discord.Rest/Extensions/ServiceCollectionExtensions.cs +++ b/Backend/Remora.Discord.Rest/Extensions/ServiceCollectionExtensions.cs @@ -60,19 +60,23 @@ public static class ServiceCollectionExtensions /// /// A function that creates or retrieves the authorization token and its token type. /// + /// /// The base API endpoint. + /// The base path to the CDN. /// Extra client building operations. /// The service collection, with the services added. public static IServiceCollection AddDiscordRest ( this IServiceCollection serviceCollection, Func tokenFactory, + Uri apiBasePath, + Uri cdnBasePath, Action? buildClient = null ) { serviceCollection.AddSingleton(ctx => { var (token, type) = tokenFactory(ctx); - return new StaticTokenStore(token, type); + return new StaticTokenStore(token, type, apiBasePath, cdnBasePath); }); return serviceCollection.AddDiscordRest(buildClient); @@ -243,13 +247,14 @@ public static IServiceCollection AddDiscordRest var retryDelay = Backoff.DecorrelatedJitterBackoffV2(TimeSpan.FromSeconds(1), 5); var clientBuilder = serviceCollection .AddRestHttpClient("Discord") - .ConfigureHttpClient((_, client) => + .ConfigureHttpClient((services, client) => { + IAsyncTokenStore tokenStore = services.GetRequiredService(); var assemblyName = Assembly.GetExecutingAssembly().GetName(); var name = assemblyName.Name ?? "Remora.Discord"; var version = assemblyName.Version ?? new Version(1, 0, 0); - client.BaseAddress = Constants.BaseURL; + client.BaseAddress = tokenStore.BaseApiUri; client.DefaultRequestHeaders.UserAgent.Add ( new ProductInfoHeaderValue(name, version.ToString()) diff --git a/Backend/Remora.Discord.Rest/IAsyncTokenStore.cs b/Backend/Remora.Discord.Rest/IAsyncTokenStore.cs index fe264f24e2..77fca5333a 100644 --- a/Backend/Remora.Discord.Rest/IAsyncTokenStore.cs +++ b/Backend/Remora.Discord.Rest/IAsyncTokenStore.cs @@ -20,6 +20,7 @@ // along with this program. If not, see . // +using System; using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; @@ -43,4 +44,14 @@ public interface IAsyncTokenStore /// Gets the type of the token. /// DiscordTokenType TokenType { get; } + + /// + /// Gets the base uri to the Discord API. + /// + Uri BaseApiUri { get; } + + /// + /// Gets the base uri to the Discord CDN. + /// + Uri BaseCDNUri { get; } } diff --git a/Backend/Remora.Discord.Rest/StaticTokenStore.cs b/Backend/Remora.Discord.Rest/StaticTokenStore.cs index 22978a6d9e..daefc2b7e7 100644 --- a/Backend/Remora.Discord.Rest/StaticTokenStore.cs +++ b/Backend/Remora.Discord.Rest/StaticTokenStore.cs @@ -20,6 +20,7 @@ // along with this program. If not, see . // +using System; using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; @@ -29,25 +30,24 @@ namespace Remora.Discord.Rest; /// /// Represents a storage class for a static token. /// +/// The token to store. +/// The type of token to store. +/// The base uri for the Discord API. +/// The base uri for the Discord CDN. [PublicAPI] -public class StaticTokenStore : IAsyncTokenStore +public class StaticTokenStore(string token, DiscordTokenType tokenType, Uri baseAPIUri, Uri baseCDNUri) : IAsyncTokenStore { - private readonly string _token; + private readonly string _token = token; /// public ValueTask GetTokenAsync(CancellationToken cancellationToken) => new(_token); /// - public DiscordTokenType TokenType { get; } + public DiscordTokenType TokenType { get; } = tokenType; - /// - /// Initializes a new instance of the class. - /// - /// The token to store. - /// The type of token to store. - public StaticTokenStore(string token, DiscordTokenType tokenType) - { - _token = token; - this.TokenType = tokenType; - } + /// + public Uri BaseApiUri { get; } = baseAPIUri; + + /// + public Uri BaseCDNUri { get; } = baseCDNUri; } diff --git a/Remora.Discord.Hosting/Extensions/HostBuilderExtensions.cs b/Remora.Discord.Hosting/Extensions/HostBuilderExtensions.cs index 0dfd7d1a83..e73eff732e 100644 --- a/Remora.Discord.Hosting/Extensions/HostBuilderExtensions.cs +++ b/Remora.Discord.Hosting/Extensions/HostBuilderExtensions.cs @@ -28,6 +28,7 @@ using Remora.Discord.Gateway.Extensions; using Remora.Discord.Hosting.Options; using Remora.Discord.Hosting.Services; +using Remora.Discord.Rest; using Remora.Extensions.Options.Immutable; namespace Remora.Discord.Hosting.Extensions; @@ -51,12 +52,26 @@ public static IHostBuilder AddDiscordService this IHostBuilder hostBuilder, Func tokenFactory, Action? buildClient = null + ) + => AddDiscordService(hostBuilder, tokenFactory, DiscordServiceOptions.Discord, buildClient); + + /// + /// + /// + /// The used to configure this service. + /// + public static IHostBuilder AddDiscordService + ( + this IHostBuilder hostbuilder, + Func tokenFactory, + DiscordServiceOptions discordServiceOptions, + Action? buildClient = null ) { - hostBuilder.ConfigureServices((_, serviceCollection) => - serviceCollection.AddDiscordService(tokenFactory, buildClient)); + hostbuilder.ConfigureServices((_, serviceCollection) => + serviceCollection.AddDiscordService(tokenFactory, discordServiceOptions, buildClient)); - return hostBuilder; + return hostbuilder; } /// @@ -65,19 +80,23 @@ public static IHostBuilder AddDiscordService /// /// The service collection. /// A function that retrieves the bot token. + /// The used to configure this service. /// Extra options to configure the rest client. /// The service collection, with the services added. public static IServiceCollection AddDiscordService ( this IServiceCollection serviceCollection, Func tokenFactory, + DiscordServiceOptions discordServiceOptions, Action? buildClient = null ) { - serviceCollection.Configure(() => new DiscordServiceOptions()); + discordServiceOptions.Verify(); + + serviceCollection.Configure(() => discordServiceOptions); serviceCollection - .AddDiscordGateway(tokenFactory, buildClient); + .AddDiscordGateway(tokenFactory, discordServiceOptions.APIBasePath, discordServiceOptions.CDNBasePath, discordServiceOptions.TokenType, buildClient); serviceCollection .TryAddSingleton(); diff --git a/Remora.Discord.Hosting/Options/DiscordServiceOptions.cs b/Remora.Discord.Hosting/Options/DiscordServiceOptions.cs index 40e862b1c1..1d73f12068 100644 --- a/Remora.Discord.Hosting/Options/DiscordServiceOptions.cs +++ b/Remora.Discord.Hosting/Options/DiscordServiceOptions.cs @@ -20,15 +20,112 @@ // along with this program. If not, see . // +using System; +using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; +using OneOf; +using Remora.Discord.Rest; + +using ApiConstants = Remora.Discord.API.Constants; +using RestConstants = Remora.Discord.Rest.Constants; namespace Remora.Discord.Hosting.Options; /// /// Defines a set of options used by the background gateway service. /// +/// The base path to the API. +/// The base path to the CDN. +/// The type of the token to use. /// /// Whether the service should stop the application if a critical gateway error is encountered. /// [PublicAPI] -public record DiscordServiceOptions(bool TerminateApplicationOnCriticalGatewayErrors = true); +public sealed record DiscordServiceOptions +( + Uri APIBasePath, + Uri CDNBasePath, + DiscordTokenType TokenType, + bool TerminateApplicationOnCriticalGatewayErrors = true +) +{ + /// + /// Gets a intended for use with the official Discord API. + /// + public static DiscordServiceOptions Discord => new(RestConstants.DiscordBaseURL, ApiConstants.CDNBaseURL, DiscordTokenType.Bot, true); + + /// + /// Initializes a new instance of the class. + /// + /// The api base path, as either a or a . + /// The cdn base path, as either a or a . + public DiscordServiceOptions(OneOf apiBasePath, OneOf cdnBasePath) + : this(apiBasePath, DiscordTokenType.Bot, true) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// The base path, either as a or a . + /// The cdn base path, as either a or a . + /// The type of the token to use. + /// Whether the service should stop the application if a critical gateway error is encountered. + public DiscordServiceOptions(OneOf apiBasePath, OneOf cdnBasePath, DiscordTokenType tokenType, bool terminateApplicationOnCriticalGatewayErrors) + : this(apiBasePath.Match(path => new Uri(path), uri => uri), cdnBasePath.Match(path => new Uri(path), uri => uri), tokenType, true) + { + } + + /// + /// Verifies this instance to ensure a user is not trying to connect to Discord via a user token. + /// + /// The API path is pointing to official Discord servers + /// and a connection attempt was made with a token. + public void Verify() + { + if (!TryVerify()) + { + throw GetUserTokenException(); + } + } + + /// + /// Verifies this instance to ensure a user is not trying to connect to Discord via a user token. + /// + /// if the instance passes verification; otherwise, . + public bool TryVerify() + => DiscordServiceOptions.TryVerify(this); + + /// + /// Verifies the provided to ensure a user is not trying to connect to Discord via a user token. + /// + /// The instance to verify. + /// The API path is pointing to official Discord servers + /// and a connection attempt was made with a token. + public static void Verify(DiscordServiceOptions serviceOptions) + { + if (!DiscordServiceOptions.TryVerify(serviceOptions)) + { + throw GetUserTokenException(); + } + } + + /// + /// Verifies the provided to ensure a user is not trying to connect to Discord via a user token. + /// + /// The instance to verify. + /// if the instance passes verification; otherwise, . + public static bool TryVerify(DiscordServiceOptions serviceOptions) + { + if (serviceOptions.APIBasePath == RestConstants.DiscordBaseURL) + { + return serviceOptions.TokenType != DiscordTokenType.User; + } + + // If we're not using the Discord API, allow any token type. + return true; + } + + private static InvalidOperationException GetUserTokenException() + => new InvalidOperationException("You MUST NOT use a user token with the official Discord API."); +} diff --git a/Tests/Remora.Discord.Rest.Tests/API/Applications/DiscordRestApplicationAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Applications/DiscordRestApplicationAPITests.cs index 842666ccc7..e2f2a089c4 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Applications/DiscordRestApplicationAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Applications/DiscordRestApplicationAPITests.cs @@ -74,7 +74,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithExactQueryString("with_localizations", withLocalizations.ToString()) .WithHeaders(Constants.LocaleHeaderName, locale) .WithNoContent() @@ -124,7 +124,7 @@ public async Task PerformsRequestCorrectlyForChatCommand() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsObject @@ -172,7 +172,7 @@ public async Task PerformsRequestCorrectlyForUserCommand() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsObject @@ -212,7 +212,7 @@ public async Task PerformsRequestCorrectlyForMessageCommand() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsObject @@ -253,7 +253,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsObject @@ -295,7 +295,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsObject @@ -335,7 +335,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsObject @@ -375,7 +375,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsObject @@ -451,7 +451,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .WithJson ( json => json.IsArray @@ -537,7 +537,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .Respond() ); @@ -570,7 +570,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .Respond() ); @@ -603,7 +603,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .Respond() ); @@ -636,7 +636,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}applications/{applicationID}/commands") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands") .Respond() ); @@ -677,7 +677,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}applications/{applicationID}/commands/{commandID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands/{commandID}") .WithNoContent() .Respond() ); @@ -724,7 +724,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}applications/{applicationID}/commands/{commandID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands/{commandID}") .WithJson ( json => json.IsObject @@ -769,7 +769,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}applications/{applicationID}/commands/{commandID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands/{commandID}") .WithJson ( json => json.IsObject @@ -812,7 +812,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}applications/{applicationID}/commands/{commandID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands/{commandID}") .WithJson ( json => json.IsObject @@ -855,7 +855,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}applications/{applicationID}/commands/{commandID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands/{commandID}") .WithJson ( json => json.IsObject @@ -898,7 +898,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}applications/{applicationID}/commands/{commandID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}applications/{applicationID}/commands/{commandID}") .WithJson ( json => json.IsObject @@ -955,7 +955,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}applications/{applicationID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/commands/{commandID}" ) .WithNoContent() .Respond(HttpStatusCode.NoContent) @@ -998,7 +998,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithExactQueryString("with_localizations", withLocalizations.ToString()) .WithHeaders(Constants.LocaleHeaderName, locale) @@ -1055,7 +1055,7 @@ public async Task PerformsRequestCorrectlyForChatCommands() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1108,7 +1108,7 @@ public async Task PerformsRequestCorrectlyForUserCommands() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1155,7 +1155,7 @@ public async Task PerformsRequestCorrectlyForMessageCommands() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1202,7 +1202,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooShort() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1249,7 +1249,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooLong() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1296,7 +1296,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooShort() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1343,7 +1343,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooLong() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1425,7 +1425,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .WithJson ( @@ -1517,7 +1517,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooShort() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .Respond() ); @@ -1556,7 +1556,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .Respond() ); @@ -1595,7 +1595,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooShort() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .Respond() ); @@ -1634,7 +1634,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands" ) .Respond() ); @@ -1681,7 +1681,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" ) .WithNoContent() .Respond() @@ -1734,7 +1734,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" ) .WithJson ( @@ -1785,7 +1785,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooShort() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" ) .WithJson ( @@ -1834,7 +1834,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooLong() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" ) .WithJson ( @@ -1883,7 +1883,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooShort() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" ) .WithJson ( @@ -1932,7 +1932,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooLong() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" ) .WithJson ( @@ -1992,7 +1992,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}" ) .WithNoContent() .Respond(HttpStatusCode.NoContent) @@ -2033,7 +2033,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/permissions" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/permissions" ) .WithNoContent() .Respond>() @@ -2075,7 +2075,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}/permissions" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}/permissions" ) .WithNoContent() .Respond @@ -2123,7 +2123,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}/permissions" + $"{Constants.DiscordBaseURL}applications/{applicationID}/guilds/{guildID}/commands/{commandID}/permissions" ) .WithJson ( @@ -2175,7 +2175,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}applications/{applicationID}/role-connections/metadata" + $"{Constants.DiscordBaseURL}applications/{applicationID}/role-connections/metadata" ) .WithNoContent() .Respond>() @@ -2236,7 +2236,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/role-connections/metadata" + $"{Constants.DiscordBaseURL}applications/{applicationID}/role-connections/metadata" ) .WithJson ( @@ -2306,7 +2306,7 @@ public async Task ReturnsUnsuccessfulIfKeyIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/role-connections/metadata" + $"{Constants.DiscordBaseURL}applications/{applicationID}/role-connections/metadata" ) .Respond ( @@ -2349,7 +2349,7 @@ public async Task ReturnsUnsuccessfulIfNameIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/role-connections/metadata" + $"{Constants.DiscordBaseURL}applications/{applicationID}/role-connections/metadata" ) .Respond ( @@ -2392,7 +2392,7 @@ public async Task ReturnsUnsuccessfulIfDescriptionIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}applications/{applicationID}/role-connections/metadata" + $"{Constants.DiscordBaseURL}applications/{applicationID}/role-connections/metadata" ) .Respond ( @@ -2438,7 +2438,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}applications/@me" + $"{Constants.DiscordBaseURL}applications/@me" ) .WithNoContent() .Respond() @@ -2512,7 +2512,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}applications/@me" + $"{Constants.DiscordBaseURL}applications/@me" ) .WithJson ( diff --git a/Tests/Remora.Discord.Rest.Tests/API/AuditLog/DiscordRestAuditLogAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/AuditLog/DiscordRestAuditLogAPITests.cs index 22ed646799..d444f90319 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/AuditLog/DiscordRestAuditLogAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/AuditLog/DiscordRestAuditLogAPITests.cs @@ -75,7 +75,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => - b.Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/*/audit-logs") + b.Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/*/audit-logs") .WithAuthentication() .WithExactQueryString ( diff --git a/Tests/Remora.Discord.Rest.Tests/API/AutoModeration/DiscordRestAutoModerationAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/AutoModeration/DiscordRestAutoModerationAPITests.cs index 5031929b3c..6dc269da08 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/AutoModeration/DiscordRestAutoModerationAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/AutoModeration/DiscordRestAutoModerationAPITests.cs @@ -70,7 +70,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildID}/auto-moderation/rules") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildID}/auto-moderation/rules") .Respond>() ); @@ -106,7 +106,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildID}/auto-moderation/rules/{ruleID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildID}/auto-moderation/rules/{ruleID}") .Respond() ); @@ -154,7 +154,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildID}/auto-moderation/rules") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildID}/auto-moderation/rules") .WithJson ( j => j.IsObject @@ -238,7 +238,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildID}/auto-moderation/rules/{ruleID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildID}/auto-moderation/rules/{ruleID}") .WithJson ( j => j.IsObject @@ -311,7 +311,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildID}/auto-moderation/rules/{ruleID}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildID}/auto-moderation/rules/{ruleID}") .Respond() ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Channels/DiscordRestChannelAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Channels/DiscordRestChannelAPITests.cs index 05c2750417..85b389cb39 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Channels/DiscordRestChannelAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Channels/DiscordRestChannelAPITests.cs @@ -77,7 +77,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelID}") .Respond() ); @@ -117,7 +117,7 @@ public async Task PerformsGroupDMRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithJson ( j => j @@ -163,7 +163,7 @@ public async Task PerformsTextChannelRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -228,7 +228,7 @@ public async Task PerformsAnnouncementChannelRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -293,7 +293,7 @@ public async Task PerformsVoiceChannelRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -358,7 +358,7 @@ public async Task PerformsStageChannelRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -421,7 +421,7 @@ public async Task PerformsThreadChannelRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -490,7 +490,7 @@ public async Task PerformsForumChannelRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -574,7 +574,7 @@ public async Task PerformsMediaChannelRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -641,7 +641,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithJson ( j => j @@ -816,7 +816,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}channels/{channelId.ToString()}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}channels/{channelId.ToString()}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond() ); @@ -854,7 +854,7 @@ public async Task PerformsBeforeRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithExactQueryString ( new[] @@ -884,7 +884,7 @@ public async Task PerformsAfterRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithExactQueryString ( new[] @@ -914,7 +914,7 @@ public async Task PerformsAroundRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithExactQueryString ( new[] @@ -1014,7 +1014,7 @@ Optional after var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithExactQueryString(expectedQueryStringParameters) .Respond>() ); @@ -1071,7 +1071,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}") .Respond() ); @@ -1112,7 +1112,7 @@ public async Task PerformsNormalRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithJson ( j => j.IsObject @@ -1161,7 +1161,7 @@ public async Task PerformsEmbedRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithJson ( j => j.IsObject @@ -1209,7 +1209,7 @@ public async Task PerformsComponentRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithJson ( j => j.IsObject @@ -1261,7 +1261,7 @@ public async Task PerformsFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -1332,7 +1332,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) .WithMultipartJsonPayload @@ -1416,7 +1416,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -1502,7 +1502,7 @@ public async Task PerformsPollRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/messages") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/messages") .WithJson ( j => j.IsObject @@ -1562,7 +1562,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/crosspost" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/crosspost" ) .Respond() ); @@ -1603,7 +1603,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}/@me" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}/@me" ) .Respond(HttpStatusCode.NoContent) ); @@ -1644,7 +1644,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}/@me" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}/@me" ) .Respond(HttpStatusCode.NoContent) ); @@ -1687,7 +1687,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}/{userId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}/{userId}" ) .Respond(HttpStatusCode.NoContent) ); @@ -1730,7 +1730,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" ) .WithExactQueryString ( @@ -1765,7 +1765,7 @@ public async Task ReturnsErrorIfLimitIsTooLow() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" ) .Respond>() ); @@ -1792,7 +1792,7 @@ public async Task ReturnsErrorIfLimitIsTooHigh() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" ) .Respond>() ); @@ -1832,7 +1832,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions" ) .Respond(HttpStatusCode.NoContent) ); @@ -1874,7 +1874,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/reactions/{urlEncodedEmoji}" ) .Respond(HttpStatusCode.NoContent) ); @@ -1920,7 +1920,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}" ) .WithJson ( @@ -1967,7 +1967,7 @@ public async Task PerformsFlagsOnlyRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}" ) .WithJson ( @@ -2005,7 +2005,7 @@ public async Task PerformsNullableRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}" ) .WithJson ( @@ -2056,7 +2056,7 @@ public async Task PerformsFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -2119,7 +2119,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}") .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) .WithMultipartJsonPayload @@ -2195,7 +2195,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -2280,7 +2280,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}" ) .Respond(HttpStatusCode.NoContent) ); @@ -2321,7 +2321,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelId}/messages/bulk-delete" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/bulk-delete" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson @@ -2363,7 +2363,7 @@ public async Task ReturnsErrorIfMessageCountIsTooSmall() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/messages/bulk-delete" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/bulk-delete" ) .Respond(HttpStatusCode.NoContent) ); @@ -2388,7 +2388,7 @@ public async Task ReturnsErrorIfMessageCountIsTooLarge() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/messages/bulk-delete" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/bulk-delete" ) .Respond(HttpStatusCode.NoContent) ); @@ -2433,7 +2433,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}channels/{channelId}/permissions/{overwriteId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/permissions/{overwriteId}" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson @@ -2469,7 +2469,7 @@ public async Task PerformsNullableRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}channels/{channelId}/permissions/{overwriteId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/permissions/{overwriteId}" ) .WithJson ( @@ -2517,7 +2517,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelId}/invites" + $"{Constants.DiscordBaseURL}channels/{channelId}/invites" ) .Respond("application/json", "[]") ); @@ -2564,7 +2564,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelId}/invites" + $"{Constants.DiscordBaseURL}channels/{channelId}/invites" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson @@ -2632,7 +2632,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/permissions/{overwriteId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/permissions/{overwriteId}" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) @@ -2673,7 +2673,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelId}/followers" + $"{Constants.DiscordBaseURL}channels/{channelId}/followers" ) .WithJson ( @@ -2719,7 +2719,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelId}/typing" + $"{Constants.DiscordBaseURL}channels/{channelId}/typing" ) .Respond(HttpStatusCode.NoContent) ); @@ -2758,7 +2758,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelId}/pins" + $"{Constants.DiscordBaseURL}channels/{channelId}/pins" ) .Respond("application/json", "[]") ); @@ -2799,7 +2799,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}channels/{channelId}/pins/{messageId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/pins/{messageId}" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) @@ -2841,7 +2841,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/pins/{messageId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/pins/{messageId}" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) @@ -2884,7 +2884,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}channels/{channelId}/recipients/{userId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/recipients/{userId}" ) .WithJson ( @@ -2933,7 +2933,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/recipients/{userId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/recipients/{userId}" ) .Respond(HttpStatusCode.NoContent) ); @@ -2977,7 +2977,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelId}/messages/{messageId}/threads" + $"{Constants.DiscordBaseURL}channels/{channelId}/messages/{messageId}/threads" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson @@ -3033,7 +3033,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelId}/threads" + $"{Constants.DiscordBaseURL}channels/{channelId}/threads" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson @@ -3096,7 +3096,7 @@ public async Task PerformsNormalRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/threads") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/threads") .WithJson ( j => j.IsObject @@ -3145,7 +3145,7 @@ public async Task PerformsEmbedRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/threads") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/threads") .WithJson ( j => j.IsObject @@ -3191,7 +3191,7 @@ public async Task PerformsComponentRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/threads") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/threads") .WithJson ( j => j.IsObject @@ -3241,7 +3241,7 @@ public async Task PerformsFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/threads") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/threads") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -3313,7 +3313,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/threads") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/threads") .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) .WithMultipartJsonPayload @@ -3409,7 +3409,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}channels/{channelId}/thread-members/@me" + $"{Constants.DiscordBaseURL}channels/{channelId}/thread-members/@me" ) .WithNoContent() .Respond(HttpStatusCode.NoContent) @@ -3450,7 +3450,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}channels/{channelId}/thread-members/{userId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/thread-members/{userId}" ) .WithNoContent() .Respond(HttpStatusCode.NoContent) @@ -3490,7 +3490,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/thread-members/@me" + $"{Constants.DiscordBaseURL}channels/{channelId}/thread-members/@me" ) .WithNoContent() .Respond(HttpStatusCode.NoContent) @@ -3531,7 +3531,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}channels/{channelId}/thread-members/{userId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/thread-members/{userId}" ) .WithNoContent() .Respond(HttpStatusCode.NoContent) @@ -3573,7 +3573,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelId}/thread-members/{userId}" + $"{Constants.DiscordBaseURL}channels/{channelId}/thread-members/{userId}" ) .WithNoContent() .WithExactQueryString("with_member", withMember.ToString()) @@ -3617,7 +3617,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelId}/thread-members" + $"{Constants.DiscordBaseURL}channels/{channelId}/thread-members" ) .WithNoContent() .WithExactQueryString(new KeyValuePair[] @@ -3665,7 +3665,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelID}/threads/archived/public" + $"{Constants.DiscordBaseURL}channels/{channelID}/threads/archived/public" ) .WithExactQueryString ( @@ -3715,7 +3715,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelID}/threads/archived/private" + $"{Constants.DiscordBaseURL}channels/{channelID}/threads/archived/private" ) .WithExactQueryString ( @@ -3765,7 +3765,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}channels/{channelID}/users/@me/threads/archived/private" + $"{Constants.DiscordBaseURL}channels/{channelID}/users/@me/threads/archived/private" ) .WithExactQueryString ( diff --git a/Tests/Remora.Discord.Rest.Tests/API/Emoji/DiscordRestEmojiAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Emoji/DiscordRestEmojiAPITests.cs index 1bfd6c04d2..5da8b9434a 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Emoji/DiscordRestEmojiAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Emoji/DiscordRestEmojiAPITests.cs @@ -71,7 +71,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/emojis") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis") .WithNoContent() .Respond>() ); @@ -108,7 +108,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/emojis/{emojiId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis/{emojiId}") .WithNoContent() .Respond() ); @@ -154,7 +154,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/emojis") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -194,7 +194,7 @@ public async Task ReturnsErrorForUnknownImageFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/emojis") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis") .WithJson ( j => j.IsObject @@ -233,7 +233,7 @@ public async Task ReturnsErrorForTooLargeImage() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/emojis") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis") .WithJson ( j => j.IsObject @@ -282,7 +282,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/emojis/{emojiId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis/{emojiId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -314,7 +314,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/emojis/{emojiId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis/{emojiId}") .WithJson ( j => j.IsObject @@ -360,7 +360,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildId}/emojis/{emojiId}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildId}/emojis/{emojiId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Gateway/DiscordRestGatewayAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Gateway/DiscordRestGatewayAPITests.cs index bf9f6f70d6..c4543949cc 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Gateway/DiscordRestGatewayAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Gateway/DiscordRestGatewayAPITests.cs @@ -63,7 +63,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}gateway") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}gateway") .WithNoContent() .Respond() ); @@ -97,7 +97,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}gateway/bot") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}gateway/bot") .WithNoContent() .WithAuthentication() .Respond() diff --git a/Tests/Remora.Discord.Rest.Tests/API/Guild/DiscordRestGuildAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Guild/DiscordRestGuildAPITests.cs index 6745ae455f..8c71336fc0 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Guild/DiscordRestGuildAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Guild/DiscordRestGuildAPITests.cs @@ -91,7 +91,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds") .WithJson ( j => j.IsObject @@ -147,7 +147,7 @@ public async Task ReturnsErrorIfNameIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds") .Respond() ); @@ -171,7 +171,7 @@ public async Task ReturnsErrorIfNameIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds") .Respond() ); @@ -201,7 +201,7 @@ public async Task ReturnsErrorIfImageIsUnknownType() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds") .Respond() ); @@ -242,7 +242,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}") .WithExactQueryString("with_counts", withCounts.ToString()) .Respond() ); @@ -279,7 +279,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/preview") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/preview") .Respond() ); @@ -355,7 +355,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -433,7 +433,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}") .WithJson ( j => j.IsObject @@ -479,7 +479,7 @@ public async Task ReturnsErrorIfIconIsUnknownFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}") .Respond() ); @@ -511,7 +511,7 @@ public async Task ReturnsErrorIfBannerIsUnknownFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}") .Respond() ); @@ -543,7 +543,7 @@ public async Task ReturnsErrorIfSplashIsUnknownFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}") .Respond() ); @@ -584,7 +584,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildId}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildId}") .Respond(HttpStatusCode.NoContent) ); @@ -620,7 +620,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .Respond>() ); @@ -667,7 +667,7 @@ public async Task PerformsTextRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -733,7 +733,7 @@ public async Task PerformsAnnouncementRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -802,7 +802,7 @@ public async Task PerformsForumRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -879,7 +879,7 @@ public async Task PerformsMediaRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -951,7 +951,7 @@ public async Task PerformsVoiceRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -1017,7 +1017,7 @@ public async Task PerformsStageRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -1072,7 +1072,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithJson ( j => j.IsObject @@ -1157,7 +1157,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithJson ( j => j.IsArray @@ -1241,7 +1241,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithJson ( j => j.IsArray @@ -1325,7 +1325,7 @@ public async Task PerformsEmptyRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/channels") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/channels") .WithJson ( j => j.IsArray @@ -1418,7 +1418,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/members/{userId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/{userId}") .Respond() ); @@ -1456,7 +1456,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/members") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/members") .WithExactQueryString ( new[] @@ -1502,7 +1502,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/members/search") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/search") .WithExactQueryString ( new[] @@ -1552,7 +1552,7 @@ public async Task PerformsExistingMemberRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}guilds/{guildId}/members/{userId}") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/{userId}") .WithJson ( j => j.IsObject @@ -1601,7 +1601,7 @@ public async Task PerformsNewMemberRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}guilds/{guildId}/members/{userId}") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/{userId}") .WithJson ( j => j.IsObject @@ -1669,7 +1669,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/members/{userId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/{userId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -1734,7 +1734,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/members/@me") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/@me") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -1787,7 +1787,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}guilds/{guildId}/members/{userId}/roles/{roleId}") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/{userId}/roles/{roleId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) ); @@ -1836,7 +1836,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}guilds/{guildId}/members/{userId}/roles/{roleId}" + $"{Constants.DiscordBaseURL}guilds/{guildId}/members/{userId}/roles/{roleId}" ) .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) @@ -1882,7 +1882,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildId}/members/{userId}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildId}/members/{userId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) ); @@ -1927,7 +1927,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/bans") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/bans") .WithExactQueryString ( new[] @@ -1979,7 +1979,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/bans/{userId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/bans/{userId}") .Respond() ); @@ -2022,7 +2022,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}guilds/{guildId}/bans/{userId}") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}guilds/{guildId}/bans/{userId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -2075,7 +2075,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildId}/bans/{userId}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildId}/bans/{userId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) ); @@ -2120,7 +2120,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/bulk-ban") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/bulk-ban") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -2172,7 +2172,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/roles") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/roles") .Respond("application/json", "[ ]") ); @@ -2226,7 +2226,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/roles") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/roles") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -2296,7 +2296,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/roles") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/roles") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -2402,7 +2402,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/roles/{roleId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/roles/{roleId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -2466,7 +2466,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/mfa") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/mfa") .WithJson ( j => j.IsObject @@ -2516,7 +2516,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildId}/roles/{roleId}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildId}/roles/{roleId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) ); @@ -2565,7 +2565,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/prune") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/prune") .WithExactQueryString ( new[] @@ -2618,7 +2618,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/prune") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/prune") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -2672,7 +2672,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/regions") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/regions") .Respond("application/json", "[ ]") ); @@ -2711,7 +2711,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/invites") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/invites") .Respond("application/json", "[ ]") ); @@ -2750,7 +2750,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/integrations") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/integrations") .Respond("application/json", "[ ]") ); @@ -2789,7 +2789,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/widget") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/widget") .Respond() ); @@ -2831,7 +2831,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/widget") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/widget") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -2883,7 +2883,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/widget.json") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/widget.json") .WithNoContent() .Respond() ); @@ -2923,7 +2923,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/vanity-url") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/vanity-url") .Respond() ); @@ -2963,7 +2963,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/widget.png") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/widget.png") .WithExactQueryString("style", widgetStyle.ToString().ToLowerInvariant()) .Respond("image/png", new MemoryStream()) ); @@ -3004,7 +3004,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/welcome-screen") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/welcome-screen") .Respond() ); @@ -3047,7 +3047,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/welcome-screen") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/welcome-screen") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -3101,7 +3101,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/onboarding") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/onboarding") .Respond() ); @@ -3145,7 +3145,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}guilds/{guildId}/onboarding") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}guilds/{guildId}/onboarding") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -3204,7 +3204,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/voice-states/@me") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/voice-states/@me") .WithJson ( j => j.IsObject @@ -3263,7 +3263,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/voice-states/{userID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/voice-states/{userID}") .WithJson ( j => j.IsObject @@ -3317,7 +3317,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}guilds/{guildID}/threads/active" + $"{Constants.DiscordBaseURL}guilds/{guildID}/threads/active" ) .WithNoContent() .Respond() @@ -3356,7 +3356,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildID}/integrations/{integrationID}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildID}/integrations/{integrationID}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) ); @@ -3395,7 +3395,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildID}/incident-actions") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildID}/incident-actions") .WithJson ( j => j.IsObject @@ -3429,7 +3429,7 @@ public async Task PerformsOptionalRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildID}/incident-actions") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildID}/incident-actions") .WithJson ( j => j.IsObject @@ -3459,7 +3459,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildID}/incident-actions") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildID}/incident-actions") .WithJson ( j => j.IsObject diff --git a/Tests/Remora.Discord.Rest.Tests/API/GuildScheduledEvents/DiscordRestGuildScheduledEventAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/GuildScheduledEvents/DiscordRestGuildScheduledEventAPITests.cs index 351ed7d774..5c85c04c02 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/GuildScheduledEvents/DiscordRestGuildScheduledEventAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/GuildScheduledEvents/DiscordRestGuildScheduledEventAPITests.cs @@ -72,7 +72,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildID}/scheduled-events") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildID}/scheduled-events") .WithExactQueryString("with_user_count", withUserCount.ToString()) .Respond>() ); @@ -122,7 +122,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildID}/scheduled-events") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildID}/scheduled-events") .WithJson ( j => j.IsObject @@ -194,7 +194,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildID}/scheduled-events/{eventID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildID}/scheduled-events/{eventID}") .WithExactQueryString("with_user_count", withCounts.ToString()) .WithNoContent() .Respond() @@ -247,7 +247,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildID}/scheduled-events/{eventID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildID}/scheduled-events/{eventID}") .WithJson ( j => j.IsObject @@ -321,7 +321,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildID}/scheduled-events/{eventID}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildID}/scheduled-events/{eventID}") .WithNoContent() .Respond(HttpStatusCode.NoContent) ); @@ -362,7 +362,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildID}/scheduled-events/{eventID}/users") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildID}/scheduled-events/{eventID}/users") .WithExactQueryString ( new[] diff --git a/Tests/Remora.Discord.Rest.Tests/API/Interactions/DiscordRestInteractionAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Interactions/DiscordRestInteractionAPITests.cs index ffe5cf5276..c891fb8d8d 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Interactions/DiscordRestInteractionAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Interactions/DiscordRestInteractionAPITests.cs @@ -75,7 +75,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}interactions/{interactionID}/{token}/callback") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}interactions/{interactionID}/{token}/callback") .WithJson ( j => j.IsObject @@ -119,7 +119,7 @@ public async Task PerformsFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}interactions/{interactionID}/{token}/callback") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}interactions/{interactionID}/{token}/callback") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -191,7 +191,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}interactions/{interactionID}/{token}/callback") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}interactions/{interactionID}/{token}/callback") .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) .WithMultipartJsonPayload @@ -276,7 +276,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}interactions/{interactionID}/{token}/callback") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}interactions/{interactionID}/{token}/callback") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -370,7 +370,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/@original" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/@original" ) .WithJson ( @@ -420,7 +420,7 @@ public async Task PerformsFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/@original" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/@original" ) .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload @@ -487,7 +487,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/@original" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/@original" ) .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) @@ -567,7 +567,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/@original" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/@original" ) .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload @@ -653,7 +653,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/@original" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/@original" ) .Respond(HttpStatusCode.NoContent) ); @@ -701,7 +701,7 @@ public async Task PerformsNormalRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{applicationID}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}") .WithJson ( j => j.IsObject @@ -748,7 +748,7 @@ public async Task PerformsEmbedRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{applicationID}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}") .WithJson ( j => j.IsObject @@ -792,7 +792,7 @@ public async Task PerformsFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{applicationID}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -855,7 +855,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{applicationID}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}") .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) .WithMultipartJsonPayload @@ -931,7 +931,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{applicationID}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -1017,7 +1017,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" ) .WithNoContent() .Respond() @@ -1070,7 +1070,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" ) .WithJson ( @@ -1122,7 +1122,7 @@ public async Task PerformsFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" ) .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload @@ -1191,7 +1191,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" ) .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) @@ -1273,7 +1273,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" ) .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload @@ -1361,7 +1361,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{applicationID}/{token}/messages/{messageID}" ) .Respond(HttpStatusCode.NoContent) ); @@ -1407,7 +1407,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}webhooks/{interactionID}/{token}/messages/@original" + $"{Constants.DiscordBaseURL}webhooks/{interactionID}/{token}/messages/@original" ) .WithNoContent() .Respond() diff --git a/Tests/Remora.Discord.Rest.Tests/API/Invites/DiscordRestInviteAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Invites/DiscordRestInviteAPITests.cs index a8814c4183..c981cfc431 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Invites/DiscordRestInviteAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Invites/DiscordRestInviteAPITests.cs @@ -69,7 +69,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}invites/{inviteCode}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}invites/{inviteCode}") .WithExactQueryString ( new[] @@ -114,7 +114,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}invites/{inviteCode}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}invites/{inviteCode}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond() ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Monetization/DiscordRestMonetizationAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Monetization/DiscordRestMonetizationAPITests.cs index e221dd01ec..bff5ebbb80 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Monetization/DiscordRestMonetizationAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Monetization/DiscordRestMonetizationAPITests.cs @@ -77,7 +77,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}applications/{applicationID}/entitlements") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}applications/{applicationID}/entitlements") .WithExactQueryString ( [ @@ -138,7 +138,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}applications/{applicationID}/entitlements/{entitlementID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}applications/{applicationID}/entitlements/{entitlementID}") .Respond() ); @@ -179,7 +179,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/entitlements/{entitlementID}/consume") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/entitlements/{entitlementID}/consume") .Respond(HttpStatusCode.NoContent) ); @@ -222,7 +222,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}applications/{applicationID}/entitlements") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}applications/{applicationID}/entitlements") .WithJson ( j => j.IsObject @@ -268,7 +268,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}applications/{applicationID}/entitlements/{entitlementID}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}applications/{applicationID}/entitlements/{entitlementID}") .Respond(HttpStatusCode.NoContent) ); @@ -303,7 +303,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}applications/{applicationID}/skus") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}applications/{applicationID}/skus") .Respond>() ); @@ -342,7 +342,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}skus/{skuID}/subscriptions") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}skus/{skuID}/subscriptions") .WithExactQueryString ( [ @@ -395,7 +395,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}skus/{skuID}/subscriptions/{subscriptionID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}skus/{skuID}/subscriptions/{subscriptionID}") .Respond() ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/OAuth2/DiscordRestOAuth2APITests.cs b/Tests/Remora.Discord.Rest.Tests/API/OAuth2/DiscordRestOAuth2APITests.cs index 740720a5dd..702806d20c 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/OAuth2/DiscordRestOAuth2APITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/OAuth2/DiscordRestOAuth2APITests.cs @@ -63,7 +63,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}oauth2/applications/@me") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}oauth2/applications/@me") .WithNoContent() .Respond() ); @@ -97,7 +97,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}oauth2/@me") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}oauth2/@me") .WithNoContent() .Respond("Authorization/json", SampleRepository.Get()) ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Polls/DiscordRestPollsAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Polls/DiscordRestPollsAPITests.cs index d3102af3fe..a7a401b1c9 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Polls/DiscordRestPollsAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Polls/DiscordRestPollsAPITests.cs @@ -69,7 +69,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelID}/polls/{messageID}/answers/{answerID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelID}/polls/{messageID}/answers/{answerID}") .WithNoContent() .Respond() ); @@ -93,7 +93,7 @@ public async Task PerformsAfterRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelID}/polls/{messageID}/answers/{answerID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelID}/polls/{messageID}/answers/{answerID}") .WithExactQueryString ( new[] @@ -123,7 +123,7 @@ public async Task PerformsLimitRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelID}/polls/{messageID}/answers/{answerID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelID}/polls/{messageID}/answers/{answerID}") .WithExactQueryString ( new[] @@ -188,7 +188,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelID}/polls/{messageID}/expire") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelID}/polls/{messageID}/expire") .WithNoContent() .Respond("Authorization/json", SampleRepository.Get()) ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Soundboard/DiscordRestSoundboardAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Soundboard/DiscordRestSoundboardAPITests.cs index fbe7919554..26524251ee 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Soundboard/DiscordRestSoundboardAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Soundboard/DiscordRestSoundboardAPITests.cs @@ -73,7 +73,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}channels/{channelID}/send-soundboard-sound" + $"{Constants.DiscordBaseURL}channels/{channelID}/send-soundboard-sound" ) .WithJson ( @@ -118,7 +118,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}soundboard-default-sounds" + $"{Constants.DiscordBaseURL}soundboard-default-sounds" ) .WithNoContent() .Respond("application/json", "[" + SampleRepository.Get() + "]") @@ -157,7 +157,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}guilds/{guildID}/soundboard-sounds" + $"{Constants.DiscordBaseURL}guilds/{guildID}/soundboard-sounds" ) .WithNoContent() .Respond() @@ -198,7 +198,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}guilds/{guildID}/soundboard-sounds/{soundID}" + $"{Constants.DiscordBaseURL}guilds/{guildID}/soundboard-sounds/{soundID}" ) .WithNoContent() .Respond() @@ -245,7 +245,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Post, - $"{Constants.BaseURL}guilds/{guildID}/soundboard-sounds" + $"{Constants.DiscordBaseURL}guilds/{guildID}/soundboard-sounds" ) .WithJson ( @@ -313,7 +313,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}guilds/{guildID}/soundboard-sounds/{soundID}" + $"{Constants.DiscordBaseURL}guilds/{guildID}/soundboard-sounds/{soundID}" ) .WithJson ( @@ -376,7 +376,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Delete, - $"{Constants.BaseURL}guilds/{guildID}/soundboard-sounds/{soundID}" + $"{Constants.DiscordBaseURL}guilds/{guildID}/soundboard-sounds/{soundID}" ) .WithNoContent() .WithHeaders("X-Audit-Log-Reason", reason) diff --git a/Tests/Remora.Discord.Rest.Tests/API/StageInstances/DiscordRestStageInstanceAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/StageInstances/DiscordRestStageInstanceAPITests.cs index 5e27eaaeb2..04d739768b 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/StageInstances/DiscordRestStageInstanceAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/StageInstances/DiscordRestStageInstanceAPITests.cs @@ -72,7 +72,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}stage-instances") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}stage-instances") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -129,7 +129,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}stage-instances/{channelID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}stage-instances/{channelID}") .WithNoContent() .Respond() ); @@ -168,7 +168,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}stage-instances/{channelID}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}stage-instances/{channelID}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -214,7 +214,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}stage-instances/{channelID}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}stage-instances/{channelID}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithNoContent() .Respond(HttpStatusCode.NoContent) diff --git a/Tests/Remora.Discord.Rest.Tests/API/Stickers/DiscordRestStickerAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Stickers/DiscordRestStickerAPITests.cs index 4705266920..f017fbd671 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Stickers/DiscordRestStickerAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Stickers/DiscordRestStickerAPITests.cs @@ -69,7 +69,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}stickers/{stickerId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}stickers/{stickerId}") .WithNoContent() .Respond() ); @@ -103,7 +103,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}sticker-packs") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}sticker-packs") .WithNoContent() .Respond() ); @@ -139,7 +139,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/stickers") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/stickers") .WithNoContent() .Respond>() ); @@ -176,7 +176,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/stickers/{stickerId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/stickers/{stickerId}") .WithNoContent() .Respond() ); @@ -219,7 +219,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/stickers") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/stickers") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithMultipartFormData("name", name) .WithMultipartFormData("description", description) @@ -264,7 +264,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/stickers/{stickerId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/stickers/{stickerId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithJson ( @@ -312,7 +312,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildId}/stickers/{stickerId}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildId}/stickers/{stickerId}") .WithHeaders(Constants.AuditLogHeaderName, reason) .WithNoContent() .Respond(HttpStatusCode.NoContent) diff --git a/Tests/Remora.Discord.Rest.Tests/API/Templates/DiscordRestTemplateAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Templates/DiscordRestTemplateAPITests.cs index 4d07b65147..e07cf88c72 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Templates/DiscordRestTemplateAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Templates/DiscordRestTemplateAPITests.cs @@ -67,7 +67,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/templates/{templateCode}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/templates/{templateCode}") .Respond() ); @@ -109,7 +109,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/templates/{templateCode}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/templates/{templateCode}") .WithJson ( j => j.IsObject @@ -152,7 +152,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/templates") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/templates") .Respond>() ); @@ -189,7 +189,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}guilds/{guildId}/templates") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}guilds/{guildId}/templates") .WithJson ( j => j.IsObject @@ -233,7 +233,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Put, $"{Constants.BaseURL}guilds/{guildId}/templates/{templateCode}") + .Expect(HttpMethod.Put, $"{Constants.DiscordBaseURL}guilds/{guildId}/templates/{templateCode}") .Respond() ); @@ -271,7 +271,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}guilds/{guildId}/templates/{templateCode}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}guilds/{guildId}/templates/{templateCode}") .WithJson ( j => j.IsObject @@ -315,7 +315,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}guilds/{guildId}/templates/{templateCode}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}guilds/{guildId}/templates/{templateCode}") .Respond() ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Users/DiscordRestUserAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Users/DiscordRestUserAPITests.cs index 9035972f9f..79ec857821 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Users/DiscordRestUserAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Users/DiscordRestUserAPITests.cs @@ -67,7 +67,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/@me") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/@me") .Respond() ); @@ -102,7 +102,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/{userId}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/{userId}") .Respond() ); @@ -143,7 +143,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}users/@me") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}users/@me") .WithJson ( j => j.IsObject @@ -172,7 +172,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}users/@me") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}users/@me") .WithJson ( j => j.IsObject @@ -207,7 +207,7 @@ public async Task ReturnsErrorIfAvatarIsUnknownFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}users/@me") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}users/@me") .Respond() ); @@ -245,7 +245,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/@me/guilds") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/@me/guilds") .WithExactQueryString ( new[] @@ -275,7 +275,7 @@ public async Task ReturnsErrorIfLimitIsTooLow() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/@me/guilds") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/@me/guilds") .Respond>() ); @@ -295,7 +295,7 @@ public async Task ReturnsErrorIfLimitIsTooHigh() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/@me/guilds") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/@me/guilds") .Respond>() ); @@ -330,7 +330,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/@me/guilds/{guildId}/member") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/@me/guilds/{guildId}/member") .Respond() ); @@ -365,7 +365,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}users/@me/guilds/{guildId}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}users/@me/guilds/{guildId}") .Respond(HttpStatusCode.NoContent) ); @@ -398,7 +398,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/@me/channels") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/@me/channels") .Respond>() ); @@ -433,7 +433,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}users/@me/channels") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}users/@me/channels") .WithJson ( j => j.IsObject @@ -474,7 +474,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}users/@me/connections") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}users/@me/connections") .Respond>() ); @@ -512,7 +512,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}users/@me/applications/{applicationID}/role-connection" + $"{Constants.DiscordBaseURL}users/@me/applications/{applicationID}/role-connection" ) .Respond() ); @@ -558,7 +558,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}users/@me/applications/{applicationID}/role-connection" + $"{Constants.DiscordBaseURL}users/@me/applications/{applicationID}/role-connection" ) .WithJson ( @@ -617,7 +617,7 @@ public async Task ReturnsUnsuccessfulIfPlatformNameIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}users/@me/applications/{applicationID}/role-connection" + $"{Constants.DiscordBaseURL}users/@me/applications/{applicationID}/role-connection" ) .Respond() ); @@ -653,7 +653,7 @@ public async Task ReturnsUnsuccessfulIfPlatformUsernameIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}users/@me/applications/{applicationID}/role-connection" + $"{Constants.DiscordBaseURL}users/@me/applications/{applicationID}/role-connection" ) .Respond() ); @@ -689,7 +689,7 @@ public async Task ReturnsUnsuccessfulIfMetadataValueIsTooLong() .Expect ( HttpMethod.Put, - $"{Constants.BaseURL}users/@me/applications/{applicationID}/role-connection" + $"{Constants.DiscordBaseURL}users/@me/applications/{applicationID}/role-connection" ) .Respond() ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Voice/DiscordRestVoiceAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Voice/DiscordRestVoiceAPITests.cs index 7985c7dabb..c82915f266 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Voice/DiscordRestVoiceAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Voice/DiscordRestVoiceAPITests.cs @@ -63,7 +63,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}voice/regions") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}voice/regions") .Respond>() ); diff --git a/Tests/Remora.Discord.Rest.Tests/API/Webhooks/DiscordRestWebhookAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Webhooks/DiscordRestWebhookAPITests.cs index c0f526aa22..331cca8f80 100644 --- a/Tests/Remora.Discord.Rest.Tests/API/Webhooks/DiscordRestWebhookAPITests.cs +++ b/Tests/Remora.Discord.Rest.Tests/API/Webhooks/DiscordRestWebhookAPITests.cs @@ -81,7 +81,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/webhooks") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/webhooks") .WithJson ( j => j.IsObject @@ -119,7 +119,7 @@ public async Task ReturnsErrorIfNameIsTooShort() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/webhooks") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/webhooks") .Respond() ); @@ -146,7 +146,7 @@ public async Task ReturnsErrorIfNameIsTooLong() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/webhooks") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/webhooks") .Respond() ); @@ -173,7 +173,7 @@ public async Task ReturnsErrorIfNameIsClyde() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/webhooks") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/webhooks") .Respond() ); @@ -206,7 +206,7 @@ public async Task ReturnsErrorIfAvatarIsUnknownFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}channels/{channelId}/webhooks") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}channels/{channelId}/webhooks") .Respond() ); @@ -246,7 +246,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}channels/{channelId}/webhooks") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}channels/{channelId}/webhooks") .Respond>() ); @@ -284,7 +284,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}guilds/{guildId}/webhooks") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}guilds/{guildId}/webhooks") .Respond>() ); @@ -322,7 +322,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}webhooks/{webhookID}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}webhooks/{webhookID}") .Respond() ); @@ -362,7 +362,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Get, $"{Constants.BaseURL}webhooks/{webhookID}/{token}") + .Expect(HttpMethod.Get, $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}") .With(m => m.Headers.Authorization == null) .Respond() ); @@ -413,7 +413,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}webhooks/{webhookId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}webhooks/{webhookId}") .WithJson ( j => j.IsObject @@ -452,7 +452,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}webhooks/{webhookId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}webhooks/{webhookId}") .WithJson ( j => j.IsObject @@ -491,7 +491,7 @@ public async Task ReturnsErrorIfAvatarIsUnknownFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}webhooks/{webhookId}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}webhooks/{webhookId}") .WithJson ( j => j.IsObject @@ -548,7 +548,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithHeaders(Constants.AuditLogHeaderName, reason) .With(m => m.Headers.Authorization == null) .Respond() @@ -579,7 +579,7 @@ public async Task PerformsNullableRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithJson ( j => j.IsObject @@ -620,7 +620,7 @@ public async Task ReturnsErrorIfAvatarIsUnknownFormat() var api = CreateAPI ( b => b - .Expect(HttpMethod.Patch, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Patch, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .Respond() ); @@ -662,7 +662,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}webhooks/{webhookID}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}webhooks/{webhookID}") .WithHeaders(Constants.AuditLogHeaderName, reason) .Respond(HttpStatusCode.NoContent) ); @@ -705,7 +705,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}webhooks/{webhookID}/{token}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}") .WithHeaders(Constants.AuditLogHeaderName, reason) .With(m => m.Headers.Authorization == null) .Respond(HttpStatusCode.NoContent) @@ -759,7 +759,7 @@ public async Task PerformsNormalRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithExactQueryString("wait", shouldWait.ToString()) .WithJson ( @@ -820,7 +820,7 @@ public async Task PerformsInThreadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithExactQueryString(new Dictionary { { "wait", shouldWait.ToString() }, @@ -884,7 +884,7 @@ public async Task PerformsForumThreadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithExactQueryString("wait", shouldWait.ToString()) .WithJson ( @@ -942,7 +942,7 @@ public async Task PerformsEmbedRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithExactQueryString("wait", shouldWait.ToString()) .WithJson ( @@ -992,7 +992,7 @@ public async Task PerformsFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -1055,7 +1055,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) .WithMultipartJsonPayload @@ -1131,7 +1131,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload ( @@ -1209,7 +1209,7 @@ public async Task PerformsPollRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithJson ( j => j.IsObject @@ -1244,7 +1244,7 @@ public async Task PerformsNullReturnRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}") + .Expect(HttpMethod.Post, $"{Constants.DiscordBaseURL}webhooks/{webhookId}/{token}") .WithJson ( j => j.IsObject @@ -1303,7 +1303,7 @@ public async Task PerformsNormalRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" ) .WithJson ( @@ -1353,7 +1353,7 @@ public async Task PerformsEmbedRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" ) .WithJson ( @@ -1401,7 +1401,7 @@ public async Task PerformsFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" ) .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload @@ -1470,7 +1470,7 @@ public async Task PerformsMultiFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" ) .WithMultipartFormData("\"files[0]\"", fileName1, file1) .WithMultipartFormData("\"files[1]\"", fileName2, file2) @@ -1552,7 +1552,7 @@ public async Task PerformsRetainingFileUploadRequestCorrectly() .Expect ( HttpMethod.Patch, - $"{Constants.BaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" ) .WithMultipartFormData("\"files[0]\"", fileName, file) .WithMultipartJsonPayload @@ -1638,7 +1638,7 @@ public async Task PerformsRequestCorrectly() var api = CreateAPI ( b => b - .Expect(HttpMethod.Delete, $"{Constants.BaseURL}webhooks/{webhookID}/{token}/messages/{messageID}") + .Expect(HttpMethod.Delete, $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}/messages/{messageID}") .WithExactQueryString("thread_id", threadID.ToString()) .Respond(HttpStatusCode.NoContent) ); @@ -1687,7 +1687,7 @@ public async Task PerformsRequestCorrectly() .Expect ( HttpMethod.Get, - $"{Constants.BaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" + $"{Constants.DiscordBaseURL}webhooks/{webhookID}/{token}/messages/{messageID}" ) .WithNoContent() .WithExactQueryString("thread_id", threadID.ToString())