From 233d0341a2a9fa049a46b1bdf2c8496fc6e36602 Mon Sep 17 00:00:00 2001 From: spiral Date: Wed, 30 Mar 2022 05:06:47 -0400 Subject: [PATCH] fix: don't crash in autoproxy status if targeted member was deleted (again) --- PluralKit.Bot/Commands/Autoproxy.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/PluralKit.Bot/Commands/Autoproxy.cs b/PluralKit.Bot/Commands/Autoproxy.cs index 8a5718f9..a1daaf72 100644 --- a/PluralKit.Bot/Commands/Autoproxy.cs +++ b/PluralKit.Bot/Commands/Autoproxy.cs @@ -97,8 +97,6 @@ public class Autoproxy _ => null }; - Console.WriteLine(settings.AutoproxyMode); - switch (settings.AutoproxyMode) { case AutoproxyMode.Off: @@ -119,10 +117,15 @@ public class Autoproxy break; } - // AutoproxyMember is never null if Mode is Member, this is just to make the compiler shut up - case AutoproxyMode.Member when relevantMember != null: + case AutoproxyMode.Member: { - eb.Description($"Autoproxy is active for member **{relevantMember.NameFor(ctx)}** (`{relevantMember.Hid}`) in this server. To disable, type `pk;autoproxy off`."); + if (relevantMember == null) + // just pretend autoproxy is off if the member was deleted + // ideally we would set it to off in the database though... + eb.Description($"Autoproxy is currently **off** in this server. To enable it, use one of the following commands:\n{commandList}"); + else + eb.Description($"Autoproxy is active for member **{relevantMember.NameFor(ctx)}** (`{relevantMember.Hid}`) in this server. To disable, type `pk;autoproxy off`."); + break; } case AutoproxyMode.Latch: