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

refactor: don't use 'out' in IDiscordCache methods

Browse Source 
this change is required for async cache (.NET doesn't support async ref/out params)
This commit is contained in:
spiral
2021-11-18 13:11:02 -05:00
parent 3ba46ff456
commit 0efaab6d95
11 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Myriad/Cache/IDiscordCache.cs
View File

@@ -18,11 +18,11 @@ namespace Myriad.Cache
public ValueTask RemoveUser(ulong userId);
public ValueTask RemoveRole(ulong guildId, ulong roleId);
public Task<bool> TryGetGuild(ulong guildId, out Guild guild);
public Task<bool> TryGetChannel(ulong channelId, out Channel channel);
public Task<bool> TryGetDmChannel(ulong userId, out Channel channel);
public Task<bool> TryGetUser(ulong userId, out User user);
public Task<bool> TryGetRole(ulong roleId, out Role role);
public Task<Guild?> TryGetGuild(ulong guildId);
public Task<Channel?> TryGetChannel(ulong channelId);
public Task<Channel?> TryGetDmChannel(ulong userId);
public Task<User?> TryGetUser(ulong userId);
public Task<Role?> TryGetRole(ulong roleId);
public IAsyncEnumerable<Guild> GetAllGuilds();
public Task<IEnumerable<Channel>> GetGuildChannels(ulong guildId);

42
Myriad/Cache/MemoryDiscordCache.cs
View File

@@ -124,34 +124,36 @@ namespace Myriad.Cache
return default;
}
public Task<bool> TryGetGuild(ulong guildId, out Guild guild)
public Task<Guild?> TryGetGuild(ulong guildId)
{
if (_guilds.TryGetValue(guildId, out var cg))
{
guild = cg.Guild;
return Task.FromResult(true);
}
guild = null!;
return Task.FromResult(false);
_guilds.TryGetValue(guildId, out var cg);
return Task.FromResult(cg?.Guild);
}
public Task<bool> TryGetChannel(ulong channelId, out Channel channel) =>
Task.FromResult(_channels.TryGetValue(channelId, out channel!));
public Task<bool> TryGetDmChannel(ulong userId, out Channel channel)
public Task<Channel?> TryGetChannel(ulong channelId)
{
_channels.TryGetValue(channelId, out var channel);
return Task.FromResult(channel);
}
public Task<Channel?> TryGetDmChannel(ulong userId)
{
channel = default!;
if (!_dmChannels.TryGetValue(userId, out var channelId))
return Task.FromResult(false);
return TryGetChannel(channelId, out channel);
return Task.FromResult((Channel?) null);
return TryGetChannel(channelId);
}
public Task<bool> TryGetUser(ulong userId, out User user) =>
Task.FromResult(_users.TryGetValue(userId, out user!));
public Task<User?> TryGetUser(ulong userId)
{
_users.TryGetValue(userId, out var user);
return Task.FromResult(user);
}
public Task<bool> TryGetRole(ulong roleId, out Role role) =>
Task.FromResult(_roles.TryGetValue(roleId, out role!));
public Task<Role?> TryGetRole(ulong roleId)
{
_roles.TryGetValue(roleId, out var role);
return Task.FromResult(role);
}
public IAsyncEnumerable<Guild> GetAllGuilds()
{

21
Myriad/Extensions/CacheExtensions.cs
View File

@@ -11,42 +11,35 @@ namespace Myriad.Extensions
{
public static async Task<Guild> GetGuild(this IDiscordCache cache, ulong guildId)
{
if (!await cache.TryGetGuild(guildId, out var guild))
if (!(await cache.TryGetGuild(guildId) is Guild guild))
throw new KeyNotFoundException($"Guild {guildId} not found in cache");
return guild;
}
public static async Task<Channel> GetChannel(this IDiscordCache cache, ulong channelId)
{
if (!await cache.TryGetChannel(channelId, out var channel))
if (!(await cache.TryGetChannel(channelId) is Channel channel))
throw new KeyNotFoundException($"Channel {channelId} not found in cache");
return channel;
}
public static async Task<Channel?> GetChannelOrNull(this IDiscordCache cache, ulong channelId)
{
if (await cache.TryGetChannel(channelId, out var channel))
return channel;
return null;
}
public static async Task<User> GetUser(this IDiscordCache cache, ulong userId)
{
if (!await cache.TryGetUser(userId, out var user))
if (!(await cache.TryGetUser(userId) is User user))
throw new KeyNotFoundException($"User {userId} not found in cache");
return user;
}
public static async Task<Role> GetRole(this IDiscordCache cache, ulong roleId)
{
if (!await cache.TryGetRole(roleId, out var role))
if (!(await cache.TryGetRole(roleId) is Role role))
throw new KeyNotFoundException($"Role {roleId} not found in cache");
return role;
}
public static async ValueTask<User?> GetOrFetchUser(this IDiscordCache cache, DiscordApiClient rest, ulong userId)
{
if (await cache.TryGetUser(userId, out var cacheUser))
if (await cache.TryGetUser(userId) is User cacheUser)
return cacheUser;
var restUser = await rest.GetUser(userId);
@@ -57,7 +50,7 @@ namespace Myriad.Extensions
public static async ValueTask<Channel?> GetOrFetchChannel(this IDiscordCache cache, DiscordApiClient rest, ulong channelId)
{
if (await cache.TryGetChannel(channelId, out var cacheChannel))
if (await cache.TryGetChannel(channelId) is {} cacheChannel)
return cacheChannel;
var restChannel = await rest.GetChannel(channelId);
@@ -68,7 +61,7 @@ namespace Myriad.Extensions
public static async Task<Channel> GetOrCreateDmChannel(this IDiscordCache cache, DiscordApiClient rest, ulong recipientId)
{
if (await cache.TryGetDmChannel(recipientId, out var cacheChannel))
if (await cache.TryGetDmChannel(recipientId) is {} cacheChannel)
return cacheChannel;
var restChannel = await rest.CreateDm(recipientId);

2
Myriad/Extensions/PermissionExtensions.cs
View File

@@ -19,7 +19,7 @@ namespace Myriad.Extensions
public static async Task<PermissionSet> PermissionsFor(this IDiscordCache cache, ulong channelId, ulong userId, GuildMemberPartial? member, bool isWebhook = false)
{
if (!await cache.TryGetChannel(channelId, out var channel))
if (!(await cache.TryGetChannel(channelId) is Channel channel))
// todo: handle channel not found better
return PermissionSet.Dm;