liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run dotnet format

Browse Source
This commit is contained in:
spiral 2021-08-27 11:03:47 -04:00
parent 05989242f9
commit ac2671452d
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
278 changed files with 1913 additions and 1808 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Myriad/Builders/EmbedBuilder.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Myriad.Types;
@ -11,66 +11,71 @@ namespace Myriad.Builders
public EmbedBuilder Title(string? title)
{
_embed = _embed with {Title = title};
_embed = _embed with { Title = title };
return this;
}
public EmbedBuilder Description(string? description)
{
_embed = _embed with { Description = description};
_embed = _embed with { Description = description };
return this;
}
public EmbedBuilder Url(string? url)
{
_embed = _embed with {Url = url};
_embed = _embed with { Url = url };
return this;
}
public EmbedBuilder Color(uint? color)
{
_embed = _embed with {Color = color};
_embed = _embed with { Color = color };
return this;
}
public EmbedBuilder Footer(Embed.EmbedFooter? footer)
{
_embed = _embed with {
_embed = _embed with
{
Footer = footer
};
};
return this;
}
public EmbedBuilder Image(Embed.EmbedImage? image)
{
_embed = _embed with {
_embed = _embed with
{
Image = image
};
};
return this;
}
public EmbedBuilder Thumbnail(Embed.EmbedThumbnail? thumbnail)
{
_embed = _embed with {
_embed = _embed with
{
Thumbnail = thumbnail
};
};
return this;
}
public EmbedBuilder Author(Embed.EmbedAuthor? author)
{
_embed = _embed with {
_embed = _embed with
{
Author = author
};
};
return this;
}
public EmbedBuilder Timestamp(string? timestamp)
{
_embed = _embed with {
_embed = _embed with
{
Timestamp = timestamp
};
};
return this;
}

2
Myriad/Cache/DiscordCacheExtensions.cs
View File

@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using Myriad.Gateway;

2
Myriad/Cache/IDiscordCache.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Threading.Tasks;
using Myriad.Types;

