eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-17 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: use DiscordUtils.IsValidGuildChannel

Browse source
This commit is contained in:
rladenson 2024-10-03 17:12:44 -06:00
parent 35489260e4
commit 9be8530266
2 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

11
PluralKit.Bot/Commands/ServerConfig.cs
View file

@ -205,16 +205,7 @@ public class ServerConfig
if (ctx.Match("all")) if (ctx.Match("all"))
affectedChannels = (await _cache.GetGuildChannels(ctx.Guild.Id)) affectedChannels = (await _cache.GetGuildChannels(ctx.Guild.Id))
// All the channel types you can proxy in. Taken from ProxyService // All the channel types you can proxy in. Taken from ProxyService
.Where(x => x.Type == Channel.ChannelType.GuildText .Where(x => DiscordUtils.IsValidGuildChannel(x)).ToList();
|| x.Type == Channel.ChannelType.GuildPublicThread
|| x.Type == Channel.ChannelType.GuildPrivateThread
|| x.Type == Channel.ChannelType.GuildNews
|| x.Type == Channel.ChannelType.GuildNewsThread
|| x.Type == Channel.ChannelType.GuildVoice
|| x.Type == Channel.ChannelType.GuildStageVoice
|| x.Type == Channel.ChannelType.GuildForum
|| x.Type == Channel.ChannelType.GuildMedia
).ToList();
else if (!ctx.HasNext()) throw new PKSyntaxError("You must pass one or more #channels."); else if (!ctx.HasNext()) throw new PKSyntaxError("You must pass one or more #channels.");
else else
while (ctx.HasNext()) while (ctx.HasNext())

28
PluralKit.Bot/Proxy/ProxyService.cs
View file

@ -111,33 +111,10 @@ public class ProxyService
return true; return true;
} }
#pragma warning disable CA1822 // Mark members as static // Proxy checks that give user errors
internal bool CanProxyInChannel(Channel ch, bool isRootChannel = false)
#pragma warning restore CA1822 // Mark members as static
{
// this is explicitly selecting known channel types so that when Discord add new
// ones, users don't get flooded with error codes if that new channel type doesn't
// support a feature we need for proxying
// Note: If you add new channels to this, also add them to the allowed channel types
// for blacklisting
return ch.Type switch
{
Channel.ChannelType.GuildText => true,
Channel.ChannelType.GuildPublicThread => true,
Channel.ChannelType.GuildPrivateThread => true,
Channel.ChannelType.GuildNews => true,
Channel.ChannelType.GuildNewsThread => true,
Channel.ChannelType.GuildVoice => true,
Channel.ChannelType.GuildStageVoice => true,
Channel.ChannelType.GuildForum => isRootChannel,
Channel.ChannelType.GuildMedia => isRootChannel,
_ => false,
};
}
public async Task<string> CanProxy(Channel channel, Channel rootChannel, Message msg, MessageContext ctx) public async Task<string> CanProxy(Channel channel, Channel rootChannel, Message msg, MessageContext ctx)
{ {
if (!(CanProxyInChannel(channel) && CanProxyInChannel(rootChannel, true))) if (DiscordUtils.IsValidGuildChannel(channel))
return $"PluralKit cannot proxy messages in this type of channel."; return $"PluralKit cannot proxy messages in this type of channel.";
// Check if the message does not go over any Discord Nitro limits // Check if the message does not go over any Discord Nitro limits
@ -161,6 +138,7 @@ public class ProxyService
return null; return null;
} }
// Proxy checks that don't give user errors unless `pk;debug proxy` is used
public bool ShouldProxy(Channel channel, Channel rootChannel, Message msg, MessageContext ctx) public bool ShouldProxy(Channel channel, Channel rootChannel, Message msg, MessageContext ctx)
{ {
// Make sure author has a system // Make sure author has a system