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

bot: only show proxy tags in list when present

Browse Source
This commit is contained in:
Ske 2019-04-29 19:52:07 +02:00
parent c359935855
commit 6be9a6a89a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PluralKit/Bot/Commands/SystemCommands.cs
View File

@ -106,7 +106,10 @@ namespace PluralKit.Bot.Commands
members.OrderBy(m => m.Name).ToList(), members.OrderBy(m => m.Name).ToList(),
25, 25,
embedTitle, embedTitle,
(eb, ms) => eb.Description = string.Join("\n", ms.Select((m) => $"[`{m.Hid}`] **{m.Name}** *({m.Prefix ?? ""}text{m.Suffix ?? ""})*")) (eb, ms) => eb.Description = string.Join("\n", ms.Select((m) => {
if (m.HasProxyTags) return $"[`{m.Hid}`] **{m.Name}** *({m.ProxyString})*";
return $"[`{m.Hid}`] **{m.Name}**";
}))
); );
} }
@ -124,12 +127,13 @@ namespace PluralKit.Bot.Commands
10, 10,
embedTitle, embedTitle,
(eb, ms) => { (eb, ms) => {
foreach (var member in ms) { foreach (var m in ms) {
var profile = $"**ID**: {member.Hid}"; var profile = $"**ID**: {m.Hid}";
if (member.Pronouns != null) profile += $"\n**Pronouns**: {member.Pronouns}"; if (m.Pronouns != null) profile += $"\n**Pronouns**: {m.Pronouns}";
if (member.Birthday != null) profile += $"\n**Birthdate**: {member.BirthdayString}"; if (m.Birthday != null) profile += $"\n**Birthdate**: {m.BirthdayString}";
if (member.Description != null) profile += $"\n\n{member.Description}"; if (m.Prefix != null || m.Suffix != null) profile += $"\n**Proxy tags**: {m.ProxyString}";
eb.AddField(member.Name, profile); if (m.Description != null) profile += $"\n\n{m.Description}";
eb.AddField(m.Name, profile);
} }
} }
); );

3
PluralKit/Models.cs
View File

@ -46,5 +46,8 @@ namespace PluralKit
return Birthday?.ToString("MMMM dd, yyyy"); return Birthday?.ToString("MMMM dd, yyyy");
} }
} }
public bool HasProxyTags => Prefix != null || Suffix != null;
public string ProxyString => $"{Prefix ?? ""}text{Suffix ?? ""}";
} }
} }