From 39b3ebe04a46e16610805cac86ac777ec5e81c73 Mon Sep 17 00:00:00 2001 From: Nik <45662151+Nikosmonaut@users.noreply.github.com> Date: Sun, 2 Feb 2020 11:58:32 +0100 Subject: [PATCH] NPC style should apply to tier $800 only (#11797) - Fix wrong level field - Check if tier is 800 everywhere --- website/client/src/components/chat/autoComplete.vue | 6 ++++-- website/client/src/components/userLabel.vue | 5 +++-- website/client/src/components/userLink.vue | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/website/client/src/components/chat/autoComplete.vue b/website/client/src/components/chat/autoComplete.vue index 575e49e99d..b0234bf980 100644 --- a/website/client/src/components/chat/autoComplete.vue +++ b/website/client/src/components/chat/autoComplete.vue @@ -196,14 +196,16 @@ export default { }, showTierStyle (message) { const isContributor = Boolean(message.contributor && message.contributor.level); - const isNPC = Boolean(message.backer && message.backer.npc); + const isNPC = Boolean(message.backer && message.backer.tier === 800); + return isContributor || isNPC; }, tierIcon (message) { - const isNPC = Boolean(message.backer && message.backer.npc); + const isNPC = Boolean(message.backer && message.backer.tier === 800); if (isNPC) { return this.icons.tierNPC; } + return this.icons[`tier${message.contributor.level}`]; }, select (result) { diff --git a/website/client/src/components/userLabel.vue b/website/client/src/components/userLabel.vue index 4dc114c041..3927c84497 100644 --- a/website/client/src/components/userLabel.vue +++ b/website/client/src/components/userLabel.vue @@ -90,10 +90,11 @@ export default { }, isNPC () { if (this.backer) { - return this.backer.level; + return this.backer.tier === 800; } if (this.user && this.user.backer) { - return this.user.backer.level; + return this.user.backer.tier === 800; } + return false; }, }, diff --git a/website/client/src/components/userLink.vue b/website/client/src/components/userLink.vue index 8269f83cb6..258266d11c 100644 --- a/website/client/src/components/userLink.vue +++ b/website/client/src/components/userLink.vue @@ -92,10 +92,11 @@ export default { }, isNPC () { if (this.backer) { - return this.backer.tier; + return this.backer.tier === 800; } if (this.user && this.user.backer) { - return this.user.backer.tier; + return this.user.backer.tier === 800; } + return false; }, id () {