Merge pull request #18 from SkyCryptWebsite/dev

feat: add source ot accessories and other qol

Author: DuckySoLucky

.env.example

@@ -2,3 +2,5 @@ HYPIXEL_API_KEY=""
 DISCORD_WEBHOOK=""
 DEV="true"
 ENABLE_ARMOR_HEX="false"
+MONGO_URI="mongodb://localhost:27017"
+MONGO_DB_NAME="SkyCrypt"

src/db/mongo.go

@@ -166,8 +166,6 @@ func CloseMongo() error {
 }
 
 func populateEmojis() {
-	timeNow := time.Now()
-
 	collection := GetMongoCollection("emojis")
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
@@ -190,10 +188,6 @@ func populateEmojis() {
 		}
 		EMOJIS[result.UUID] = result.Emoji
 	}
-
-	if os.Getenv("FIBER_PREFORK_CHILD") == "" {
-		fmt.Printf("[MONGO] Emojis populated in %v\n", time.Since(timeNow))
-	}
 }
 
 func init() {

src/routes/accessories.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	skycrypttypes "github.com/DuckySoLucky/SkyCrypt-Types"
-	skyhelpernetworthgo "github.com/SkyCryptWebsite/SkyHelper-Networth-Go"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -43,33 +42,11 @@ func AccessoriesHandler(c *fiber.Ctx) error {
 		userProfile.Inventory = &skycrypttypes.Inventory{}
 	}
 
-	specifiedInventories := skyhelpernetworthgo.SpecifiedInventory{
-		"talisman_bag": userProfile.Inventory.BagContents.TalismanBag,
-	}
-
-	decodedItems, err := skyhelpernetworthgo.CalculateFromSpecifiedInventories(specifiedInventories, skyhelpernetworthgo.NetworthOptions{
-		IncludeItemData:  true,
-		KeepInvalidItems: true,
-	}.ToInternal())
-	if err != nil {
-		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
-			"error": fmt.Sprintf("Failed to calculate items: %v", err),
-		})
-	}
-
-	accessories := []*skycrypttypes.Item{}
-	if decodedItems.Types["talisman_bag"] != nil {
-		for _, item := range decodedItems.Types["talisman_bag"].Items {
-			if item.ItemData != nil {
-				item.ItemData.Price = item.Price
-			}
-
-			accessories = append(accessories, item.ItemData)
-		}
-	}
-
 	items := map[string][]*skycrypttypes.Item{
-		"talisman_bag": accessories,
+		"talisman_bag": stats.GetInventory(&userProfile, "talisman_bag"),
+		"inventory":    stats.GetInventory(&userProfile, "inventory"),
+		"enderchest":   stats.GetInventory(&userProfile, "enderchest"),
+		"backpack":     stats.GetInventory(&userProfile, "backpack"),
 	}
 
 	disabledPacks := []string{""}

src/stats/accessories.go

@@ -1,6 +1,7 @@
 package stats
 
 import (
+	"fmt"
 	notenoughupdates "skycrypt/src/NotEnoughUpdates"
 	"skycrypt/src/constants"
 	"skycrypt/src/models"
@@ -65,7 +66,7 @@ func GetAccessories(useProfile *skycrypttypes.Member, items map[string][]*skycry
 					continue
 				}
 
-				item.Lore = append(item.Lore, "", "§7Inactive: §cNot in accessory bag")
+				item.Lore = append(item.Lore, "", fmt.Sprintf("§7Inactive: §cFound in %s", utility.TitleCase(inventoryId)))
 				newAccessory := models.InsertAccessory{
 					ProcessedItem: item,
 					Id:            id,
@@ -103,8 +104,17 @@ func GetAccessories(useProfile *skycrypttypes.Member, items map[string][]*skycry
 
 				if utility.RarityNameToInt(duplicateRarity) < utility.RarityNameToInt(rarity) {
 					duplicates[i].IsInactive = true
+
+					if !strings.Contains(strings.Join(duplicates[i].ProcessedItem.Lore, "\n"), "§7Inactive:") {
+						duplicates[i].ProcessedItem.Lore = append(duplicates[i].ProcessedItem.Lore, "", fmt.Sprintf("§7Inactive: §cLower rarity duplicate of %s", accessory.DisplayName))
+					}
 				} else if duplicate.Rarity == rarity {
 					duplicates[i].IsInactive = true
+
+					if !strings.Contains(strings.Join(duplicates[i].ProcessedItem.Lore, "\n"), "§7Inactive:") {
+						duplicates[i].ProcessedItem.Lore = append(duplicates[i].ProcessedItem.Lore, "", fmt.Sprintf("§7Inactive: §cDuplicate of %s", accessory.DisplayName))
+					}
+
 				}
 			}
 
@@ -132,6 +142,17 @@ func GetAccessories(useProfile *skycrypttypes.Member, items map[string][]*skycry
 				for i, acc := range accessories {
 					if acc.Id == id && acc.Rarity == rarity {
 						accessories[i].IsInactive = false
+
+						// Remove the inactive lore line
+						for j := len(accessories[i].ProcessedItem.Lore) - 1; j >= 0; j-- {
+							if strings.HasPrefix(accessories[i].ProcessedItem.Lore[j], "§7Inactive:") {
+								accessories[i].ProcessedItem.Lore = append(accessories[i].ProcessedItem.Lore[:j], accessories[i].ProcessedItem.Lore[j+1:]...)
+								if j > 0 {
+									accessories[i].ProcessedItem.Lore = append(accessories[i].ProcessedItem.Lore[:j-1], accessories[i].ProcessedItem.Lore[j-1+1:]...)
+								}
+								break
+							}
+						}
 						break
 					}
 				}
@@ -148,6 +169,9 @@ func GetAccessories(useProfile *skycrypttypes.Member, items map[string][]*skycry
 				for j, acc := range accessories {
 					if acc.Id == upgrade {
 						accessories[j].IsInactive = true
+						if !strings.Contains(strings.Join(accessories[j].ProcessedItem.Lore, "\n"), "§7Inactive:") {
+							accessories[j].ProcessedItem.Lore = append(accessories[j].ProcessedItem.Lore, "", fmt.Sprintf("§7Inactive: §cUpgraded to %s", accessory.DisplayName))
+						}
 					}
 				}
 			}
@@ -182,6 +206,7 @@ func GetAccessories(useProfile *skycrypttypes.Member, items map[string][]*skycry
 	}
 
 	sort.Sort(itemSorter(accessories))
+
 	output := models.AccessoriesOutput{
 		Accessories:  accessories,
 		AccessoryIds: accessoryIds,