From 950340a04dfa12e9fad55ffadbc0c62380c92d44 Mon Sep 17 00:00:00 2001
From: Alicia <contact@ilyt.cc>
Date: Sun, 24 Feb 2019 14:37:51 +0000
Subject: [PATCH] add clan info to api

---
 app/v1/clan.go |  9 ---------
 app/v1/user.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/app/v1/clan.go b/app/v1/clan.go
index b8818e0..3d26a4c 100644
--- a/app/v1/clan.go
+++ b/app/v1/clan.go
@@ -233,9 +233,6 @@ func TotalClanStatsGET(md common.MethodData) common.CodeMessager {
 	}
 	//RETARD CODE HAHAAAA
 	m, brr := strconv.ParseInt(string(md.Query("m")[11]), 10, 64)
-	if brr != nil {
-		fmt.Println(brr)
-	}
 
 	n := "std"
 	if m == 1 {
@@ -247,8 +244,6 @@ func TotalClanStatsGET(md common.MethodData) common.CodeMessager {
 	} else {
 		n = "std"
 	}
-	fmt.Println(n)
-	
 	
 	for i := 0; i < len(r.Clans); i++ {
 		var members clanMembersData
@@ -271,10 +266,6 @@ func TotalClanStatsGET(md common.MethodData) common.CodeMessager {
 		WHERE clan = ? AND privileges & 1 = 1
 		`, rid)
 
-		if err != nil {
-			fmt.Println(err)
-		}
-
 		members.Code = 200
 		
 		if n == "std" {
diff --git a/app/v1/user.go b/app/v1/user.go
index 7cc610c..3d27fd8 100644
--- a/app/v1/user.go
+++ b/app/v1/user.go
@@ -234,6 +234,7 @@ type userFullResponse struct {
 	PlayStyle     int                   `json:"play_style"`
 	FavouriteMode int                   `json:"favourite_mode"`
 	Badges        []singleBadge         `json:"badges"`
+	Clan          singleClan            `json:"clan"`
 	CustomBadge   *singleBadge          `json:"custom_badge"`
 	SilenceInfo   silenceInfo           `json:"silence_info"`
 	CMNotes       *string               `json:"cm_notes,omitempty"`
@@ -367,6 +368,22 @@ LIMIT 1
 		r.BanDate = nil
 		r.Email = ""
 	}
+	rows, err = md.DB.Query("SELECT c.id, c.name, c.description, c.tag, c.icon FROM user_clans uc "+
+		"LEFT JOIN clans c ON uc.clan = c.id WHERE user = ?", r.ID)
+	if err != nil {
+		md.Err(err)
+	}
+
+	for rows.Next() {
+		var clan singleClan
+		err = rows.Scan(&clan.ID, &clan.Name, &clan.Description, &clan.Tag, &clan.Icon)
+		if err != nil {
+			md.Err(err)
+			continue
+		}
+		r.Clan = clan
+	}
+
 
 	r.Code = 200
 	return r
@@ -491,6 +508,21 @@ LIMIT 1
 		r.BanDate = nil
 		r.Email = ""
 	}
+	rows, err = md.DB.Query("SELECT c.id, c.name, c.description, c.tag, c.icon FROM user_clans uc "+
+	"LEFT JOIN clans c ON uc.clan = c.id WHERE user = ?", r.ID)
+if err != nil {
+	md.Err(err)
+}
+
+for rows.Next() {
+	var clan singleClan
+	err = rows.Scan(&clan.ID, &clan.Name, &clan.Description, &clan.Tag, &clan.Icon)
+	if err != nil {
+		md.Err(err)
+		continue
+	}
+	r.Clan = clan
+}
 
 	r.Code = 200
 	return r
@@ -615,6 +647,21 @@ LIMIT 1
 		r.BanDate = nil
 		r.Email = ""
 	}
+	rows, err = md.DB.Query("SELECT c.id, c.name, c.description, c.tag, c.icon FROM user_clans uc "+
+	"LEFT JOIN clans c ON uc.clan = c.id WHERE user = ?", r.ID)
+if err != nil {
+	md.Err(err)
+}
+
+for rows.Next() {
+	var clan singleClan
+	err = rows.Scan(&clan.ID, &clan.Name, &clan.Description, &clan.Tag, &clan.Icon)
+	if err != nil {
+		md.Err(err)
+		continue
+	}
+	r.Clan = clan
+}
 
 	r.Code = 200
 	return r