Handle internal server error in the AuditOverwritesChangedHandler

GrillBot · Jan 15, 2024 · 473dfd8 · 473dfd8
1 parent 88979ce
commit 473dfd8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/GrillBot.App/Actions/Commands/CleanChannelMessages.cs b/src/GrillBot.App/Actions/Commands/CleanChannelMessages.cs
@@ -84,8 +84,5 @@ private async Task DeleteMessageAsync(IMessage message)
     }
 
     private static bool IsExpectedApiError(HttpException ex)
-    {
-        return ex.HttpCode == HttpStatusCode.InternalServerError || ex.HttpCode == HttpStatusCode.ServiceUnavailable || ex.DiscordCode == DiscordErrorCode.UnknownChannel ||
-               ex.DiscordCode == DiscordErrorCode.UnknownMessage;
-    }
+        => ex.IsExpectedOutageError() || ex.DiscordCode == DiscordErrorCode.UnknownChannel || ex.DiscordCode == DiscordErrorCode.UnknownMessage;
 }
diff --git a/src/GrillBot.App/Handlers/ChannelUpdated/AuditOverwritesChangedHandler.cs b/src/GrillBot.App/Handlers/ChannelUpdated/AuditOverwritesChangedHandler.cs
@@ -3,9 +3,10 @@
 using GrillBot.Common.Managers.Events.Contracts;
 using GrillBot.Core.Services.AuditLog;
 using GrillBot.Core.Services.AuditLog.Enums;
-using GrillBot.Core.Services.AuditLog.Models;
 using GrillBot.Core.Services.AuditLog.Models.Request.CreateItems;
 using GrillBot.Core.Managers.Performance;
+using Discord.Net;
+using GrillBot.Common.Extensions.Discord;
 
 namespace GrillBot.App.Handlers.ChannelUpdated;
 
@@ -52,7 +53,14 @@ private async Task<List<IAuditLogEntry>> GetAuditLogsAsync(IGuildChannel channel
         IReadOnlyCollection<IAuditLogEntry> auditLogs;
         using (CounterManager.Create("Discord.API.AuditLog"))
         {
-            auditLogs = await channel.Guild.GetAuditLogsAsync(actionType: actionType);
+            try
+            {
+                auditLogs = await channel.Guild.GetAuditLogsAsync(actionType: actionType);
+            }
+            catch (HttpException ex) when (ex.IsExpectedOutageError())
+            {
+                auditLogs = new List<IAuditLogEntry>().AsReadOnly();
+            }
         }
 
         return auditLogs

diff --git a/src/GrillBot.Cache/Services/Managers/MessageCache/MessageCacheManager.cs b/src/GrillBot.Cache/Services/Managers/MessageCache/MessageCacheManager.cs
@@ -211,10 +211,7 @@ private async Task<List<IMessage>> DownloadMessagesFromChannelAsync(IMessageChan
     /// Expected is InternalServerError, ServiceUnavailable, UnknownChannel and UnknownMessage. 
     /// </summary>
     private static bool IsApiExpectedError(HttpException ex)
-    {
-        return ex.HttpCode == HttpStatusCode.InternalServerError || ex.HttpCode == HttpStatusCode.ServiceUnavailable || ex.DiscordCode == DiscordErrorCode.UnknownChannel ||
-               ex.DiscordCode == DiscordErrorCode.UnknownMessage;
-    }
+        => ex.IsExpectedOutageError() || ex.DiscordCode == DiscordErrorCode.UnknownChannel || ex.DiscordCode == DiscordErrorCode.UnknownMessage;
 
     private async Task ProcessDownloadedMessages(List<IMessage> messages, bool forceDelete)
     {

diff --git a/src/GrillBot.Common/Extensions/Discord/HttpExceptionExtensions.cs b/src/GrillBot.Common/Extensions/Discord/HttpExceptionExtensions.cs
@@ -0,0 +1,10 @@
+using Discord.Net;
+using System.Net;
+
+namespace GrillBot.Common.Extensions.Discord;
+
+public static class HttpExceptionExtensions
+{
+    public static bool IsExpectedOutageError(this HttpException ex)
+        => ex.HttpCode == HttpStatusCode.InternalServerError || ex.HttpCode == HttpStatusCode.ServiceUnavailable;
+}