Add ability to search by UUID

Author: Rushmead

cache.go

@@ -18,12 +18,13 @@ func SetupRedis(){
 	})
 }
 
-func StoreData(ctx context.Context, username string, response string) error {
+func StoreData(ctx context.Context, username string, uuid string, response string) error {
 	client.Set(ctx, fmt.Sprintf("player:%s", username), response, time.Hour * 24)
+	client.Set(ctx, fmt.Sprintf("uuid:%s", uuid), response, time.Hour * 24)
 	return nil
 }
 
-func HasData(ctx context.Context, username string) (bool, error) {
+func HasDataFromUsername(ctx context.Context, username string) (bool, error) {
 	value, err := client.Exists(ctx, fmt.Sprintf("player:%s", username)).Result()
 	if err == redis.Nil {
 		return false, nil
@@ -36,7 +37,20 @@ func HasData(ctx context.Context, username string) (bool, error) {
 	return true, nil
 }
 
-func GetData(ctx context.Context, username string) (*string, error) {
+func HasDataFromUUID(ctx context.Context, uuid string) (bool, error) {
+	value, err := client.Exists(ctx, fmt.Sprintf("uuid:%s", uuid)).Result()
+	if err == redis.Nil {
+		return false, nil
+	} else if err != nil {
+		return false, nil
+	}
+	if value == 0 {
+		return false, nil
+	}
+	return true, nil
+}
+
+func GetDataFromUsername(ctx context.Context, username string) (*string, error) {
 	value, err := client.Get(ctx, fmt.Sprintf("player:%s", username)).Result()
 	if err == redis.Nil {
 		return nil, fmt.Errorf("does not exist")
@@ -45,3 +59,13 @@ func GetData(ctx context.Context, username string) (*string, error) {
 	}
 	return &value, nil
 }
+
+func GetDataFromUUID(ctx context.Context, uuid string) (*string, error) {
+	value, err := client.Get(ctx, fmt.Sprintf("uuid:%s", uuid)).Result()
+	if err == redis.Nil {
+		return nil, fmt.Errorf("does not exist")
+	} else if err != nil {
+		return nil, err
+	}
+	return &value, nil
+}

main.go

@@ -5,14 +5,17 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/google/uuid"
+	uuid2 "github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"github.com/joho/godotenv"
 	"image/png"
 	"mymcuu.id/api/mojang"
 	"net/http"
+	"os"
 )
 
+var CORS = "https://mymcuu.id"
+
 type JsonError struct {
 	Error string `json:"error"`
 }
@@ -23,7 +26,7 @@ type UUIDResponse struct {
 	Avatar string `json:"avatar"`
 }
 func setupResponse(w *http.ResponseWriter, req *http.Request) {
-	(*w).Header().Set("Access-Control-Allow-Origin", "https://mymcuu.id")
+	(*w).Header().Set("Access-Control-Allow-Origin", CORS)
 	(*w).Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS")
 	(*w).Header().Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization")
 }
@@ -41,8 +44,8 @@ func GetUUIDFromUsername(w http.ResponseWriter, r *http.Request) {
 	}
 	vars := mux.Vars(r)
 	username := vars["username"]
-	if ok, _ := HasData(r.Context(), username); ok {
-		resp, err := GetData(r.Context(), username)
+	if ok, _ := HasDataFromUsername(r.Context(), username); ok {
+		resp, err := GetDataFromUsername(r.Context(), username)
 		if err != nil {
 			fmt.Fprintf(w, ErrorJson(err.Error()))
 			return
@@ -62,7 +65,7 @@ func GetUUIDFromUsername(w http.ResponseWriter, r *http.Request) {
 	headImage, err := mojang.GetHeadFromUUID(resp.UUID)
 	buf := new(bytes.Buffer)
 	png.Encode(buf, *headImage)
-	withDashes, err := uuid.Parse(resp.UUID)
+	withDashes, err := uuid2.Parse(resp.UUID)
 	if err != nil {
 		fmt.Fprintf(w, ErrorJson(err.Error()))
 		return
@@ -77,7 +80,7 @@ func GetUUIDFromUsername(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	jsonResponse := string(bytes)
-	err = StoreData(r.Context(), username, jsonResponse)
+	err = StoreData(r.Context(), username, withDashes.String(), jsonResponse)
 	if err != nil {
 		fmt.Printf("failed to save %s to cache", username)
 		return
@@ -101,14 +104,74 @@ func GetHeadFromUUID(w http.ResponseWriter, r *http.Request){
 	png.Encode(w, *resp)
 }
 
+func GetUsernameFromUUID(w http.ResponseWriter, r *http.Request) {
+	setupResponse(&w, r)
+	if (*r).Method == "OPTIONS" {
+		return
+	}
+	vars := mux.Vars(r)
+	uuid := vars["uuid"]
+	parsedUUID, err := uuid2.Parse(uuid)
+	if err != nil {
+		fmt.Fprintf(w, ErrorJson("invalid uuid"))
+		return
+	}
+	if ok, _ := HasDataFromUUID(r.Context(), parsedUUID.String()); ok {
+		resp, err := GetDataFromUUID(r.Context(), parsedUUID.String())
+		if err != nil {
+			fmt.Fprintf(w, ErrorJson(err.Error()))
+			return
+		}
+		if resp != nil {
+			w.WriteHeader(http.StatusOK)
+			fmt.Fprintf(w, *resp)
+			return
+		}
+	}
+	profile, err := mojang.GetProfileFromUUID(uuid)
+	w.Header().Set("Content-Type", "application/json")
+	if err != nil {
+		fmt.Fprintf(w, ErrorJson(err.Error()))
+		return
+	}
+	headImage, err := mojang.GetHeadFromProfile(*profile)
+	buf := new(bytes.Buffer)
+	png.Encode(buf, *headImage)
+	if err != nil {
+		fmt.Fprintf(w, ErrorJson(err.Error()))
+		return
+	}
+	bytes, err := json.Marshal(UUIDResponse{
+		UUID:     parsedUUID.String(),
+		Username: profile.Name,
+		Avatar:   fmt.Sprintf("data:image/png;base64,%s", base64.StdEncoding.EncodeToString(buf.Bytes())),
+	})
+	if err != nil {
+		fmt.Fprintf(w, ErrorJson(err.Error()))
+		return
+	}
+	jsonResponse := string(bytes)
+	err = StoreData(r.Context(), profile.Name, parsedUUID.String(), jsonResponse)
+	if err != nil {
+		fmt.Printf("failed to save %s to cache", profile.Name)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	fmt.Fprintf(w, jsonResponse)
+}
+
 func main(){
 	err := godotenv.Load()
 	if err != nil {
 		//log.Fatal("Error loading .env file")
 	}
+	if len(os.Getenv("CORS")) > 0 {
+		CORS = os.Getenv("CORS")
+	}
 	SetupRedis()
 	r := mux.NewRouter()
 	r.HandleFunc("/username/{username}", GetUUIDFromUsername)
+	r.HandleFunc("/uuid/{uuid}", GetUsernameFromUUID)
 	r.HandleFunc("/head/{uuid}", GetHeadFromUUID)
 	http.Handle("/", r)
 	http.ListenAndServe(":8080", nil)

mojang/api.go

@@ -72,11 +72,10 @@ func GetUUIDFromUsername(username string) (*UUIDResponse, error) {
 	return nil, fmt.Errorf("no such player")
 }
 
-func GetHeadFromUUID(uuid string) (*image2.Image, error) {
+func GetProfileFromUUID(uuid string) (*ProfileResponse, error) {
 	if len(uuid) < 1 {
 		return nil, fmt.Errorf("invalid uuid")
 	}
-	fmt.Print()
 	request, err := http.NewRequest("GET", fmt.Sprintf("https://sessionserver.mojang.com/session/minecraft/profile/%s", uuid), nil)
 	request.Header.Set("User-Agent", "MyMCUUID-API")
 	resp, err := client.Do(request)
@@ -92,6 +91,10 @@ func GetHeadFromUUID(uuid string) (*image2.Image, error) {
 	if err != nil {
 		return nil, err
 	}
+	return &profile, nil
+}
+
+func GetHeadFromProfile(profile ProfileResponse) (*image2.Image, error) {
 	var texture *TextureInformation
 	for _, val := range profile.Properties {
 		if val.Name == "textures" {
@@ -122,6 +125,18 @@ func GetHeadFromUUID(uuid string) (*image2.Image, error) {
 	return nil, fmt.Errorf("something went wrong")
 }
 
+func GetHeadFromUUID(uuid string) (*image2.Image, error) {
+	profile, err := GetProfileFromUUID(uuid)
+	if err != nil {
+		return nil, err
+	}
+	image, err := GetHeadFromProfile(*profile)
+	if err != nil {
+		return nil, err
+	}
+	return image, nil
+}
+
 func GetImage(imageURL string) (io.ReadCloser, error) {
 	request, err := http.NewRequest("GET", imageURL, nil)
 	request.Header.Set("User-Agent", "MyMCUUID-API")