From 08bb89568dcf8b126e02a3a4ba423424444c777c Mon Sep 17 00:00:00 2001
From: Axel Cocat <ax.cocat@gmail.com>
Date: Sat, 26 Feb 2022 13:41:39 +0100
Subject: [PATCH] feat(character-header): add guild link

---
 src/armory/controllers/CharacterController.ts |  8 ++++++--
 static/css/armory.css                         |  4 ++++
 static/partials/character-header.html         | 13 ++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/armory/controllers/CharacterController.ts b/src/armory/controllers/CharacterController.ts
index 9143d69..4365177 100644
--- a/src/armory/controllers/CharacterController.ts
+++ b/src/armory/controllers/CharacterController.ts
@@ -19,6 +19,7 @@ interface ICharacterData {
 	facialStyle: number;
 	playerFlags: number;
 	online: number;
+	guild: string;
 }
 
 interface IEquipmentData {
@@ -278,6 +279,7 @@ export class CharacterController {
 			class: ClassDisplayName[charData.class],
 			level: charData.level,
 			online: charData.online === 1,
+			guild: charData.guild,
 		};
 	}
 
@@ -286,10 +288,12 @@ export class CharacterController {
 	}
 
 	private async getCharacterData(realm: IRealmConfig, character: string | number): Promise<ICharacterData> {
-		const where = typeof character === "string" ? "LOWER(name) = LOWER(?)" : "guid = ?";
+		const where = typeof character === "string" ? "LOWER(`characters`.`name`) = LOWER(?)" : "`characters`.`guid` = ?";
 		const [rows, fields] = await this.armory.getCharactersDb(realm.name).query(`
-			SELECT \`guid\`, \`name\`, \`race\`, \`class\`, \`gender\`, \`level\`, \`skin\`, \`face\`, \`hairStyle\`, \`hairColor\`, \`facialStyle\`, \`playerFlags\`, \`online\`
+			SELECT \`characters\`.\`guid\`, \`characters\`.\`name\`, \`race\`, \`class\`, \`gender\`, \`level\`, \`skin\`, \`face\`, \`hairStyle\`, \`hairColor\`, \`facialStyle\`, \`playerFlags\`, \`online\`, \`guild\`.\`name\` AS \`guild\`
 			FROM \`characters\`
+			LEFT JOIN \`guild_member\` ON \`guild_member\`.\`guid\` = \`characters\`.\`guid\`
+			LEFT JOIN \`guild\` ON \`guild\`.\`guildid\` = \`guild_member\`.\`guildid\`
 			LEFT JOIN \`${realm.authDatabase}\`.\`account_access\` ON \`account_access\`.\`id\` = \`characters\`.\`account\`
 			WHERE
 				${where}
diff --git a/static/css/armory.css b/static/css/armory.css
index 77ec379..865514b 100644
--- a/static/css/armory.css
+++ b/static/css/armory.css
@@ -2,3 +2,7 @@ html {
 	/* Removes the vertical scrollbar caused by Bulma */
 	overflow-y: auto;
 }
+
+.char-name.title {
+	margin-bottom: 0px;
+}
diff --git a/static/partials/character-header.html b/static/partials/character-header.html
index 07618e4..2c52e69 100644
--- a/static/partials/character-header.html
+++ b/static/partials/character-header.html
@@ -7,17 +7,16 @@
 <br>
 <br>
 
-<div class="char-name">
-	<span class="char-name">{{name}}</span>
-</div>
-<div>
+<div class="char-name title is-size-3">{{name}}</div>
+{{#if guild}}
+<a class="guild-name title is-size-4" href="/guild/{{guild}}">&lt;{{guild}}&gt;</a>
+{{/if}}
+<div class="is-size-5">
 	Level <span class="char-level">{{level}}</span>
 	<span class="char-race">{{race}}</span>
 	<span class="char-class">{{class}}</span>
 </div>
-<div>
-	<span class="char-realm">{{realm}}</span>
-</div>
+<div class="char-realm">{{realm}}</div>
 <div>
 	{{#if online}}
 	Online 🟢