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

Add embed builder, some more ported classes

Browse Source
This commit is contained in:
Ske
2020-12-23 02:19:02 +01:00
parent 05334f0d25
commit f6fb8204bb
13 changed files with 305 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PluralKit.Bot/Handlers/MessageCreated.cs
View File

@@ -114,7 +114,7 @@ namespace PluralKit.Bot
try
{
var system = ctx.SystemId != null ? await _db.Execute(c => _repo.GetSystem(c, ctx.SystemId.Value)) : null;
await _tree.ExecuteCommand(new Context(_services, shard, guild, channel, evt, cmdStart, system, ctx, _bot.BotMemberIn(channel.GuildId!.Value)));
await _tree.ExecuteCommand(new Context(_services, shard, guild, channel, evt, cmdStart, system, ctx, _bot.PermissionsIn(channel.Id)));
}
catch (PKError)
{
@@ -147,8 +147,7 @@ namespace PluralKit.Bot
private async ValueTask<bool> TryHandleProxy(Shard shard, MessageCreateEvent evt, Guild guild, Channel channel, MessageContext ctx)
{
var botMember = _bot.BotMemberIn(channel.GuildId!.Value);
var botPermissions = PermissionExtensions.PermissionsFor(guild, channel, shard.User!.Id, botMember!.Roles);
var botPermissions = _bot.PermissionsIn(channel.Id);
try
{

9
PluralKit.Bot/Handlers/MessageDeleted.cs
View File

@@ -34,7 +34,7 @@ namespace PluralKit.Bot
{
await Task.Delay(MessageDeleteDelay);
// TODO
// await _db.Execute(c => _repo.DeleteMessage(c, evt.Message.Id));
await _db.Execute(c => _repo.DeleteMessage(c, evt.Id));
}
// Fork a task to delete the message after a short delay
@@ -49,9 +49,10 @@ namespace PluralKit.Bot
async Task Inner()
{
await Task.Delay(MessageDeleteDelay);
// TODO
// _logger.Information("Bulk deleting {Count} messages in channel {Channel}", evt.Messages.Count, evt.Channel.Id);
// await _db.Execute(c => _repo.DeleteMessagesBulk(c, evt.Messages.Select(m => m.Id).ToList()));
_logger.Information("Bulk deleting {Count} messages in channel {Channel}",
evt.Ids.Length, evt.ChannelId);
await _db.Execute(c => _repo.DeleteMessagesBulk(c, evt.Ids));
}
_ = Inner();

120
PluralKit.Bot/Handlers/ReactionAdded.cs
View File

@@ -1,11 +1,13 @@
using System.Threading.Tasks;
using DSharpPlus;
using DSharpPlus.Entities;
using DSharpPlus.EventArgs;
using DSharpPlus.Exceptions;
using Myriad.Builders;
using Myriad.Cache;
using Myriad.Extensions;
using Myriad.Gateway;
using Myriad.Rest;
using Myriad.Rest.Exceptions;
using Myriad.Rest.Types;
using Myriad.Types;
using PluralKit.Core;
@@ -18,37 +20,42 @@ namespace PluralKit.Bot
private readonly IDatabase _db;
private readonly ModelRepository _repo;
private readonly CommandMessageService _commandMessageService;
private readonly EmbedService _embeds;
private readonly ILogger _logger;
private readonly IDiscordCache _cache;
private readonly Bot _bot;
private readonly DiscordApiClient _rest;
public ReactionAdded(EmbedService embeds, ILogger logger, IDatabase db, ModelRepository repo, CommandMessageService commandMessageService)
public ReactionAdded(ILogger logger, IDatabase db, ModelRepository repo, CommandMessageService commandMessageService, IDiscordCache cache, Bot bot, DiscordApiClient rest)
{
_embeds = embeds;
_db = db;
_repo = repo;
_commandMessageService = commandMessageService;
_cache = cache;
_bot = bot;
_rest = rest;
_logger = logger.ForContext<ReactionAdded>();
}
public async Task Handle(Shard shard, MessageReactionAddEvent evt)
{
// await TryHandleProxyMessageReactions(shard, evt);
await TryHandleProxyMessageReactions(evt);
}
private async ValueTask TryHandleProxyMessageReactions(DiscordClient shard, MessageReactionAddEventArgs evt)
private async ValueTask TryHandleProxyMessageReactions(MessageReactionAddEvent evt)
{
// Sometimes we get events from users that aren't in the user cache
// In that case we get a "broken" user object (where eg. calling IsBot throws an exception)
// We just ignore all of those for now, should be quite rare...
if (!shard.TryGetCachedUser(evt.User.Id, out _)) return;
if (!_cache.TryGetUser(evt.UserId, out var user))
return;
var channel = _cache.GetChannel(evt.ChannelId);
// check if it's a command message first
// since this can happen in DMs as well
if (evt.Emoji.Name == "\u274c")
{
await using var conn = await _db.Obtain();
var commandMsg = await _commandMessageService.GetCommandMessage(conn, evt.Message.Id);
var commandMsg = await _commandMessageService.GetCommandMessage(conn, evt.MessageId);
if (commandMsg != null)
{
await HandleCommandDeleteReaction(evt, commandMsg);
@@ -57,10 +64,10 @@ namespace PluralKit.Bot
}
// Only proxies in guild text channels
if (evt.Channel == null || evt.Channel.Type != ChannelType.Text) return;
if (channel.Type != Channel.ChannelType.GuildText) return;
// Ignore reactions from bots (we can't DM them anyway)
if (evt.User.IsBot) return;
if (user.Bot) return;
switch (evt.Emoji.Name)
{
@@ -68,7 +75,7 @@ namespace PluralKit.Bot
case "\u274C": // Red X
{
await using var conn = await _db.Obtain();
var msg = await _repo.GetMessage(conn, evt.Message.Id);
var msg = await _repo.GetMessage(conn, evt.MessageId);
if (msg != null)
await HandleProxyDeleteReaction(evt, msg);
@@ -78,9 +85,9 @@ namespace PluralKit.Bot
case "\u2754": // White question mark
{
await using var conn = await _db.Obtain();
var msg = await _repo.GetMessage(conn, evt.Message.Id);
var msg = await _repo.GetMessage(conn, evt.MessageId);
if (msg != null)
await HandleQueryReaction(shard, evt, msg);
await HandleQueryReaction(evt, msg);
break;
}
@@ -92,7 +99,7 @@ namespace PluralKit.Bot
case "\u2757": // Exclamation mark
{
await using var conn = await _db.Obtain();
var msg = await _repo.GetMessage(conn, evt.Message.Id);
var msg = await _repo.GetMessage(conn, evt.MessageId);
if (msg != null)
await HandlePingReaction(evt, msg);
break;
@@ -100,37 +107,39 @@ namespace PluralKit.Bot
}
}
private async ValueTask HandleProxyDeleteReaction(MessageReactionAddEventArgs evt, FullMessage msg)
private async ValueTask HandleProxyDeleteReaction(MessageReactionAddEvent evt, FullMessage msg)
{
if (!evt.Channel.BotHasAllPermissions(Permissions.ManageMessages)) return;
if (!_bot.PermissionsIn(evt.ChannelId).HasFlag(PermissionSet.ManageMessages))
return;
// Can only delete your own message
if (msg.Message.Sender != evt.User.Id) return;
if (msg.Message.Sender != evt.UserId) return;
try
{
await evt.Message.DeleteAsync();
await _rest.DeleteMessage(evt.ChannelId, evt.MessageId);
}
catch (NotFoundException)
{
// Message was deleted by something/someone else before we got to it
}
await _db.Execute(c => _repo.DeleteMessage(c, evt.Message.Id));
await _db.Execute(c => _repo.DeleteMessage(c, evt.MessageId));
}
private async ValueTask HandleCommandDeleteReaction(MessageReactionAddEventArgs evt, CommandMessage msg)
private async ValueTask HandleCommandDeleteReaction(MessageReactionAddEvent evt, CommandMessage msg)
{
if (!evt.Channel.BotHasAllPermissions(Permissions.ManageMessages) && evt.Channel.Guild != null)
// TODO: why does the bot need manage messages if it's deleting its own messages??
if (!_bot.PermissionsIn(evt.ChannelId).HasFlag(PermissionSet.ManageMessages))
return;
// Can only delete your own message
if (msg.AuthorId != evt.User.Id)
if (msg.AuthorId != evt.UserId)
return;
try
{
await evt.Message.DeleteAsync();
await _rest.DeleteMessage(evt.ChannelId, evt.MessageId);
}
catch (NotFoundException)
{
@@ -140,44 +149,52 @@ namespace PluralKit.Bot
// No need to delete database row here, it'll get deleted by the once-per-minute scheduled task.
}
private async ValueTask HandleQueryReaction(DiscordClient shard, MessageReactionAddEventArgs evt, FullMessage msg)
private async ValueTask HandleQueryReaction(MessageReactionAddEvent evt, FullMessage msg)
{
// Try to DM the user info about the message
var member = await evt.Guild.GetMember(evt.User.Id);
// var member = await evt.Guild.GetMember(evt.User.Id);
try
{
await member.SendMessageAsync(embed: await _embeds.CreateMemberEmbed(msg.System, msg.Member, evt.Guild, LookupContext.ByNonOwner));
await member.SendMessageAsync(embed: await _embeds.CreateMessageInfoEmbed(shard, msg));
// TODO: how to DM?
// await member.SendMessageAsync(embed: await _embeds.CreateMemberEmbed(msg.System, msg.Member, evt.Guild, LookupContext.ByNonOwner));
// await member.SendMessageAsync(embed: await _embeds.CreateMessageInfoEmbed(shard, msg));
}
catch (UnauthorizedException) { } // No permissions to DM, can't check for this :(
await TryRemoveOriginalReaction(evt);
}
private async ValueTask HandlePingReaction(MessageReactionAddEventArgs evt, FullMessage msg)
private async ValueTask HandlePingReaction(MessageReactionAddEvent evt, FullMessage msg)
{
if (!evt.Channel.BotHasAllPermissions(Permissions.SendMessages)) return;
if (!_bot.PermissionsIn(evt.ChannelId).HasFlag(PermissionSet.ManageMessages))
return;
// Check if the "pinger" has permission to send messages in this channel
// (if not, PK shouldn't send messages on their behalf)
var guildUser = await evt.Guild.GetMember(evt.User.Id);
var requiredPerms = Permissions.AccessChannels | Permissions.SendMessages;
if (guildUser == null || (guildUser.PermissionsIn(evt.Channel) & requiredPerms) != requiredPerms) return;
var member = await _rest.GetGuildMember(evt.GuildId!.Value, evt.UserId);
var requiredPerms = PermissionSet.ViewChannel | PermissionSet.SendMessages;
if (member == null || !_cache.PermissionsFor(evt.ChannelId, member).HasFlag(requiredPerms)) return;
if (msg.System.PingsEnabled)
{
// If the system has pings enabled, go ahead
var embed = new DiscordEmbedBuilder().WithDescription($"[Jump to pinged message]({evt.Message.JumpLink})");
await evt.Channel.SendMessageFixedAsync($"Psst, **{msg.Member.DisplayName()}** (<@{msg.Message.Sender}>), you have been pinged by <@{evt.User.Id}>.", embed: embed.Build(),
new IMention[] {new UserMention(msg.Message.Sender) });
var embed = new EmbedBuilder().Description($"[Jump to pinged message]({evt.JumpLink()})");
await _rest.CreateMessage(evt.ChannelId, new()
{
Content =
$"Psst, **{msg.Member.DisplayName()}** (<@{msg.Message.Sender}>), you have been pinged by <@{evt.UserId}>.",
Embed = embed.Build(),
AllowedMentions = new AllowedMentions {Users = new[] {msg.Message.Sender}}
});
}
else
{
// If not, tell them in DMs (if we can)
try
{
await guildUser.SendMessageFixedAsync($"{Emojis.Error} {msg.Member.DisplayName()}'s system has disabled reaction pings. If you want to mention them anyway, you can copy/paste the following message:");
await guildUser.SendMessageFixedAsync($"<@{msg.Message.Sender}>".AsCode());
// todo: how to dm
// await guildUser.SendMessageFixedAsync($"{Emojis.Error} {msg.Member.DisplayName()}'s system has disabled reaction pings. If you want to mention them anyway, you can copy/paste the following message:");
// await guildUser.SendMessageFixedAsync($"<@{msg.Message.Sender}>".AsCode());
}
catch (UnauthorizedException) { }
}
@@ -185,21 +202,10 @@ namespace PluralKit.Bot
await TryRemoveOriginalReaction(evt);
}
private async Task TryRemoveOriginalReaction(MessageReactionAddEventArgs evt)
private async Task TryRemoveOriginalReaction(MessageReactionAddEvent evt)
{
try
{
if (evt.Channel.BotHasAllPermissions(Permissions.ManageMessages))
await evt.Message.DeleteReactionAsync(evt.Emoji, evt.User);
}
catch (UnauthorizedException)
{
var botPerms = evt.Channel.BotPermissions();
// So, in some cases (see Sentry issue 11K) the above check somehow doesn't work, and
// Discord returns a 403 Unauthorized. TODO: figure out the root cause here instead of a workaround
_logger.Warning("Attempted to remove reaction {Emoji} from user {User} on message {Channel}/{Message}, but got 403. Bot has permissions {Permissions} according to itself.",
evt.Emoji.Id, evt.User.Id, evt.Channel.Id, evt.Message.Id, botPerms);
}
if (_bot.PermissionsIn(evt.ChannelId).HasFlag(PermissionSet.ManageMessages))
await _rest.DeleteOwnReaction(evt.ChannelId, evt.MessageId, evt.Emoji);
}
}
}