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

Convert message update handler

Browse Source
This commit is contained in:
Ske 2021-01-31 14:42:28 +01:00
parent d56e878c28
commit 0c1bb6cc6a
2 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,14 @@
using Myriad.Utils; using Myriad.Types;
using Myriad.Utils;
namespace Myriad.Gateway namespace Myriad.Gateway
{ {
public record MessageUpdateEvent(ulong Id, ulong ChannelId): IGatewayEvent public record MessageUpdateEvent(ulong Id, ulong ChannelId): IGatewayEvent
{ {
public Optional<string?> Content { get; init; } public Optional<string?> Content { get; init; }
public Optional<User> Author { get; init; }
public Optional<GuildMemberPartial> Member { get; init; }
public Optional<Message.Attachment[]> Attachments { get; init; }
// TODO: lots of partials // TODO: lots of partials
} }
} }

63
PluralKit.Bot/Handlers/MessageEdited.cs
View File

@ -1,10 +1,12 @@
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using App.Metrics; using App.Metrics;
using DSharpPlus; using Myriad.Cache;
using Myriad.Extensions;
using Myriad.Gateway; using Myriad.Gateway;
using Myriad.Types;
using PluralKit.Core; using PluralKit.Core;
@ -18,9 +20,11 @@ namespace PluralKit.Bot
private readonly IDatabase _db; private readonly IDatabase _db;
private readonly ModelRepository _repo; private readonly ModelRepository _repo;
private readonly IMetrics _metrics; private readonly IMetrics _metrics;
private readonly DiscordShardedClient _client; private readonly Cluster _client;
private readonly IDiscordCache _cache;
private readonly Bot _bot;
public MessageEdited(LastMessageCacheService lastMessageCache, ProxyService proxy, IDatabase db, IMetrics metrics, ModelRepository repo, DiscordShardedClient client) public MessageEdited(LastMessageCacheService lastMessageCache, ProxyService proxy, IDatabase db, IMetrics metrics, ModelRepository repo, Cluster client, IDiscordCache cache, Bot bot)
{ {
_lastMessageCache = lastMessageCache; _lastMessageCache = lastMessageCache;
_proxy = proxy; _proxy = proxy;
@ -28,25 +32,46 @@ namespace PluralKit.Bot
_metrics = metrics; _metrics = metrics;
_repo = repo; _repo = repo;
_client = client; _client = client;
_cache = cache;
_bot = bot;
} }
public async Task Handle(Shard shard, MessageUpdateEvent evt) public async Task Handle(Shard shard, MessageUpdateEvent evt)
{ {
// TODO: fix if (evt.Author.Value?.Id == _client.User?.Id) return;
// if (evt.Author?.Id == _client.CurrentUser?.Id) return;
// // Edit message events sometimes arrive with missing data; double-check it's all there
// // Edit message events sometimes arrive with missing data; double-check it's all there if (!evt.Content.HasValue || !evt.Author.HasValue || !evt.Member.HasValue)
// if (evt.Message.Content == null || evt.Author == null || evt.Channel.Guild == null) return; return;
//
// // Only react to the last message in the channel var channel = _cache.GetChannel(evt.ChannelId);
// if (_lastMessageCache.GetLastMessage(evt.Channel.Id) != evt.Message.Id) return; if (channel.Type != Channel.ChannelType.GuildText)
// return;
// // Just run the normal message handling code, with a flag to disable autoproxying var guild = _cache.GetGuild(channel.GuildId!.Value);
// MessageContext ctx;
// await using (var conn = await _db.Obtain()) // Only react to the last message in the channel
// using (_metrics.Measure.Timer.Time(BotMetrics.MessageContextQueryTime)) if (_lastMessageCache.GetLastMessage(evt.ChannelId) != evt.Id)
// ctx = await _repo.GetMessageContext(conn, evt.Author.Id, evt.Channel.GuildId, evt.Channel.Id); return;
// await _proxy.HandleIncomingMessage(shard, evt.Message, ctx, allowAutoproxy: false);
// Just run the normal message handling code, with a flag to disable autoproxying
MessageContext ctx;
await using (var conn = await _db.Obtain())
using (_metrics.Measure.Timer.Time(BotMetrics.MessageContextQueryTime))
ctx = await _repo.GetMessageContext(conn, evt.Author.Value!.Id, channel.GuildId!.Value, evt.ChannelId);
// TODO: is this missing anything?
var equivalentEvt = new MessageCreateEvent
{
Id = evt.Id,
ChannelId = evt.ChannelId,
GuildId = channel.GuildId,
Author = evt.Author.Value,
Member = evt.Member.Value,
Content = evt.Content.Value,
Attachments = evt.Attachments.Value ?? Array.Empty<Message.Attachment>()
};
var botPermissions = _bot.PermissionsIn(channel.Id);
await _proxy.HandleIncomingMessage(shard, equivalentEvt, ctx, allowAutoproxy: false, guild: guild, channel: channel, botPermissions: botPermissions);
} }
} }
} }