bump prod (#47)

* fix: crap ton of changes and bug fixes

* feat: forgot to add texture here

* fix: 64x32 skulls being white

* fix: back left being flipped

* fix: openapi docs

* fix: endpoint

* chore: regenerate openapi schema

* refactor: small consistency fixes, add consumable secton

* feat: sort items based on the inventory index as well, not only rarity, so it's like befroe

* fix: sunflower garden milestone

* feat: add sea creatures

* fix: replacing entire accessory data for dupes

* feat: add mutations

* feat: add attribute_shards endpoint

* perf: do not fetch if it's bot

* feat: add missing accessories

* perf: better username resolving caching

* feat: add ability to toggle verbose logging & forensics

* feat: add new museum categories

* Fix: Bukkit Case 351 damage 2 maps to cactus_green (#37)

* Fix: case 351 wrong dye mapping (cyan → cactus_green)

* Updated Cases 402 and 405

Some fucktwat tried at least lol

* perf: make startup a lot faster, especially dev

* Fix: use green_dye instead of cactus_green for dye ID 351 (#38)

* panic: failed to connect to Redis: could not connect to Redis: LOADING Redis is loading the dataset in memory

* refactor: do not use go git

* fix: start update loop only on main thread

* fix: update on all threads, forgot to add on last commit

* fix: trophy fish

* feat(inventory): add sacks

* very important fix, trust me nocap

* fix: error

* fix: hypixelCase at SkyCrypt, gen types

* fix: consumables texture

* fix: foraging lvl cap

* fix: embed

* build: bump mongodb to v2

* fix: FS link

* H+ link

* feat: add rank to the embed

* bump docs

* disable bot detection to test smth

* reenable bot detection

* change format of embed data

* fix: datatype

* fix: sacks error, bot detection

* fix: attribute_shards owned count

* fix: farming items being under foraging section

* fix: VOTER_BADGE_SUPREME being recomb

* feat: add crap ton of probs for frontend guy to play around

* feat: add /api/combined endpoint

* fix: possible fix, idk?

* feat: add pre commit hook

* fix: specific textures failing cuz durability/damage isn't 0 in API response (wtf hypixel)

* fix: possible fix? idk, wth is going on here with JS

* fix: JS stop acting up

* refactor: future proof this as I guess?

---------

Co-authored-by: DarthGigi <47110839+DarthGigi@users.noreply.github.com>
Co-authored-by: Joona Jokivuori <43171241+JoonaFinland@users.noreply.github.com>

Author: 3 people

.githooks/pre-push

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -eu
+
+if ! command -v swag >/dev/null 2>&1; then
+  echo "swag is not installed or not on PATH" >&2
+  exit 1
+fi
+
+swag init -g main.go --v3.1 --parseDependency --parseInternal

NotEnoughUpdates-REPO

@@ -170,6 +170,12 @@ If you have already cloned the repository without submodules:
 git submodule update --init --recursive
 ```
 
+Enable the repository git hooks so `swag init` runs automatically before each push:
+
+```bash
+git config core.hooksPath .githooks
+```
+
 Download Go dependencies:
 
 ```bash

README.md

@@ -21,8 +21,19 @@ components:
       type: object
     models.AttributeShard:
       properties:
-        captured:
+        abilityLevel:
           type: integer
+        abilityMaxLevel:
+          type: integer
+        abilityName:
+          type: string
+        capturedTimestamp:
+          type: integer
+        family:
+          items:
+            type: string
+          type: array
+          uniqueItems: false
         lore:
           items:
             type: string
@@ -34,6 +45,10 @@ components:
           type: string
         owned:
           type: integer
+        rarity:
+          type: string
+        shardId:
+          type: string
         syphoned:
           type: integer
         texture:
@@ -216,6 +231,38 @@ components:
         totalCollections:
           type: integer
       type: object
+    models.CombinedOutput:
+      properties:
+        accessories:
+          $ref: '#/components/schemas/models.GetMissingAccessoresOutput'
+        bestiary:
+          $ref: '#/components/schemas/models.BestiaryOutput'
+        collections:
+          $ref: '#/components/schemas/models.CollectionsOutput'
+        crimsonIsle:
+          $ref: '#/components/schemas/models.CrimsonIsleOutput'
+        dungeons:
+          $ref: '#/components/schemas/models.DungeonsOutput'
+        gear:
+          $ref: '#/components/schemas/models.Gear'
+        inventory:
+          items:
+            $ref: '#/components/schemas/models.StrippedItem'
+          type: array
+          uniqueItems: false
+        minions:
+          $ref: '#/components/schemas/models.MinionsOutput'
+        misc:
+          $ref: '#/components/schemas/models.MiscOutput'
+        pets:
+          $ref: '#/components/schemas/models.OutputPets'
+        rift:
+          $ref: '#/components/schemas/models.RiftOutput'
+        skills:
+          $ref: '#/components/schemas/models.SkillsOutput'
+        slayers:
+          $ref: '#/components/schemas/models.SlayersOutput'
+      type: object
     models.Commissions:
       properties:
         completions:
@@ -1561,6 +1608,8 @@ components:
           $ref: '#/components/schemas/models.FishingOuput'
         foraging:
           $ref: '#/components/schemas/models.ForagingOutput'
+        hunting:
+          $ref: '#/components/schemas/models.AttributeShardsOutput'
         mining:
           $ref: '#/components/schemas/models.MiningOutput'
       type: object
@@ -2139,9 +2188,9 @@ paths:
       summary: Get accessories stats of a specified player
       tags:
       - accessories
-  /api/attribute_shards/{uuid}/{profileId}:
+  /api/bestiary/{uuid}/{profileId}:
     get:
-      description: Returns attribute shards stats for the given user and profile ID
+      description: Returns bestiary for the given user and profile ID
       parameters:
       - description: User UUID
         in: path
@@ -2160,20 +2209,20 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/models.AttributeShardsOutput'
+                $ref: '#/components/schemas/models.BestiaryOutput'
           description: OK
         "400":
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/models.ProcessingError'
           description: Bad Request
-      summary: Get attribute shards stats of a specified player
+      summary: Get bestiary stats of a specified player
       tags:
-      - attribute_shards
-  /api/bestiary/{uuid}/{profileId}:
+      - bestiary
+  /api/collections/{uuid}/{profileId}:
     get:
-      description: Returns bestiary for the given user and profile ID
+      description: Returns collections for the given user and profile ID
       parameters:
       - description: User UUID
         in: path
@@ -2192,20 +2241,20 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/models.BestiaryOutput'
+                $ref: '#/components/schemas/models.CollectionsOutput'
           description: OK
-        "400":
+        "500":
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/models.ProcessingError'
-          description: Bad Request
-      summary: Get bestiary stats of a specified player
+          description: Internal Server Error
+      summary: Get collections stats of a specified player
       tags:
-      - bestiary
-  /api/collections/{uuid}/{profileId}:
+      - collections
+  /api/combined/{uuid}/{profileId}:
     get:
-      description: Returns collections for the given user and profile ID
+      description: Returns combined  stats for the given user and profile ID
       parameters:
       - description: User UUID
         in: path
@@ -2224,17 +2273,23 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/models.CollectionsOutput'
+                $ref: '#/components/schemas/models.CombinedOutput'
           description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/models.ProcessingError'
+          description: Bad Request
         "500":
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/models.ProcessingError'
           description: Internal Server Error
-      summary: Get collections stats of a specified player
+      summary: Get combined stats of a specified player
       tags:
-      - collections
+      - combinedStats
   /api/crimson_isle/{uuid}/{profileId}:
     get:
       description: Returns Crimson Isle stats for the given user and profile ID

docs/docs.go

@@ -135,7 +135,7 @@ func ParseNEURepository() error {
 				return fmt.Errorf("failed to unmarshal JSON from %s: %w", filePath, err)
 			}
 
-			NEUConstants.AttributeShards = neustats.FormatAttributeShards(attributeShards.Attributes, GetItem)
+			NEUConstants.AttributeShards = neustats.FormatAttributeShards(attributeShards, GetItem)
 		} else if constant.Name() == "sacks.json" {
 			filePath := fmt.Sprintf("%s/%s", constantsPath, constant.Name())
 			data, err := os.ReadFile(filePath)

docs/swagger.json

@@ -72,6 +72,8 @@ func getSkyBlockItemsFromCache(cachedData string) ([]models.HypixelItem, error)
 			err = json.Unmarshal([]byte(cachedData), &data)
 			if err == nil {
 				return data.Items, nil
+			} else {
+				fmt.Printf("%s\n", err)
 			}
 		}
 		time.Sleep(500 * time.Millisecond)
@@ -157,7 +159,7 @@ func processItems(items *[]models.HypixelItem) map[string]models.ProcessedHypixe
 			Name:              item.Name,
 			ItemId:            constants.BUKKIT_TO_ID[item.Material],
 			Rarity:            strings.ToLower(item.Rarity),
-			Damage:            item.Damage,
+			Damage:            int(item.Damage),
 			Texture:           texture,
 			TextureId:         utility.GetSkinHash(item.Skin.Value),
 			Category:          strings.ToLower(item.Category),

docs/swagger.yaml

@@ -226,6 +226,10 @@ var SPECIAL_ACCESSORIES = map[string]specialAccessoryConstant{
 		AllowsRecomb:     false,
 		AllowsEnrichment: true,
 	},
+	"VOTER_BADGE_SUPREME": {
+		AllowsRecomb:     false,
+		AllowsEnrichment: true,
+	},
 }
 
 var MAGICAL_POWER = map[string]int{

src/NotEnoughUpdates/parser.go

@@ -1,13 +1,16 @@
 package neu
 
 type FormattedShard struct {
+	Texture      string   `json:"texture"`
 	Name         string   `json:"name"`
-	ShardName    string   `json:"shardName"`
+	AbilityName  string   `json:"abilityName"`
 	Lore         []string `json:"lore"`
-	Texture      string   `json:"texture"`
+	Rarity       string   `json:"rarity"`
+	Family       []string `json:"family"`
+	ShardID      string   `json:"shardId"`
 	ShardStackId string   `json:"shardStackId"`
 	ShardOwnedId string   `json:"shardOwnedId"`
-	Rarity       string   `json:"rarity"`
+	BazaarName   string   `json:"bazaarName"`
 }
 
 type AttributeShardRaw struct {
@@ -22,5 +25,13 @@ type AttributeShardRaw struct {
 }
 
 type AttributeShardsRaw struct {
-	Attributes []AttributeShardRaw `json:"attributes"`
+	Attributes         []AttributeShardRaw `json:"attributes"`
+	Level              map[string][]int    `json:"attribute_levelling"`
+	UnconsumableShards []string            `json:"unconsumable_attributes"`
+}
+
+type FormattedShards struct {
+	Shards             []FormattedShard `json:"shards"`
+	Level              map[string][]int `json:"attribute_levelling"`
+	UnconsumableShards []string         `json:"unconsumable_attributes"`
 }