fix: /item not being able to return vanilla item (#1952)

SkyCryptWebsite · Jun 20, 2023 · 71fc095 · 71fc095
1 parent ff19a95
commit 71fc095
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/helper/item.js b/src/helper/item.js
@@ -11,14 +11,14 @@ import sanitize from "mongo-sanitize";
  * @returns {*} Item Data
  */
 export async function getItemData(query = {}) {
-  query = Object.assign({ skyblockId: undefined, id: undefined, name: undefined, damage: undefined }, query);
+  query = Object.assign({ skyblockId: undefined, id: undefined, name: undefined, Damage: undefined }, query);
   const item = { id: -1, damage: 0, Count: 1, tag: { ExtraAttributes: {} } };
   let dbItem = {};
 
   /**
    * Look for DB items if possible with Skyblock ID or query name
    */
-  if (query.skyblockId !== undefined) {
+  if (query.skyblockId !== undefined && query.skyblockId !== null) {
     query.skyblockId = sanitize(query.skyblockId);
 
     if (query.skyblockId.includes(":")) {
@@ -28,7 +28,7 @@ export async function getItemData(query = {}) {
       query.damage = new Number(split[1]);
     }
 
-    dbItem = (await db.collection("items").findOne({ id: query.skyblockId })) ?? {};
+    dbItem = Object.assign(item, await db.collection("items").findOne({ id: query.skyblockId }));
   }
 
   if (query.name !== undefined) {
@@ -48,10 +48,6 @@ export async function getItemData(query = {}) {
     item.id = query.id;
   }
 
-  if (query.damage !== undefined) {
-    item.Damage = query.damage;
-  }
-
   if (query.name !== undefined) {
     item.tag.display = { Name: query.name };
   }
@@ -61,7 +57,7 @@ export async function getItemData(query = {}) {
   }
 
   if ("damage" in dbItem) {
-    item.damage = dbItem.damage;
+    item.Damage = query.damage ?? dbItem.damage;
   }
 
   if ("name" in dbItem) {

diff --git a/src/renderer.js b/src/renderer.js
@@ -462,7 +462,7 @@ export async function renderItem(skyblockId, query) {
     itemQuery = Object.assign(query, { skyblockId });
   }
 
-  const item = await getItemData(itemQuery);
+  const item = await getItemData({ skyblockId, ...itemQuery });
   const outputTexture = { mime: "image/png" };
 
   for (const rule of itemsCss.stylesheet.rules) {

diff --git a/src/routes/item.js b/src/routes/item.js
@@ -1,8 +1,6 @@
 import cors from "cors";
 import express from "express";
 
-import { db } from "../mongo.js";
-
 import * as app from "../app.js";
 import * as helper from "../helper.js";
 import * as renderer from "../renderer.js";
@@ -12,12 +10,12 @@ router.use(cors());
 
 router.all("/:itemId?", cors(), async (req, res, next) => {
   try {
-    const itemId = req.params.itemId?.toUpperCase() || null;
+    const itemId = req.params.itemId || null;
     if (!req.query.pack && req.cookies.pack) {
       req.query.pack = req.cookies.pack;
     }
 
-    const item = await renderer.renderItem(itemId, req.query, db);
+    const item = await renderer.renderItem(itemId, req.query);
 
     if (item.error) {
       throw new Error(item.error);