Skip to content

warnings: Remove ContextMessageReference when context message is deleted #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FloatingMilkshake merged 1 commit into from
Jul 5, 2026
Merged

warnings: Remove ContextMessageReference when context message is deleted #362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions Events/MessageEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,21 @@ public static async Task MessageDeleted(DiscordClient client, MessageDeletedEven
{
var cachedMessage = await dbContext.Messages.Include(m => m.User).Include(m => m.Sticker).FirstOrDefaultAsync(m => m.Id == e.Message.Id);

// If this was a public warning message, remove the message from the warning record to avoid errors later if the warning is edited/deleted
if (cachedMessage.User.Id == client.CurrentUser.Id && (Constants.RegexConstants.auto_warn_msg_rx.IsMatch(cachedMessage.Content) || Constants.RegexConstants.warn_msg_rx.IsMatch(cachedMessage.Content)))
{
var warnedUserId = Convert.ToUInt64(Constants.RegexConstants.user_rx.Match(cachedMessage.Content).Groups[1].Value);
var userWarnings = await Program.redis.HashGetAllAsync(warnedUserId.ToString());
var thisWarning = userWarnings.Select(x => JsonConvert.DeserializeObject<UserWarning>(x.Value))
.FirstOrDefault(x => x.ContextMessageReference?.MessageId == cachedMessage.Id);

if (thisWarning != default)
{
thisWarning.ContextMessageReference = null;
await Program.redis.HashSetAsync(warnedUserId.ToString(), thisWarning.WarningId, JsonConvert.SerializeObject(thisWarning));
}
}

// we store bot messages but don't log them right now
if (cachedMessage is not null && !cachedMessage.User.IsBot)
{
Expand Down Expand Up @@ -183,6 +198,25 @@ public static async Task MessagesBulkDeleted(DiscordClient client, MessagesBulkD
using (var dbContext = new CliptokDbContext())
{
var cachedMessages = dbContext.Messages.Include(m => m.User).Include(m => m.Sticker).Where(m => messageIds.Contains(m.Id));

// If this was a public warning message, remove the message from the warning record to avoid errors later if the warning is edited/deleted
foreach (var cachedMessage in cachedMessages)
{
if (cachedMessage.User.Id == client.CurrentUser.Id && (Constants.RegexConstants.auto_warn_msg_rx.IsMatch(cachedMessage.Content) || Constants.RegexConstants.warn_msg_rx.IsMatch(cachedMessage.Content)))
{
var warnedUserId = Convert.ToUInt64(Constants.RegexConstants.user_rx.Match(cachedMessage.Content).Groups[1].Value);
var userWarnings = await Program.redis.HashGetAllAsync(warnedUserId.ToString());
var thisWarning = userWarnings.Select(x => JsonConvert.DeserializeObject<UserWarning>(x.Value))
.FirstOrDefault(x => x.ContextMessageReference?.MessageId == cachedMessage.Id);

if (thisWarning != default)
{
thisWarning.ContextMessageReference = null;
await Program.redis.HashSetAsync(warnedUserId.ToString(), thisWarning.WarningId, JsonConvert.SerializeObject(thisWarning));
}
}
}

var cachedUsers = dbContext.Users.Where(u => cachedMessages.Select(m => m.User.Id).Contains(u.Id)).ToList();
var (dumpMessage, pasteUrl) = await LogChannelHelper.CreateDumpMessageAsync($"{Program.cfgjson.Emoji.Deleted} {e.Messages.Count} messages were deleted from {e.Channel.Mention}, {cachedMessages.ToList().Count} were logged:", cachedMessages.ToList(), e.Channel);
var logMsg = await LogChannelHelper.LogMessageAsync("messages", dumpMessage);
Expand Down