liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix git merge from #412

Browse Source
This commit is contained in:
spiral 2022-01-14 23:16:10 -05:00
parent f3869dbcbe
commit 2639989183
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PluralKit.Bot/Commands/Lists/ContextListExt.cs
View File

@ -372,7 +372,7 @@ public static class ContextListExt
profile.Append($"\n\n{desc}"); profile.Append($"\n\n{desc}");
if (g.Visibility == PrivacyLevel.Private) 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))); eb.Field(new Embed.Field(g.NameFor(ctx), profile.ToString().Truncate(1024)));
} }

31
PluralKit.Bot/Commands/Lists/ListOptions.cs
View File

@ -89,23 +89,26 @@ public static class ListOptionsExt
// We want nulls last no matter what, even if orders are reversed // We want nulls last no matter what, even if orders are reversed
SortProperty.Hid => input.OrderBy(m => m.Hid, ReverseMaybe(culture)), SortProperty.Hid => input.OrderBy(m => m.Hid, ReverseMaybe(culture)),
SortProperty.Name => input.OrderBy(m => m.NameFor(ctx), ReverseMaybe(culture)), SortProperty.Name => input.OrderBy(m => m.NameFor(ctx), ReverseMaybe(culture)),
SortProperty.CreationDate => input.OrderBy(m => m.Created, ReverseMaybe(Comparer<Instant>.Default)), SortProperty.CreationDate => input
SortProperty.MessageCount => input.OrderByDescending(m => m.MessageCount, .OrderByDescending(m => m.MetadataPrivacy.CanAccess(ctx))
ReverseMaybe(Comparer<int>.Default)), .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 SortProperty.DisplayName => input
.OrderByDescending(m => m.DisplayName != null) .OrderByDescending(m => m.DisplayName != null && m.NamePrivacy.CanAccess(ctx))
.ThenBy(m => m.DisplayName, ReverseMaybe(culture)), .ThenBy(m => m.NamePrivacy.Get(ctx, m.DisplayName), ReverseMaybe(culture)),
SortProperty.Birthdate => input SortProperty.Birthdate => input
.OrderByDescending(m => m.AnnualBirthday.HasValue) .OrderByDescending(m => m.AnnualBirthday.HasValue && m.BirthdayPrivacy.CanAccess(ctx))
.ThenBy(m => m.AnnualBirthday, ReverseMaybe(Comparer<AnnualDate?>.Default)), .ThenBy(m => m.BirthdayPrivacy.Get(ctx, m.AnnualBirthday), ReverseMaybe(Comparer<AnnualDate?>.Default)),
SortProperty.LastMessage => throw new PKError( SortProperty.LastMessage => throw new PKError(
"Sorting by last message is temporarily disabled due to database issues, sorry."), "Sorting by last message is temporarily disabled due to database issues, sorry."),
// SortProperty.LastMessage => input // SortProperty.LastMessage => input
// .OrderByDescending(m => m.LastMessage.HasValue) // .OrderByDescending(m => m.LastMessage.HasValue)
// .ThenByDescending(m => m.LastMessage, ReverseMaybe(Comparer<ulong?>.Default)), // .ThenByDescending(m => m.LastMessage, ReverseMaybe(Comparer<ulong?>.Default)),
SortProperty.LastSwitch => input SortProperty.LastSwitch => input
.OrderByDescending(m => m.LastSwitchTime.HasValue) .OrderByDescending(m => m.LastSwitchTime.HasValue && m.MetadataPrivacy.CanAccess(ctx))
.ThenByDescending(m => m.LastSwitchTime, ReverseMaybe(Comparer<Instant?>.Default)), .ThenByDescending(m => m.MetadataPrivacy.Get(ctx, m.LastSwitchTime), ReverseMaybe(Comparer<Instant?>.Default)),
SortProperty.Random => input SortProperty.Random => input
.OrderBy(m => randGen.Next()), .OrderBy(m => randGen.Next()),
_ => throw new ArgumentOutOfRangeException($"Unknown sort property {opts.SortProperty}") _ => 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 // We want nulls last no matter what, even if orders are reversed
SortProperty.Hid => input.OrderBy(g => g.Hid, ReverseMaybe(culture)), SortProperty.Hid => input.OrderBy(g => g.Hid, ReverseMaybe(culture)),
SortProperty.Name => input.OrderBy(g => g.NameFor(ctx), 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 SortProperty.DisplayName => input
.OrderByDescending(g => g.DisplayName != null) .OrderByDescending(g => g.DisplayName != null && g.NamePrivacy.CanAccess(ctx))
.ThenBy(g => g.DisplayName, ReverseMaybe(culture)), .ThenBy(g => g.NamePrivacy.Get(ctx, g.DisplayName), ReverseMaybe(culture)),
SortProperty.Random => input SortProperty.Random => input
.OrderBy(g => randGen.Next()), .OrderBy(g => randGen.Next()),
_ => throw new ArgumentOutOfRangeException($"Unknown sort property {opts.SortProperty}") _ => throw new ArgumentOutOfRangeException($"Unknown sort property {opts.SortProperty}")
}) })
// Lastly, add a by-name fallback order for collisions (generally hits w/ lots of null values) // 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);
} }
} }