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

Don't attempt to send log messages if the bot doesn't have permissions

Browse Source
This commit is contained in:
Ske 2020-02-22 01:54:10 +01:00
parent 493f7b12e5
commit 8d3be79d33
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PluralKit.Bot/Commands/Misc.cs
View File

@ -128,7 +128,7 @@ namespace PluralKit.Bot {
foreach (var channel in await guild.GetTextChannelsAsync()) foreach (var channel in await guild.GetTextChannelsAsync())
{ {
// TODO: do we need to hide channels here to prevent info-leaking? // TODO: do we need to hide channels here to prevent info-leaking?
var perms = await channel.PermissionsIn(); var perms = channel.PermissionsIn();
// We use a bitfield so we can set individual permission bits in the loop // We use a bitfield so we can set individual permission bits in the loop
ulong missingPermissionField = 0; ulong missingPermissionField = 0;

5
PluralKit.Bot/Services/LogChannelService.cs
View File

@ -33,9 +33,14 @@ namespace PluralKit.Bot {
// Bail if we can't find the channel // Bail if we can't find the channel
if (!(await _client.GetChannelAsync(guildCfg.Value.LogChannel.Value) is ITextChannel logChannel)) return; if (!(await _client.GetChannelAsync(guildCfg.Value.LogChannel.Value) is ITextChannel logChannel)) return;
// Bail if we don't have permission to send stuff here
if (!logChannel.HasPermission(ChannelPermission.SendMessages) || !logChannel.HasPermission(ChannelPermission.EmbedLinks))
return;
var embed = _embed.CreateLoggedMessageEmbed(system, member, messageId, originalMsgId, sender, content, originalChannel); var embed = _embed.CreateLoggedMessageEmbed(system, member, messageId, originalMsgId, sender, content, originalChannel);
var url = $"https://discordapp.com/channels/{originalChannel.GuildId}/{originalChannel.Id}/{messageId}"; var url = $"https://discordapp.com/channels/{originalChannel.GuildId}/{originalChannel.Id}/{messageId}";
await logChannel.SendMessageAsync(text: url, embed: embed); await logChannel.SendMessageAsync(text: url, embed: embed);
} }
} }

4
PluralKit.Bot/Services/ProxyService.cs
View File

@ -286,7 +286,7 @@ namespace PluralKit.Bot
// Finally remove the original reaction (if we can) // Finally remove the original reaction (if we can)
var user = await _client.Rest.GetUserAsync(userWhoReacted); var user = await _client.Rest.GetUserAsync(userWhoReacted);
if (user != null && await realMessage.Channel.HasPermission(ChannelPermission.ManageMessages)) if (user != null && realMessage.Channel.HasPermission(ChannelPermission.ManageMessages))
await realMessage.RemoveReactionAsync(reactedEmote, user); await realMessage.RemoveReactionAsync(reactedEmote, user);
} }
@ -316,7 +316,7 @@ namespace PluralKit.Bot
// And finally remove the original reaction (if we can) // And finally remove the original reaction (if we can)
var msgObj = await message.GetOrDownloadAsync(); var msgObj = await message.GetOrDownloadAsync();
if (await msgObj.Channel.HasPermission(ChannelPermission.ManageMessages)) if (msgObj.Channel.HasPermission(ChannelPermission.ManageMessages))
await msgObj.RemoveReactionAsync(reactedEmote, user); await msgObj.RemoveReactionAsync(reactedEmote, user);
} }

15
PluralKit.Bot/Utils/DiscordUtils.cs
View File

@ -1,6 +1,5 @@
using System.Threading.Tasks; using Discord;
using Discord.WebSocket;
using Discord;
namespace PluralKit.Bot namespace PluralKit.Bot
{ {
@ -10,7 +9,7 @@ namespace PluralKit.Bot
return $"{user.Username}#{user.Discriminator} ({user.Mention})"; return $"{user.Username}#{user.Discriminator} ({user.Mention})";
} }
public static async Task<ChannelPermissions> PermissionsIn(this IChannel channel) public static ChannelPermissions PermissionsIn(this IChannel channel)
{ {
switch (channel) switch (channel)
{ {
@ -18,15 +17,15 @@ namespace PluralKit.Bot
return ChannelPermissions.DM; return ChannelPermissions.DM;
case IGroupChannel _: case IGroupChannel _:
return ChannelPermissions.Group; return ChannelPermissions.Group;
case IGuildChannel gc: case SocketGuildChannel gc:
var currentUser = await gc.Guild.GetCurrentUserAsync(); var currentUser = gc.Guild.CurrentUser;
return currentUser.GetPermissions(gc); return currentUser.GetPermissions(gc);
default: default:
return ChannelPermissions.None; return ChannelPermissions.None;
} }
} }
public static async Task<bool> HasPermission(this IChannel channel, ChannelPermission permission) => public static bool HasPermission(this IChannel channel, ChannelPermission permission) =>
(await PermissionsIn(channel)).Has(permission); PermissionsIn(channel).Has(permission);
} }
} }