eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-11 00:07:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: don't pad HIDs in lists only containing old 5 character ones

Browse source
This commit is contained in:
Iodine 2024-10-21 01:45:31 -04:00 • committed by alyssa
parent f5b6afed08
commit 35ce4e8da2
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PluralKit.Bot/Commands/Lists/ContextListExt.cs
View file

@ -127,11 +127,14 @@ public static class ContextListExt
void ShortRenderer(EmbedBuilder eb, IEnumerable<ListedMember> page) void ShortRenderer(EmbedBuilder eb, IEnumerable<ListedMember> page)
{ {
// if there are both 5 and 6 character Hids they should be padded to align correctly.
var shouldPad = page.Any(x => x.Hid.Length > 5);
// We may end up over the description character limit // We may end up over the description character limit
// so run it through a helper that "makes it work" :) // so run it through a helper that "makes it work" :)
eb.WithSimpleLineContent(page.Select(m => eb.WithSimpleLineContent(page.Select(m =>
{ {
var ret = $"[`{m.DisplayHid(ctx.Config, isList: true)}`] **{m.NameFor(ctx)}** "; var ret = $"[`{m.DisplayHid(ctx.Config, isList: true, shouldPad: shouldPad)}`] **{m.NameFor(ctx)}** ";
if (opts.IncludeMessageCount && m.MessageCountFor(lookupCtx) is { } count) if (opts.IncludeMessageCount && m.MessageCountFor(lookupCtx) is { } count)
ret += $"({count} messages)"; ret += $"({count} messages)";
@ -237,11 +240,14 @@ public static class ContextListExt
void ShortRenderer(EmbedBuilder eb, IEnumerable<ListedGroup> page) void ShortRenderer(EmbedBuilder eb, IEnumerable<ListedGroup> page)
{ {
// if there are both 5 and 6 character Hids they should be padded to align correctly.
var shouldPad = page.Any(x => x.Hid.Length > 5);
// We may end up over the description character limit // We may end up over the description character limit
// so run it through a helper that "makes it work" :) // so run it through a helper that "makes it work" :)
eb.WithSimpleLineContent(page.Select(g => eb.WithSimpleLineContent(page.Select(g =>
{ {
var ret = $"[`{g.DisplayHid(ctx.Config, isList: true)}`] **{g.NameFor(ctx)}** "; var ret = $"[`{g.DisplayHid(ctx.Config, isList: true, shouldPad: shouldPad)}`] **{g.NameFor(ctx)}** ";
switch (opts.SortProperty) switch (opts.SortProperty)
{ {

8
PluralKit.Bot/Utils/ModelUtils.cs
View file

@ -29,14 +29,14 @@ public static class ModelUtils
public static string DisplayHid(this PKSystem system, SystemConfig? cfg = null, bool isList = false) => HidTransform(system.Hid, cfg, isList); public static string DisplayHid(this PKSystem system, SystemConfig? cfg = null, bool isList = false) => HidTransform(system.Hid, cfg, isList);
public static string DisplayHid(this PKGroup group, SystemConfig? cfg = null, bool isList = false) => HidTransform(group.Hid, cfg, isList); public static string DisplayHid(this PKGroup group, SystemConfig? cfg = null, bool isList = false, bool shouldPad = true) => HidTransform(group.Hid, cfg, isList, shouldPad);
public static string DisplayHid(this PKMember member, SystemConfig? cfg = null, bool isList = false) => HidTransform(member.Hid, cfg, isList); public static string DisplayHid(this PKMember member, SystemConfig? cfg = null, bool isList = false, bool shouldPad = true) => HidTransform(member.Hid, cfg, isList, shouldPad);
private static string HidTransform(string hid, SystemConfig? cfg = null, bool isList = false) => private static string HidTransform(string hid, SystemConfig? cfg = null, bool isList = false, bool shouldPad = true) =>
HidUtils.HidTransform( HidUtils.HidTransform(
hid, hid,
cfg != null && cfg.HidDisplaySplit, cfg != null && cfg.HidDisplaySplit,
cfg != null && cfg.HidDisplayCaps, cfg != null && cfg.HidDisplayCaps,
isList ? (cfg?.HidListPadding ?? SystemConfig.HidPadFormat.None) : SystemConfig.HidPadFormat.None // padding only on lists isList && shouldPad ? (cfg?.HidListPadding ?? SystemConfig.HidPadFormat.None) : SystemConfig.HidPadFormat.None // padding only on lists
); );
private static string EntityReference(string hid, string name) private static string EntityReference(string hid, string name)