Merge branch 'main' into feature/groups

PluralKit.Bot/Commands/Lists/ContextListExt.cs

@@ -40,7 +40,8 @@ namespace PluralKit.Bot
             if (ctx.MatchFlag("by-last-fronted", "by-last-front", "by-last-switch", "blf", "bls")) p.SortProperty = SortProperty.LastSwitch;
             if (ctx.MatchFlag("by-last-message", "blm", "blp")) p.SortProperty = SortProperty.LastMessage;
             if (ctx.MatchFlag("by-birthday", "by-birthdate", "bbd")) p.SortProperty = SortProperty.Birthdate;
-            
+            if (ctx.MatchFlag("random")) p.SortProperty = SortProperty.Random;
+
             // Sort reverse?
             if (ctx.MatchFlag("r", "rev", "reverse"))
                 p.Reverse = true;
@@ -136,7 +137,7 @@ namespace PluralKit.Bot
                         profile.Append($"\n**Birthdate**: {m.BirthdayString}");
                     
                     if (m.ProxyTags.Count > 0) 
-                        profile.Append($"\n**Proxy tags:** {m.ProxyTagsString()}");
+                        profile.Append($"\n**Proxy tags**: {m.ProxyTagsString()}");
                     
                     if (opts.IncludeMessageCount && m.MessageCountFor(lookupCtx) is {} count && count > 0)
                         profile.Append($"\n**Message count:** {count}");
@@ -161,4 +162,4 @@ namespace PluralKit.Bot
             }
         }
     }
-}
+}

PluralKit.Bot/Commands/Lists/MemberListOptions.cs

@@ -29,7 +29,8 @@ namespace PluralKit.Bot
         public string CreateFilterString()
         {
             var str = new StringBuilder();
-            str.Append("Sorting by ");
+            str.Append("Sorting ");
+            if (SortProperty != SortProperty.Random) str.Append("by ");
             str.Append(SortProperty switch
             {
                 SortProperty.Name => "member name",
@@ -40,6 +41,7 @@ namespace PluralKit.Bot
                 SortProperty.LastSwitch => "last switch",
                 SortProperty.MessageCount => "message count",
                 SortProperty.Birthdate => "birthday",
+                SortProperty.Random => "randomly",
                 _ => new ArgumentOutOfRangeException($"Couldn't find readable string for sort property {SortProperty}")
             });
             
@@ -77,6 +79,8 @@ namespace PluralKit.Bot
             IComparer<T> ReverseMaybe<T>(IComparer<T> c) =>
                 opts.Reverse ? Comparer<T>.Create((a, b) => c.Compare(b, a)) : c;
             
+            var randGen = new global::System.Random();
+
             var culture = StringComparer.InvariantCultureIgnoreCase;
             return (opts.SortProperty switch
             {
@@ -98,6 +102,8 @@ namespace PluralKit.Bot
                 SortProperty.LastSwitch => input
                     .OrderByDescending(m => m.LastSwitchTime.HasValue)
                     .ThenByDescending(m => m.LastSwitchTime, ReverseMaybe(Comparer<Instant?>.Default)),
+                SortProperty.Random => input
+                    .OrderBy(m => randGen.Next()),
                 _ => throw new ArgumentOutOfRangeException($"Unknown sort property {opts.SortProperty}")
             })
                 // Lastly, add a by-name fallback order for collisions (generally hits w/ lots of null values)
@@ -114,7 +120,8 @@ namespace PluralKit.Bot
         CreationDate,
         LastSwitch,
         LastMessage,
-        Birthdate
+        Birthdate,
+        Random
     }
 
     public enum ListType