From 5d8c16e480ecfe23bc1dfce96b51153f33efac20 Mon Sep 17 00:00:00 2001
From: spiral <spiral@spiral.sh>
Date: Wed, 14 Jul 2021 19:50:10 -0400
Subject: [PATCH] clean up compiler warnings

---
 PluralKit.Bot/Tracing/DiscordRequestObserver.cs      | 6 ++----
 PluralKit.Bot/Utils/SerilogGatewayEnricherFactory.cs | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PluralKit.Bot/Tracing/DiscordRequestObserver.cs b/PluralKit.Bot/Tracing/DiscordRequestObserver.cs
index a832c04d..7a50156b 100644
--- a/PluralKit.Bot/Tracing/DiscordRequestObserver.cs
+++ b/PluralKit.Bot/Tracing/DiscordRequestObserver.cs
@@ -74,7 +74,7 @@ namespace PluralKit.Bot
                 .Error(exc, "HTTP error: {RequestMethod} {RequestUrl}", req.Method, req.RequestUri);
         }
 
-        private async Task HandleResponse(HttpResponseMessage response, Activity activity)
+        private void HandleResponse(HttpResponseMessage response, Activity activity)
         {
             var endpoint = GetEndpointName(response.RequestMessage);
 
@@ -134,9 +134,7 @@ namespace PluralKit.Bot
                 {
                     var data = Unsafe.As<ActivityStopData>(value.Value);
                     if (data.Response != null)
-                    {
-                        var _ = HandleResponse(data.Response, Activity.Current);
-                    }
+                        HandleResponse(data.Response, Activity.Current);
 
                     break;
                 }
diff --git a/PluralKit.Bot/Utils/SerilogGatewayEnricherFactory.cs b/PluralKit.Bot/Utils/SerilogGatewayEnricherFactory.cs
index 81597d54..79577d3a 100644
--- a/PluralKit.Bot/Utils/SerilogGatewayEnricherFactory.cs
+++ b/PluralKit.Bot/Utils/SerilogGatewayEnricherFactory.cs
@@ -77,7 +77,8 @@ namespace PluralKit.Bot
             MessageUpdateEvent e => e.Author.HasValue ? e.Author.Value.Id : null,
             MessageReactionAddEvent e => e.UserId,
             MessageReactionRemoveEvent e => e.UserId,
-            InteractionCreateEvent e => e.Member?.User?.Id // todo: these nullable?
+            InteractionCreateEvent e => e.Member.User.Id,
+            _ => null,
         };
 
         private ulong? GetMessageId(IGatewayEvent evt) => evt switch
@@ -90,6 +91,7 @@ namespace PluralKit.Bot
             MessageReactionRemoveAllEvent e => e.MessageId,
             MessageReactionRemoveEmojiEvent e => e.MessageId,
             InteractionCreateEvent e => e.Message?.Id,
+            _ => null,
         };
 
         private record Inner(List<LogEventProperty> Properties): ILogEventEnricher