Merge branch 'main' into floatingmilkshake/automod-filtering

# Conflicts: # Events/MessageEvent.cs
Erisa · Aug 17, 2024 · d59d482 · d59d482
2 parents e8fe72e + 44c0cbd
commit d59d482
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Events/HeartbeatEvent.cs b/Events/HeartbeatEvent.cs
@@ -6,7 +6,7 @@ public class HeartbeatEvent
  {
  public static async Task OnHeartbeat(IGatewayClient client)
  {
- Program.discord.Logger.LogDebug("Heartbeat ping: {ping}", client.Ping.TotalMilliseconds);
+ Program.discord.Logger.LogDebug("Heartbeat ping: {ping}", client.Ping.Milliseconds);
  if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("UPTIME_KUMA_PUSH_URL")) && client.IsConnected)
  {
  HttpResponseMessage response;

diff --git a/Events/MessageEvent.cs b/Events/MessageEvent.cs
@@ -132,7 +132,7 @@ public static async Task MessageHandlerAsync(DiscordClient client, MockDiscordMe
  if (message.Timestamp is not null && message.Timestamp.Value.Year < (DateTime.Now.Year - 2))
  return;
 
- if (isAnEdit && message.BaseMessage is not null && (message.BaseMessage.EditedTimestamp is null || message.BaseMessage.EditedTimestamp == message.BaseMessage.CreationTimestamp))
+ if (isAnEdit && message.BaseMessage is not null && (message.BaseMessage.EditedTimestamp is null || message.BaseMessage.EditedTimestamp == message.BaseMessage.CreationTimestamp || message.BaseMessage.EditedTimestamp < DateTimeOffset.Now - TimeSpan.FromDays(1)))
  return;
 
  if (message.Author is null || message.Author.Id == client.CurrentUser.Id)