From 2639989183dbcd61ae7b8992ac125f7510b7ef9c Mon Sep 17 00:00:00 2001
From: spiral <spiral@spiral.sh>
Date: Fri, 14 Jan 2022 23:16:10 -0500
Subject: [PATCH] fix git merge from #412

---
 .../Commands/Lists/ContextListExt.cs          |  2 +-
 PluralKit.Bot/Commands/Lists/ListOptions.cs   | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/PluralKit.Bot/Commands/Lists/ContextListExt.cs b/PluralKit.Bot/Commands/Lists/ContextListExt.cs
index 666805a7..a7ad6c78 100644
--- a/PluralKit.Bot/Commands/Lists/ContextListExt.cs
+++ b/PluralKit.Bot/Commands/Lists/ContextListExt.cs
@@ -372,7 +372,7 @@ public static class ContextListExt
                     profile.Append($"\n\n{desc}");
 
                 if (g.Visibility == PrivacyLevel.Private)
-                    profile.Append("\n*(this member is hidden)*");
+                    profile.Append("\n*(this group is hidden)*");
 
                 eb.Field(new Embed.Field(g.NameFor(ctx), profile.ToString().Truncate(1024)));
             }
diff --git a/PluralKit.Bot/Commands/Lists/ListOptions.cs b/PluralKit.Bot/Commands/Lists/ListOptions.cs
index 7c64e556..051344a0 100644
--- a/PluralKit.Bot/Commands/Lists/ListOptions.cs
+++ b/PluralKit.Bot/Commands/Lists/ListOptions.cs
@@ -89,23 +89,26 @@ public static class ListOptionsExt
             // We want nulls last no matter what, even if orders are reversed
             SortProperty.Hid => input.OrderBy(m => m.Hid, ReverseMaybe(culture)),
             SortProperty.Name => input.OrderBy(m => m.NameFor(ctx), ReverseMaybe(culture)),
-            SortProperty.CreationDate => input.OrderBy(m => m.Created, ReverseMaybe(Comparer<Instant>.Default)),
-            SortProperty.MessageCount => input.OrderByDescending(m => m.MessageCount,
-                ReverseMaybe(Comparer<int>.Default)),
+            SortProperty.CreationDate => input
+                .OrderByDescending(m => m.MetadataPrivacy.CanAccess(ctx))
+                .ThenBy(m => m.MetadataPrivacy.Get(ctx, m.Created, default), ReverseMaybe(Comparer<Instant>.Default)),
+            SortProperty.MessageCount => input
+                .OrderByDescending(m => m.MessageCount != 0 && m.MetadataPrivacy.CanAccess(ctx))
+                .ThenByDescending(m => m.MetadataPrivacy.Get(ctx, m.MessageCount, 0), ReverseMaybe(Comparer<int>.Default)),
             SortProperty.DisplayName => input
-                .OrderByDescending(m => m.DisplayName != null)
-                .ThenBy(m => m.DisplayName, ReverseMaybe(culture)),
+                .OrderByDescending(m => m.DisplayName != null && m.NamePrivacy.CanAccess(ctx))
+                .ThenBy(m => m.NamePrivacy.Get(ctx, m.DisplayName), ReverseMaybe(culture)),
             SortProperty.Birthdate => input
-                .OrderByDescending(m => m.AnnualBirthday.HasValue)
-                .ThenBy(m => m.AnnualBirthday, ReverseMaybe(Comparer<AnnualDate?>.Default)),
+                .OrderByDescending(m => m.AnnualBirthday.HasValue && m.BirthdayPrivacy.CanAccess(ctx))
+                .ThenBy(m => m.BirthdayPrivacy.Get(ctx, m.AnnualBirthday), ReverseMaybe(Comparer<AnnualDate?>.Default)),
             SortProperty.LastMessage => throw new PKError(
                 "Sorting by last message is temporarily disabled due to database issues, sorry."),
             // SortProperty.LastMessage => input
             //     .OrderByDescending(m => m.LastMessage.HasValue)
             //     .ThenByDescending(m => m.LastMessage, ReverseMaybe(Comparer<ulong?>.Default)),
             SortProperty.LastSwitch => input
-                .OrderByDescending(m => m.LastSwitchTime.HasValue)
-                .ThenByDescending(m => m.LastSwitchTime, ReverseMaybe(Comparer<Instant?>.Default)),
+                .OrderByDescending(m => m.LastSwitchTime.HasValue && m.MetadataPrivacy.CanAccess(ctx))
+                .ThenByDescending(m => m.MetadataPrivacy.Get(ctx, m.LastSwitchTime), ReverseMaybe(Comparer<Instant?>.Default)),
             SortProperty.Random => input
                 .OrderBy(m => randGen.Next()),
             _ => throw new ArgumentOutOfRangeException($"Unknown sort property {opts.SortProperty}")
@@ -129,16 +132,18 @@ public static class ListOptionsExt
             // We want nulls last no matter what, even if orders are reversed
             SortProperty.Hid => input.OrderBy(g => g.Hid, ReverseMaybe(culture)),
             SortProperty.Name => input.OrderBy(g => g.NameFor(ctx), ReverseMaybe(culture)),
-            SortProperty.CreationDate => input.OrderBy(g => g.Created, ReverseMaybe(Comparer<Instant>.Default)),
+            SortProperty.CreationDate => input
+                .OrderByDescending(g => g.MetadataPrivacy.CanAccess(ctx))
+                .ThenBy(g => g.MetadataPrivacy.Get(ctx, g.Created, default), ReverseMaybe(Comparer<Instant>.Default)),
             SortProperty.DisplayName => input
-                .OrderByDescending(g => g.DisplayName != null)
-                .ThenBy(g => g.DisplayName, ReverseMaybe(culture)),
+                .OrderByDescending(g => g.DisplayName != null && g.NamePrivacy.CanAccess(ctx))
+                .ThenBy(g => g.NamePrivacy.Get(ctx, g.DisplayName), ReverseMaybe(culture)),
             SortProperty.Random => input
                 .OrderBy(g => 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)
-                .ThenBy(m => m.NameFor(ctx), culture);
+                .ThenBy(g => g.NameFor(ctx), culture);
     }
 }