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

Handle malformed proxy tag importing correctly

Browse source
This commit is contained in:
Ske 2020-02-03 15:05:05 +01:00
parent 026932049a
commit 7bdc3020b0
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PluralKit.Core/DataFiles.cs
View file

@ -162,7 +162,8 @@ namespace PluralKit.Bot
} }
else else
{ {
member.ProxyTags = dataMember.ProxyTags ?? new ProxyTag[] { }; // Ignore proxy tags where both prefix and suffix are set to null (would be invalid anyway)
member.ProxyTags = (dataMember.ProxyTags ?? new ProxyTag[] { }).Where(tag => !tag.IsEmpty).ToList();
} }
member.KeepProxy = dataMember.KeepProxy; member.KeepProxy = dataMember.KeepProxy;

2
PluralKit.Core/Models.cs
View file

@ -51,6 +51,8 @@ namespace PluralKit
[JsonIgnore] public string ProxyString => $"{Prefix ?? ""}text{Suffix ?? ""}"; [JsonIgnore] public string ProxyString => $"{Prefix ?? ""}text{Suffix ?? ""}";
public bool IsEmpty => Prefix == null && Suffix == null;
public bool Equals(ProxyTag other) => Prefix == other.Prefix && Suffix == other.Suffix; public bool Equals(ProxyTag other) => Prefix == other.Prefix && Suffix == other.Suffix;
public override bool Equals(object obj) => obj is ProxyTag other && Equals(other); public override bool Equals(object obj) => obj is ProxyTag other && Equals(other);