10
Myriad/Cache/MemoryDiscordCache.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
@ -70,9 +70,11 @@ namespace Myriad.Cache
if (!found)
{
_guilds[guildId] = guild with {
Guild = guild.Guild with {
Roles = guild.Guild.Roles.Concat(new[] { role}).ToArray()
_guilds[guildId] = guild with
{
Guild = guild.Guild with
{
Roles = guild.Guild.Roles.Concat(new[] { role }).ToArray()
}
};
}

2
Myriad/Extensions/CacheExtensions.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Threading.Tasks;
using Myriad.Cache;

2
Myriad/Extensions/ChannelExtensions.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Extensions
{

2
Myriad/Extensions/GuildExtensions.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Extensions
namespace Myriad.Extensions
{
public static class GuildExtensions
{

2
Myriad/Extensions/MessageExtensions.cs
View File

@ -1,4 +1,4 @@
using Myriad.Gateway;
using Myriad.Gateway;
using Myriad.Types;
namespace Myriad.Extensions

2
Myriad/Extensions/PermissionExtensions.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;

2
Myriad/Extensions/SnowflakeExtensions.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using Myriad.Types;

2
Myriad/Extensions/UserExtensions.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Extensions
{

2
Myriad/Gateway/Cluster.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;

2
Myriad/Gateway/Events/ChannelCreateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/ChannelDeleteEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/ChannelUpdateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/GuildCreateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/GuildDeleteEvent.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record GuildDeleteEvent(ulong Id, bool Unavailable): IGatewayEvent;
}

2
Myriad/Gateway/Events/GuildMemberAddEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/GuildMemberRemoveEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/GuildMemberUpdateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/GuildRoleCreateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/GuildRoleDeleteEvent.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record GuildRoleDeleteEvent(ulong GuildId, ulong RoleId): IGatewayEvent;
}

2
Myriad/Gateway/Events/GuildRoleUpdateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/GuildUpdateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

56
Myriad/Gateway/Events/IGatewayEvent.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
namespace Myriad.Gateway
@ -7,33 +7,33 @@ namespace Myriad.Gateway
{
public static readonly Dictionary<string, Type> EventTypes = new()
{
{"READY", typeof(ReadyEvent)},
{"RESUMED", typeof(ResumedEvent)},
{"GUILD_CREATE", typeof(GuildCreateEvent)},
{"GUILD_UPDATE", typeof(GuildUpdateEvent)},
{"GUILD_DELETE", typeof(GuildDeleteEvent)},
{"GUILD_MEMBER_ADD", typeof(GuildMemberAddEvent)},
{"GUILD_MEMBER_REMOVE", typeof(GuildMemberRemoveEvent)},
{"GUILD_MEMBER_UPDATE", typeof(GuildMemberUpdateEvent)},
{"GUILD_ROLE_CREATE", typeof(GuildRoleCreateEvent)},
{"GUILD_ROLE_UPDATE", typeof(GuildRoleUpdateEvent)},
{"GUILD_ROLE_DELETE", typeof(GuildRoleDeleteEvent)},
{"CHANNEL_CREATE", typeof(ChannelCreateEvent)},
{"CHANNEL_UPDATE", typeof(ChannelUpdateEvent)},
{"CHANNEL_DELETE", typeof(ChannelDeleteEvent)},
{"THREAD_CREATE", typeof(ThreadCreateEvent)},
{"THREAD_UPDATE", typeof(ThreadUpdateEvent)},
{"THREAD_DELETE", typeof(ThreadDeleteEvent)},
{"THREAD_LIST_SYNC", typeof(ThreadListSyncEvent)},
{"MESSAGE_CREATE", typeof(MessageCreateEvent)},
{"MESSAGE_UPDATE", typeof(MessageUpdateEvent)},
{"MESSAGE_DELETE", typeof(MessageDeleteEvent)},
{"MESSAGE_DELETE_BULK", typeof(MessageDeleteBulkEvent)},
{"MESSAGE_REACTION_ADD", typeof(MessageReactionAddEvent)},
{"MESSAGE_REACTION_REMOVE", typeof(MessageReactionRemoveEvent)},
{"MESSAGE_REACTION_REMOVE_ALL", typeof(MessageReactionRemoveAllEvent)},
{"MESSAGE_REACTION_REMOVE_EMOJI", typeof(MessageReactionRemoveEmojiEvent)},
{"INTERACTION_CREATE", typeof(InteractionCreateEvent)}
{ "READY", typeof(ReadyEvent) },
{ "RESUMED", typeof(ResumedEvent) },
{ "GUILD_CREATE", typeof(GuildCreateEvent) },
{ "GUILD_UPDATE", typeof(GuildUpdateEvent) },
{ "GUILD_DELETE", typeof(GuildDeleteEvent) },
{ "GUILD_MEMBER_ADD", typeof(GuildMemberAddEvent) },
{ "GUILD_MEMBER_REMOVE", typeof(GuildMemberRemoveEvent) },
{ "GUILD_MEMBER_UPDATE", typeof(GuildMemberUpdateEvent) },
{ "GUILD_ROLE_CREATE", typeof(GuildRoleCreateEvent) },
{ "GUILD_ROLE_UPDATE", typeof(GuildRoleUpdateEvent) },
{ "GUILD_ROLE_DELETE", typeof(GuildRoleDeleteEvent) },
{ "CHANNEL_CREATE", typeof(ChannelCreateEvent) },
{ "CHANNEL_UPDATE", typeof(ChannelUpdateEvent) },
{ "CHANNEL_DELETE", typeof(ChannelDeleteEvent) },
{ "THREAD_CREATE", typeof(ThreadCreateEvent) },
{ "THREAD_UPDATE", typeof(ThreadUpdateEvent) },
{ "THREAD_DELETE", typeof(ThreadDeleteEvent) },
{ "THREAD_LIST_SYNC", typeof(ThreadListSyncEvent) },
{ "MESSAGE_CREATE", typeof(MessageCreateEvent) },
{ "MESSAGE_UPDATE", typeof(MessageUpdateEvent) },
{ "MESSAGE_DELETE", typeof(MessageDeleteEvent) },
{ "MESSAGE_DELETE_BULK", typeof(MessageDeleteBulkEvent) },
{ "MESSAGE_REACTION_ADD", typeof(MessageReactionAddEvent) },
{ "MESSAGE_REACTION_REMOVE", typeof(MessageReactionRemoveEvent) },
{ "MESSAGE_REACTION_REMOVE_ALL", typeof(MessageReactionRemoveAllEvent) },
{ "MESSAGE_REACTION_REMOVE_EMOJI", typeof(MessageReactionRemoveEmojiEvent) },
{ "INTERACTION_CREATE", typeof(InteractionCreateEvent) }
};
}
}

2
Myriad/Gateway/Events/InteractionCreateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/MessageCreateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/MessageDeleteBulkEvent.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record MessageDeleteBulkEvent(ulong[] Ids, ulong ChannelId, ulong? GuildId): IGatewayEvent;
}

2
Myriad/Gateway/Events/MessageDeleteEvent.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record MessageDeleteEvent(ulong Id, ulong ChannelId, ulong? GuildId): IGatewayEvent;
}

2
Myriad/Gateway/Events/MessageReactionAddEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/MessageReactionRemoveAllEvent.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record MessageReactionRemoveAllEvent(ulong ChannelId, ulong MessageId, ulong? GuildId): IGatewayEvent;
}

