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

Move system tag/icon from ProxyMember to MessageContent

Browse Source
This commit is contained in:
Ske
2020-06-12 23:30:10 +02:00
parent 2a39489c4d
commit 729930a562
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PluralKit.Core/Database/Functions/ProxyMember.cs
View File

@@ -15,16 +15,14 @@ namespace PluralKit.Core
public string? ServerName { get; set; }
public string? DisplayName { get; set; }
public string Name { get; set; } = "";
public string? SystemTag { get; set; }
public string? ServerAvatar { get; set; }
public string? Avatar { get; set; }
public string? SystemIcon { get; set; }
public string ProxyName => SystemTag != null
? $"{ServerName ?? DisplayName ?? Name} {SystemTag}"
public string ProxyName(MessageContext ctx) => ctx.SystemTag != null
? $"{ServerName ?? DisplayName ?? Name} {ctx.SystemTag}"
: ServerName ?? DisplayName ?? Name;
public string? ProxyAvatar => ServerAvatar ?? Avatar ?? SystemIcon;
public string? ProxyAvatar(MessageContext ctx) => ServerAvatar ?? Avatar ?? ctx.SystemAvatar;
}
}