From 78354a35d06a62c85f40f550fd16f53f2c12323b Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Thu, 11 Mar 2021 08:45:23 -0800
Subject: [PATCH] Support ?v= for SVG URLs, too

---
 src/server/types/AppearanceLayer.js | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/server/types/AppearanceLayer.js b/src/server/types/AppearanceLayer.js
index e453460..ef36ec3 100644
--- a/src/server/types/AppearanceLayer.js
+++ b/src/server/types/AppearanceLayer.js
@@ -159,28 +159,41 @@ const resolvers = {
         return null;
       }
 
+      const assetUrls = asset.assetData.map(
+        (ad) => new URL(ad.path, "http://images.neopets.com")
+      );
+
       // In the `lod` case, if there's a JS asset, then don't treat this as an
       // SVG asset at all. (There might be an SVG in the asset list anyway
       // sometimes I think, for the animation, but ignore it if so!)
       //
       // NOTE: I thiiink the `vector` case is deprecated? I haven't verified
       //       whether it's gone from our database yet, though.
-      const jsAssetDatum = asset.assetData.find((ad) =>
-        ad.path.endsWith(".js")
+      const jsAssetUrl = assetUrls.find(
+        // NOTE: Sometimes the path ends with a ?v= query string, so we need
+        //       to use `extname` to find the real extension!
+        // TODO: There's a file_ext field in the full manifest, but it's not
+        //       included in our cached copy. That would probably be more
+        //       reliable!
+        (url) => path.extname(url.pathname) === ".js"
       );
-      if (jsAssetDatum) {
+      if (jsAssetUrl) {
         return null;
       }
 
-      const svgAssetDatum = asset.assetData.find((ad) =>
-        ad.path.endsWith(".svg")
+      const svgAssetUrl = assetUrls.find(
+        // NOTE: Sometimes the path ends with a ?v= query string, so we need
+        //       to use `extname` to find the real extension!
+        // TODO: There's a file_ext field in the full manifest, but it's not
+        //       included in our cached copy. That would probably be more
+        //       reliable!
+        (url) => path.extname(url.pathname) === ".svg"
       );
-      if (!svgAssetDatum) {
+      if (!svgAssetUrl) {
         return null;
       }
 
-      const url = new URL(svgAssetDatum.path, "http://images.neopets.com");
-      return url.toString();
+      return svgAssetUrl.toString();
     },
     canvasMovieLibraryUrl: async ({ id }, _, { db, swfAssetLoader }) => {
       const layer = await swfAssetLoader.load(id);