From 714fa0585f8c1d85c0b361989bbd2cb991a20e31 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Thu, 8 Dec 2022 22:35:51 +0200
Subject: [PATCH] BuildCard: Show Plus Status when showing user

---
 app/components/BuildCard.tsx              | 18 ++++++++++++++++--
 app/db/models/builds/buildsByWeaponId.sql |  1 +
 app/db/models/builds/queries.server.ts    |  7 +++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/components/BuildCard.tsx b/app/components/BuildCard.tsx
index e73559334..d5bcf4b2a 100644
--- a/app/components/BuildCard.tsx
+++ b/app/components/BuildCard.tsx
@@ -1,7 +1,12 @@
 import clsx from "clsx";
 import { useTranslation } from "~/hooks/useTranslation";
 import { Link } from "react-router-dom";
-import type { Build, BuildWeapon, GearType, User } from "~/db/types";
+import type {
+  Build,
+  BuildWeapon,
+  GearType,
+  UserWithPlusTier,
+} from "~/db/types";
 import { useIsMounted } from "~/hooks/useIsMounted";
 import { useUser } from "~/modules/auth";
 import type {
@@ -48,7 +53,10 @@ interface BuildProps {
     modes: ModeShort[] | null;
     weapons: Array<BuildWeapon["weaponSplId"]>;
   };
-  owner?: Pick<User, "discordId" | "discordDiscriminator" | "discordName">;
+  owner?: Pick<
+    UserWithPlusTier,
+    "discordId" | "discordName" | "discordDiscriminator" | "plusTier"
+  >;
   canEdit?: boolean;
 }
 
@@ -98,6 +106,12 @@ export function BuildCard({ build, owner, canEdit = false }: BuildProps) {
               <div>•</div>
             </>
           )}
+          {owner?.plusTier ? (
+            <>
+              <span>+{owner.plusTier}</span>
+              <div>•</div>
+            </>
+          ) : null}
           <time className={clsx({ invisible: !isMounted })}>
             {isMounted
               ? databaseTimestampToDate(updatedAt).toLocaleDateString(
diff --git a/app/db/models/builds/buildsByWeaponId.sql b/app/db/models/builds/buildsByWeaponId.sql
index 3dac56287..7435bc5c4 100644
--- a/app/db/models/builds/buildsByWeaponId.sql
+++ b/app/db/models/builds/buildsByWeaponId.sql
@@ -33,6 +33,7 @@ select
   "User"."discordId",
   "User"."discordName",
   "User"."discordDiscriminator",
+  "PlusTier"."tier" as "plusTier",
   json_group_array(
     json_object(
       'ability',
diff --git a/app/db/models/builds/queries.server.ts b/app/db/models/builds/queries.server.ts
index 78d639388..de7185d83 100644
--- a/app/db/models/builds/queries.server.ts
+++ b/app/db/models/builds/queries.server.ts
@@ -4,7 +4,7 @@ import type {
   BuildAbility,
   BuildWeapon,
   GearType,
-  User,
+  UserWithPlusTier,
 } from "~/db/types";
 import { type ModeShort, weaponIdToAltId } from "~/modules/in-game-lists";
 import { modesShort } from "~/modules/in-game-lists";
@@ -109,7 +109,10 @@ export function buildsByUserId(userId: Build["ownerId"]) {
 }
 
 type BuildsByWeaponIdRow = BuildsByUserRow &
-  Pick<User, "discordId" | "discordName" | "discordDiscriminator">;
+  Pick<
+    UserWithPlusTier,
+    "discordId" | "discordName" | "discordDiscriminator" | "plusTier"
+  >;
 
 export function buildsByWeaponId({
   weaponId,