From 2427743d0fc69e67a111ac9d1f3cad1a303e954f Mon Sep 17 00:00:00 2001
From: osiris <eynsan@yahoo.co.uk>
Date: Sat, 21 Dec 2019 22:13:39 +0800
Subject: [PATCH] Fix bug in NPC style display

---
 website/client/src/assets/scss/tiers.scss              |  4 ++--
 .../client/src/components/settings/subscription.vue    | 10 +++++++---
 website/client/src/components/userLink.vue             |  4 ++--
 website/client/src/components/userMenu/inbox.vue       |  2 ++
 website/server/libs/inbox/index.js                     |  2 ++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/website/client/src/assets/scss/tiers.scss b/website/client/src/assets/scss/tiers.scss
index 5c5efdbece..e353b28f44 100644
--- a/website/client/src/assets/scss/tiers.scss
+++ b/website/client/src/assets/scss/tiers.scss
@@ -71,8 +71,8 @@
 }
 
 .tierNPC, .npc {
-  color: #77f4c7;
-  fill: #77f4c7;
+  color: #4E4A57;
+  fill: #4E4A57;
   stroke: #005737;
 
   &:hover, &:active, &:focus {
diff --git a/website/client/src/components/settings/subscription.vue b/website/client/src/components/settings/subscription.vue
index 3560abbeea..dffdbab6dc 100644
--- a/website/client/src/components/settings/subscription.vue
+++ b/website/client/src/components/settings/subscription.vue
@@ -3,15 +3,19 @@
     <div class="banner-g1g1 mx-n3 d-flex justify-content-center">
       <div
         class="svg-icon svg-gifts my-auto mr-5 ml-auto"
-        v-html="icons.giftsVertical">
+        v-html="icons.giftsVertical"
+      >
       </div>
       <div class="my-auto text-center">
         <strong> {{ $t('g1g1Announcement') }} </strong>
-        <div class="mt-1"> {{ $t('g1g1Details') }} </div>
+        <div class="mt-1">
+          {{ $t('g1g1Details') }}
+        </div>
       </div>
       <div
         class="svg-icon svg-gifts gifts-right my-auto ml-5 mr-auto"
-        v-html="icons.giftsVertical">
+        v-html="icons.giftsVertical"
+      >
       </div>
     </div>
     <h1>{{ $t('subscription') }}</h1>
diff --git a/website/client/src/components/userLink.vue b/website/client/src/components/userLink.vue
index 4ba9be6c4b..8269f83cb6 100644
--- a/website/client/src/components/userLink.vue
+++ b/website/client/src/components/userLink.vue
@@ -92,9 +92,9 @@ export default {
     },
     isNPC () {
       if (this.backer) {
-        return this.backer.level;
+        return this.backer.tier;
       } if (this.user && this.user.backer) {
-        return this.user.backer.level;
+        return this.user.backer.tier;
       }
       return false;
     },
diff --git a/website/client/src/components/userMenu/inbox.vue b/website/client/src/components/userMenu/inbox.vue
index 72cceb6e11..8476da3814 100644
--- a/website/client/src/components/userMenu/inbox.vue
+++ b/website/client/src/components/userMenu/inbox.vue
@@ -418,6 +418,7 @@ export default {
           id: '',
           text: '',
           timestamp: new Date(),
+          backer: this.initiatedConversation.backer,
         }];
       }
       // Create conversation objects
@@ -435,6 +436,7 @@ export default {
           lastMessageText: recentMessage.text,
           canLoadMore: true,
           page: 0,
+          backer: recentMessage.backer,
         };
 
         convos.push(convoModel);
diff --git a/website/server/libs/inbox/index.js b/website/server/libs/inbox/index.js
index e6aa8c057e..39ee053337 100644
--- a/website/server/libs/inbox/index.js
+++ b/website/server/libs/inbox/index.js
@@ -125,6 +125,7 @@ export async function listConversations (owner) {
           username: { $last: '$username' },
           timestamp: { $last: '$timestamp' },
           text: { $last: '$text' },
+          npc: { $addToSet: '$backer.npc' },
           count: { $sum: 1 },
         },
       },
@@ -141,6 +142,7 @@ export async function listConversations (owner) {
   const conversations = conversationsList.map(res => ({
     uuid: res._id,
     ...res,
+    backer: Array.isArray(res.npc) && res.npc.length > 0 ? { npc: res.npc[0] } : { npc: null },
     userStyles: usersMap[res._id].userStyles,
     contributor: usersMap[res._id].contributor,
   }));