2
Myriad/Gateway/Events/MessageReactionRemoveEmojiEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/MessageReactionRemoveEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/MessageUpdateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
using Myriad.Utils;
namespace Myriad.Gateway

2
Myriad/Gateway/Events/ReadyEvent.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Myriad.Types;

2
Myriad/Gateway/Events/ResumedEvent.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record ResumedEvent: IGatewayEvent;
}

2
Myriad/Gateway/Events/ThreadCreateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/ThreadDeleteEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/ThreadListSyncEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Events/ThreadUpdateEvent.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Gateway
{

4
Myriad/Gateway/GatewayCloseException.cs
View File

@ -1,11 +1,11 @@
using System;
using System;
namespace Myriad.Gateway
{
// TODO: unused?
public class GatewayCloseException: Exception
{
public GatewayCloseException(int closeCode, string closeReason): base($"{closeCode}: {closeReason}")
public GatewayCloseException(int closeCode, string closeReason) : base($"{closeCode}: {closeReason}")
{
CloseCode = closeCode;
CloseReason = closeReason;

2
Myriad/Gateway/GatewayIntent.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
namespace Myriad.Gateway
{

8
Myriad/Gateway/GatewayPacket.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
namespace Myriad.Gateway
{
@ -7,10 +7,12 @@ namespace Myriad.Gateway
[JsonPropertyName("op")] public GatewayOpcode Opcode { get; init; }
[JsonPropertyName("d")] public object? Payload { get; init; }
[JsonPropertyName("s")] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
[JsonPropertyName("s")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public int? Sequence { get; init; }
[JsonPropertyName("t")] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
[JsonPropertyName("t")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? EventType { get; init; }
}

2
Myriad/Gateway/GatewaySettings.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record GatewaySettings
{

2
Myriad/Gateway/Limit/IGatewayRatelimiter.cs
View File

@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
namespace Myriad.Gateway.Limit
{

2
Myriad/Gateway/Limit/LocalGatewayRatelimiter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Threading.Tasks;

2
Myriad/Gateway/Limit/TwilightGatewayRatelimiter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net.Http;
using System.Threading.Tasks;

2
Myriad/Gateway/Payloads/GatewayHello.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record GatewayHello(int HeartbeatInterval);
}

2
Myriad/Gateway/Payloads/GatewayIdentify.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
namespace Myriad.Gateway
{

2
Myriad/Gateway/Payloads/GatewayResume.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record GatewayResume(string Token, string SessionId, int Seq);
}

2
Myriad/Gateway/Payloads/GatewayStatusUpdate.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Myriad.Serialization;
using Myriad.Types;

4
Myriad/Gateway/Shard.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net.WebSockets;
using System.Text.Json;
using System.Threading.Tasks;
@ -187,7 +187,7 @@ namespace Myriad.Gateway
private async Task SendHeartbeat(int? lastSeq)
{
await _conn.Send(new GatewayPacket {Opcode = GatewayOpcode.Heartbeat, Payload = lastSeq});
await _conn.Send(new GatewayPacket { Opcode = GatewayOpcode.Heartbeat, Payload = lastSeq });
}
private async Task Reconnect(WebSocketCloseStatus closeStatus, TimeSpan delay)

6
Myriad/Gateway/ShardConnection.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net.WebSockets;
using System.Text.Json;
using System.Threading;
@ -40,7 +40,7 @@ namespace Myriad.Gateway
public async Task Send(GatewayPacket packet)
{
// from `ManagedWebSocket.s_validSendStates`
if (_client is not {State: WebSocketState.Open or WebSocketState.CloseReceived})
if (_client is not { State: WebSocketState.Open or WebSocketState.CloseReceived })
return;
try
@ -62,7 +62,7 @@ namespace Myriad.Gateway
public async Task<GatewayPacket?> Read()
{
// from `ManagedWebSocket.s_validReceiveStates`
if (_client is not {State: WebSocketState.Open or WebSocketState.CloseSent})
if (_client is not { State: WebSocketState.Open or WebSocketState.CloseSent })
return null;
try

2
Myriad/Gateway/ShardInfo.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway
namespace Myriad.Gateway
{
public record ShardInfo(int ShardId, int NumShards);
}

4
Myriad/Gateway/ShardPacketSerializer.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Buffers;
using System.IO;
using System.Net.WebSockets;
@ -51,7 +51,7 @@ namespace Myriad.Gateway
stream.Write(buf.Memory.Span.Slice(0, res.Count));
}
return DeserializeObject(res, stream.GetBuffer().AsSpan(0, (int) stream.Length));
return DeserializeObject(res, stream.GetBuffer().AsSpan(0, (int)stream.Length));
}
private (WebSocketMessageType type, GatewayPacket packet) DeserializeSingleBuffer(

2
Myriad/Gateway/State/HeartbeatWorker.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Threading;
using System.Threading.Tasks;

2
Myriad/Gateway/State/ShardState.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Gateway.State
namespace Myriad.Gateway.State
{
public enum ShardState
{

24
Myriad/Gateway/State/ShardStateManager.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net.WebSockets;
using System.Text.Json;
using System.Threading.Tasks;
@ -77,22 +77,22 @@ namespace Myriad.Gateway
break;
case GatewayOpcode.Reconnect:
{
await HandleReconnect();
break;
}
{
await HandleReconnect();
break;
}
case GatewayOpcode.InvalidSession:
{
var canResume = DeserializePayload<bool>(packet);
await HandleInvalidSession(canResume);
break;
}
{
var canResume = DeserializePayload<bool>(packet);
await HandleInvalidSession(canResume);
break;
}
case GatewayOpcode.Dispatch:
_lastSeq = packet.Sequence;
var evt = DeserializeEvent(packet.EventType!, (JsonElement) packet.Payload!);
var evt = DeserializeEvent(packet.EventType!, (JsonElement)packet.Payload!);
if (evt != null)
{
if (evt is ReadyEvent ready)
@ -218,7 +218,7 @@ namespace Myriad.Gateway
private T DeserializePayload<T>(GatewayPacket packet)
{
var packetPayload = (JsonElement) packet.Payload!;
var packetPayload = (JsonElement)packet.Payload!;
return JsonSerializer.Deserialize<T>(packetPayload.GetRawText(), _jsonSerializerOptions)!;
}

18
Myriad/Rest/BaseRestClient.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Net;
@ -52,7 +52,7 @@ namespace Myriad.Rest
var waitPolicy = Policy
.Handle<RatelimitBucketExhaustedException>()
.WaitAndRetryAsync(3,
(_, e, _) => ((RatelimitBucketExhaustedException) e).RetryAfter,
(_, e, _) => ((RatelimitBucketExhaustedException)e).RetryAfter,
(_, _, _, _) => Task.CompletedTask)
.AsAsyncPolicy<HttpResponseMessage>();
@ -68,7 +68,7 @@ namespace Myriad.Rest
return default;
}
public async Task<T?> Get<T>(string path, (string endpointName, ulong major) ratelimitParams) where T: class
public async Task<T?> Get<T>(string path, (string endpointName, ulong major) ratelimitParams) where T : class
{
using var response = await Send(() => new HttpRequestMessage(HttpMethod.Get, ApiBaseUrl + path),
ratelimitParams, true);
@ -81,7 +81,7 @@ namespace Myriad.Rest
}
public async Task<T?> Post<T>(string path, (string endpointName, ulong major) ratelimitParams, object? body)
where T: class
where T : class
{
using var response = await Send(() =>
{
@ -93,7 +93,7 @@ namespace Myriad.Rest
}
public async Task<T?> PostMultipart<T>(string path, (string endpointName, ulong major) ratelimitParams, object? payload, MultipartFile[]? files)
where T: class
where T : class
{
using var response = await Send(() =>
{
@ -105,7 +105,7 @@ namespace Myriad.Rest
}
public async Task<T?> Patch<T>(string path, (string endpointName, ulong major) ratelimitParams, object? body)
where T: class
where T : class
{
using var response = await Send(() =>
{
@ -117,7 +117,7 @@ namespace Myriad.Rest
}
public async Task<T?> Put<T>(string path, (string endpointName, ulong major) ratelimitParams, object? body)
where T: class
where T : class
{
using var response = await Send(() =>
{
@ -160,7 +160,7 @@ namespace Myriad.Rest
request.Content = mfd;
}
private async Task<T?> ReadResponse<T>(HttpResponseMessage response) where T: class
private async Task<T?> ReadResponse<T>(HttpResponseMessage response) where T : class
{
if (response.StatusCode == HttpStatusCode.NoContent)
return null;
@ -189,7 +189,7 @@ namespace Myriad.Rest
_logger.Debug(
"Response: {RequestMethod} {RequestPath} -> {StatusCode} {ReasonPhrase} (in {ResponseDurationMs} ms)",
request.Method, request.RequestUri, (int) response.StatusCode, response.ReasonPhrase, stopwatch.ElapsedMilliseconds);
request.Method, request.RequestUri, (int)response.StatusCode, response.ReasonPhrase, stopwatch.ElapsedMilliseconds);
await HandleApiError(response, ignoreNotFound);

2
Myriad/Rest/DiscordApiClient.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net;
using System.Threading.Tasks;

2
Myriad/Rest/DiscordApiError.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json;
using System.Text.Json;
namespace Myriad.Rest
{

34
Myriad/Rest/Exceptions/DiscordRequestException.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net;
using System.Net.Http;
@ -29,43 +29,49 @@ namespace Myriad.Rest.Exceptions
public class NotFoundException: DiscordRequestException
{
public NotFoundException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError): base(
response, responseBody, apiError) { }
public NotFoundException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError) : base(
response, responseBody, apiError)
{ }
}
public class UnauthorizedException: DiscordRequestException
{
public UnauthorizedException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError): base(
response, responseBody, apiError) { }
public UnauthorizedException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError) : base(
response, responseBody, apiError)
{ }
}
public class ForbiddenException: DiscordRequestException
{
public ForbiddenException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError): base(
response, responseBody, apiError) { }
public ForbiddenException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError) : base(
response, responseBody, apiError)
{ }
}
public class ConflictException: DiscordRequestException
{
public ConflictException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError): base(
response, responseBody, apiError) { }
public ConflictException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError) : base(
response, responseBody, apiError)
{ }
}
public class BadRequestException: DiscordRequestException
{
public BadRequestException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError): base(
response, responseBody, apiError) { }
public BadRequestException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError) : base(
response, responseBody, apiError)
{ }
}
public class TooManyRequestsException: DiscordRequestException
{
public TooManyRequestsException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError):
base(response, responseBody, apiError) { }
public TooManyRequestsException(HttpResponseMessage response, string responseBody, DiscordApiError? apiError) :
base(response, responseBody, apiError)
{ }
}
public class UnknownDiscordRequestException: DiscordRequestException
{
public UnknownDiscordRequestException(HttpResponseMessage response, string responseBody,
DiscordApiError? apiError): base(response, responseBody, apiError) { }
DiscordApiError? apiError) : base(response, responseBody, apiError) { }
}
}

8
Myriad/Rest/Exceptions/RatelimitException.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using Myriad.Rest.Ratelimit;
@ -6,12 +6,12 @@ namespace Myriad.Rest.Exceptions
{
public class RatelimitException: Exception
{
public RatelimitException(string? message): base(message) { }
public RatelimitException(string? message) : base(message) { }
}
public class RatelimitBucketExhaustedException: RatelimitException
{
public RatelimitBucketExhaustedException(Bucket bucket, TimeSpan retryAfter): base(
public RatelimitBucketExhaustedException(Bucket bucket, TimeSpan retryAfter) : base(
"Rate limit bucket exhausted, request blocked")
{
Bucket = bucket;
@ -24,6 +24,6 @@ namespace Myriad.Rest.Exceptions
public class GloballyRatelimitedException: RatelimitException
{
public GloballyRatelimitedException(): base("Global rate limit hit") { }
public GloballyRatelimitedException() : base("Global rate limit hit") { }
}
}

2
Myriad/Rest/Ratelimit/Bucket.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Threading;
using Serilog;

2
Myriad/Rest/Ratelimit/BucketManager.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;

2
Myriad/Rest/Ratelimit/DiscordRateLimitPolicy.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;

4
Myriad/Rest/Ratelimit/RatelimitHeaders.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Globalization;
using System.Linq;
using System.Net.Http;
@ -41,7 +41,7 @@ namespace Myriad.Rest.Ratelimit
var resetTimestamp = TryGetDouble(response, ResetHeader);
if (resetTimestamp != null)
headers.Reset = DateTimeOffset.FromUnixTimeMilliseconds((long) (resetTimestamp.Value * 1000));
headers.Reset = DateTimeOffset.FromUnixTimeMilliseconds((long)(resetTimestamp.Value * 1000));
var resetAfterSeconds = TryGetDouble(response, ResetAfterHeader);
if (resetAfterSeconds != null)

2
Myriad/Rest/Ratelimit/Ratelimiter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using Myriad.Rest.Exceptions;

2
Myriad/Rest/Types/AllowedMentions.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Myriad.Serialization;

2
Myriad/Rest/Types/MultipartFile.cs
View File

@ -1,4 +1,4 @@
using System.IO;
using System.IO;
namespace Myriad.Rest.Types
{

2
Myriad/Rest/Types/Requests/CommandRequest.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Myriad.Types;

2
Myriad/Rest/Types/Requests/CreateDmRequest.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Rest.Types.Requests
namespace Myriad.Rest.Types.Requests
{
public record CreateDmRequest(ulong RecipientId);
}

2
Myriad/Rest/Types/Requests/CreateWebhookRequest.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Rest.Types.Requests
namespace Myriad.Rest.Types.Requests
{
public record CreateWebhookRequest(string Name);
}

2
Myriad/Rest/Types/Requests/ExecuteWebhookRequest.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Rest.Types.Requests
{

2
Myriad/Rest/Types/Requests/MessageEditRequest.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Myriad.Types;
using Myriad.Utils;

2
Myriad/Rest/Types/Requests/MessageRequest.cs
View File

@ -1,4 +1,4 @@
using Myriad.Types;
using Myriad.Types;
namespace Myriad.Rest.Types.Requests
{

2
Myriad/Rest/Types/Requests/ModifyGuildMemberRequest.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Rest.Types
namespace Myriad.Rest.Types
{
public record ModifyGuildMemberRequest
{

2
Myriad/Rest/Types/Requests/WebhookMessageEditRequest.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Myriad.Utils;

2
Myriad/Serialization/JsonSerializerOptionsExtensions.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Myriad.Serialization

2
Myriad/Serialization/JsonSnakeCaseNamingPolicy.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Text;
using System.Text.Json;

2
Myriad/Serialization/JsonSnakeCaseStringEnumConverter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Text.Json;
using System.Text.Json.Serialization;

2
Myriad/Serialization/JsonStringConverter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Text.Json;
using System.Text.Json.Serialization;

4
Myriad/Serialization/OptionalConverter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Reflection;
using System.Text.Json;
using System.Text.Json.Serialization;
@ -26,7 +26,7 @@ namespace Myriad.Serialization
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
{
var innerType = typeToConvert.GetGenericArguments()[0];
return (JsonConverter?) Activator.CreateInstance(
return (JsonConverter?)Activator.CreateInstance(
typeof(Inner<>).MakeGenericType(innerType),
BindingFlags.Instance | BindingFlags.Public,
null,

6
Myriad/Serialization/PermissionSetJsonConverter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
@ -13,12 +13,12 @@ namespace Myriad.Serialization
var str = reader.GetString();
if (str == null) return default;
return (PermissionSet) ulong.Parse(str);
return (PermissionSet)ulong.Parse(str);
}
public override void Write(Utf8JsonWriter writer, PermissionSet value, JsonSerializerOptions options)
{
writer.WriteStringValue(((ulong) value).ToString());
writer.WriteStringValue(((ulong)value).ToString());
}
}
}

2
Myriad/Serialization/ShardInfoJsonConverter.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Text.Json;
using System.Text.Json.Serialization;

2
Myriad/Types/Activity.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record Activity: ActivityPartial
{

2
Myriad/Types/Application/Application.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record Application: ApplicationPartial
{

2
Myriad/Types/Application/ApplicationCommand.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record ApplicationCommand
{

2
Myriad/Types/Application/ApplicationCommandInteractionData.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record ApplicationCommandInteractionData
{

2
Myriad/Types/Application/ApplicationCommandInteractionDataOption.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record ApplicationCommandInteractionDataOption
{

2
Myriad/Types/Application/ApplicationCommandOption.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record ApplicationCommandOption(ApplicationCommandOption.OptionType Type, string Name, string Description)
{

2
Myriad/Types/Application/Interaction.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record Interaction
{

2
Myriad/Types/Application/InteractionApplicationCommandCallbackData.cs
View File

@ -1,4 +1,4 @@
using System.Text.Json.Serialization;
using System.Text.Json.Serialization;
using Myriad.Rest.Types;
using Myriad.Utils;

2
Myriad/Types/Application/InteractionResponse.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record InteractionResponse
{

2
Myriad/Types/Channel.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record Channel
{

16
Myriad/Types/Embed.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record Embed
{
@ -16,44 +16,44 @@
public EmbedAuthor? Author { get; init; }
public Field[]? Fields { get; init; }
public record EmbedFooter (
public record EmbedFooter(
string Text,
string? IconUrl = null,
string? ProxyIconUrl = null
);
public record EmbedImage (
public record EmbedImage(
string? Url,
uint? Width = null,
uint? Height = null
);
public record EmbedThumbnail (
public record EmbedThumbnail(
string? Url,
string? ProxyUrl = null,
uint? Width = null,
uint? Height = null
);
public record EmbedVideo (
public record EmbedVideo(
string? Url,
uint? Width = null,
uint? Height = null
);
public record EmbedProvider (
public record EmbedProvider(
string? Name,
string? Url
);
public record EmbedAuthor (
public record EmbedAuthor(
string? Name = null,
string? Url = null,
string? IconUrl = null,
string? ProxyIconUrl = null
);
public record Field (
public record Field(
string Name,
string Value,
bool Inline = false

2
Myriad/Types/Emoji.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record Emoji
{

2
Myriad/Types/Gateway/GatewayInfo.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record GatewayInfo
{

2
Myriad/Types/Gateway/SessionStartLimit.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record SessionStartLimit
{

2
Myriad/Types/Guild.cs
View File

@ -1,4 +1,4 @@
namespace Myriad.Types
namespace Myriad.Types
{
public record Guild
{

Some files were not shown because too many files have changed in this diff Show More