From 18f9ab7f6daa07b4487c13422053ed6ac4d70be8 Mon Sep 17 00:00:00 2001
From: 1092384 <66282302+1092384@users.noreply.github.com>
Date: Thu, 26 Dec 2024 18:23:57 +0900
Subject: [PATCH] Revert "deprecate old suroi image provider"

This reverts commit a332bbacbac86b0d7e266e5460c49b1f13691f31.
---
 components/cards/EmoteCard.tsx          |  5 ++---
 components/cards/ObjectCard.tsx         |  7 +++++--
 components/cards/SkinCard.tsx           | 12 ++++++------
 components/sidebars/ArmorSidebar.tsx    |  4 ++--
 components/sidebars/BackpackSidebar.tsx | 12 +++++++-----
 lib/util/suroi.ts                       |  7 -------
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/components/cards/EmoteCard.tsx b/components/cards/EmoteCard.tsx
index 67dbd207..748c613a 100644
--- a/components/cards/EmoteCard.tsx
+++ b/components/cards/EmoteCard.tsx
@@ -1,11 +1,10 @@
 import Image from "next/image";
-import { getSuroiSprite } from "@/lib/util/suroi";
-import { EmoteDefinition } from "@/vendor/suroi/common/src/definitions/emotes";
+import { getSuroiImageLink } from "@/lib/util/suroi";
 
 export default function EmoteCard({ emote }: EmoteCardProps) {
   return (
     <div className="flex p-4 gap-5 not-prose rounded-md ring ring-border hover:ring-primary">
-      <Image src={getSuroiSprite(emote.idString)} width="100" height="100" alt={emote.name} className="max-w-[10rem]" />
+      <Image src={getSuroiImageLink(emote)} width="100" height="100" alt={emote.name} className="max-w-[10rem]" />
       <div className="flex-1">
         <h3 className="text-lg font-bold break-normal leading-loose underline transition-colors">
           {emote.name}
diff --git a/components/cards/ObjectCard.tsx b/components/cards/ObjectCard.tsx
index 138bb0a4..9855e800 100644
--- a/components/cards/ObjectCard.tsx
+++ b/components/cards/ObjectCard.tsx
@@ -1,4 +1,4 @@
-import { getSuroiSprite } from "@/lib/util/suroi";
+import { getSuroiImageLink } from "@/lib/util/suroi";
 import { ObjectDefinition } from "@/vendor/suroi/common/src/utils/objectDefinitions";
 import Image from "next/image";
 import Link from "next/link";
@@ -16,7 +16,10 @@ export function ObjectCard({ obj, path }: ObjectCardProps) {
           )
           : (
             <Image
-              src={getSuroiSprite(obj.idString + ("variations" in obj ? "_1" : ""))}
+              src={getSuroiImageLink(
+                obj,
+                "variations" in obj && obj.variations ? 1 : 0
+              )}
               alt={`Image of ${obj.name}`}
               width={100}
               height={100}
diff --git a/components/cards/SkinCard.tsx b/components/cards/SkinCard.tsx
index 29469ae4..0dab10ae 100644
--- a/components/cards/SkinCard.tsx
+++ b/components/cards/SkinCard.tsx
@@ -1,4 +1,4 @@
-import { getSuroiSprite } from "@/lib/util/suroi";
+import { getSuroiImageLink } from "@/lib/util/suroi";
 import { SkinDefinition } from "@/vendor/suroi/common/src/definitions/skins";
 import SVGObjectRenderer from "../svg/SVGObjectRenderer";
 
@@ -10,7 +10,7 @@ export default function SkinCard({ skin }: SkinCardProps) {
           objects={[
             {
               type: "image",
-              url: getSuroiSprite(`${skin.idString}_base`),
+              url: getSuroiImageLink(skin, undefined, "base"),
               x: 0,
               y: 0,
               rotation: 90,
@@ -18,7 +18,7 @@ export default function SkinCard({ skin }: SkinCardProps) {
             },
             {
               type: "image",
-              url: getSuroiSprite(`${skin.idString}_fist`),
+              url: getSuroiImageLink(skin, undefined, "fist"),
               x: -35,
               y: 38,
               rotation: 90,
@@ -26,7 +26,7 @@ export default function SkinCard({ skin }: SkinCardProps) {
             },
             {
               type: "image",
-              url: getSuroiSprite(`${skin.idString}_fist`),
+              url: getSuroiImageLink(skin, undefined, "fist"),
               x: 35,
               y: 38,
               rotation: 90,
@@ -41,9 +41,9 @@ export default function SkinCard({ skin }: SkinCardProps) {
         </h3>
         <ul>
           <li className="font-mono">{skin.idString}</li>
-          {skin.rolesRequired && (
+          {skin.roleRequired && (
             <li>
-              <code>{skin.rolesRequired.join(", ")}</code> role(s) required
+              <code>{skin.roleRequired}</code> role required
             </li>
           )}
           {skin.hideFromLoadout && <li>Not in loadout</li>}
diff --git a/components/sidebars/ArmorSidebar.tsx b/components/sidebars/ArmorSidebar.tsx
index 24a6d089..9e25a032 100644
--- a/components/sidebars/ArmorSidebar.tsx
+++ b/components/sidebars/ArmorSidebar.tsx
@@ -1,4 +1,4 @@
-import { getSuroiSprite } from "@/lib/util/suroi";
+import { getSuroiImageLink } from "@/lib/util/suroi";
 import { ArmorDefinition } from "@/vendor/suroi/common/src/definitions/armors";
 import GenericSidebar from "./utils/GenericSidebar";
 import InfoboxColumn from "./utils/InfoboxColumn";
@@ -7,7 +7,7 @@ import InfoboxRow from "./utils/InfoboxRow";
 
 export default function ArmorSidebar({ item }: { item: ArmorDefinition }) {
   return (
-    <GenericSidebar title={item.name} image={getSuroiSprite(item.idString)}>
+    <GenericSidebar title={item.name} image={getSuroiImageLink(item)}>
       <InfoboxRow>
         <InfoboxColumn title="Level">{item.level}</InfoboxColumn>
         <InfoboxColumn title="Damage Reduction">
diff --git a/components/sidebars/BackpackSidebar.tsx b/components/sidebars/BackpackSidebar.tsx
index 7bd87c4a..2e17cba9 100644
--- a/components/sidebars/BackpackSidebar.tsx
+++ b/components/sidebars/BackpackSidebar.tsx
@@ -1,5 +1,7 @@
 import {
-  getSuroiSprite
+  IMAGE_BASE_URL,
+  getSuroiImageLink,
+  getSuroiItem
 } from "@/lib/util/suroi";
 import { BackpackDefinition } from "@/vendor/suroi/common/src/definitions/backpacks";
 import Image from "next/image";
@@ -22,12 +24,12 @@ export default function BackpackSidebar({
         {
           type: "image",
           title: "Loot",
-          url: getSuroiSprite(item.idString)
+          url: getSuroiImageLink(item)
         },
         {
           type: "image",
           title: "World",
-          url: getSuroiSprite(`${item.idString}_world`)
+          url: `${IMAGE_BASE_URL}game/equipment/${item.idString}_world.svg`
         }
       ]}
     >
@@ -126,7 +128,7 @@ export default function BackpackSidebar({
             title={(
               <div className="flex justify-center">
                 <Image
-                  src={getSuroiSprite(throwable)}
+                  src={getSuroiImageLink(getSuroiItem(throwable))}
                   alt={throwable}
                   width={40}
                   height={40}
@@ -145,7 +147,7 @@ export default function BackpackSidebar({
             title={(
               <div className="flex justify-center">
                 <Image
-                  src={getSuroiSprite(throwable)}
+                  src={getSuroiImageLink(getSuroiItem(throwable))}
                   alt={throwable}
                   width={40}
                   height={40}
diff --git a/lib/util/suroi.ts b/lib/util/suroi.ts
index 3f5ede70..719dfce3 100644
--- a/lib/util/suroi.ts
+++ b/lib/util/suroi.ts
@@ -119,13 +119,6 @@ type ObjectCategoryMapping<Category extends ObjectCategory> = {
   readonly [ObjectCategory.SyncedParticle]: SyncedParticleDefinition
 }[Category];
 
-export function getSuroiSprite(frame: string) {
-  return `/api/img/frame/${frame}/`;
-}
-
-/**
- * @deprecated Use `getSuroiSprite()`
- */
 export function getSuroiImageLink(obj: ObjectDefinition, variation?: number, append?: string | string[], dual?: boolean) {
   switch (true) {
     // Is it an item?