Hotfix

src/merge.ts

@@ -24,9 +24,19 @@ type CharacterWithId = WithId<Schema.Character>;
 async function getFilteredCharacters(
   { userId, guildId }: { userId: string; guildId: string },
 ): Promise<WithId<CharacterWithId>[]> {
-  const { user, party } = await db.getInventory(guildId, userId);
+  const mongo = await db.newMongo().connect();
 
-  const characters = await db.getUserCharacters(userId, guildId);
+  const { user, party } = await db.getInventory(guildId, userId, mongo, true);
+
+  const likesCharactersIds = user.likes
+    ?.map(({ characterId }) => characterId)
+    .filter(utils.nonNullable);
+
+  const likesMediaIds = user.likes
+    ?.map(({ mediaId }) => mediaId)
+    .filter(utils.nonNullable);
+
+  const characters = await db.getUserCharacters(userId, guildId, mongo, true);
 
   const partyIds = [
     party.member1?.characterId,
@@ -36,13 +46,7 @@ async function getFilteredCharacters(
     party.member5?.characterId,
   ];
 
-  const likesCharactersIds = user.likes
-    ?.map(({ characterId }) => characterId)
-    .filter(utils.nonNullable);
-
-  const likesMediaIds = user.likes
-    ?.map(({ mediaId }) => mediaId)
-    .filter(utils.nonNullable);
+  await mongo.close();
 
   return characters
     .filter((char) => {

src/user.ts

@@ -1180,18 +1180,20 @@ function sum({
     .then(async () => {
       const mongo = await db.newMongo().connect();
 
-      const { user, ...inventory } = await db.getInventory(
+      const { user, party } = await db.getInventory(
         guildId,
         userId,
         mongo,
         true,
       );
 
-      const likesCharactersIds = (user.likes ?? [])
-        .map(({ characterId }) => characterId);
+      const likesCharactersIds = user.likes
+        ?.map(({ characterId }) => characterId)
+        .filter(utils.nonNullable);
 
-      const likesMediaIds = (user.likes ?? [])
-        .map(({ mediaId }) => mediaId);
+      const likesMediaIds = user.likes
+        ?.map(({ mediaId }) => mediaId)
+        .filter(utils.nonNullable);
 
       const characters = await db.getUserCharacters(
         userId,
@@ -1201,11 +1203,11 @@ function sum({
       );
 
       const partyIds = [
-        inventory.party.member1Id,
-        inventory.party.member2Id,
-        inventory.party.member3Id,
-        inventory.party.member4Id,
-        inventory.party.member5Id,
+        party.member1?.characterId,
+        party.member2?.characterId,
+        party.member3?.characterId,
+        party.member4?.characterId,
+        party.member5?.characterId,
       ];
 
       const embed = new discord.Embed();
@@ -1232,7 +1234,7 @@ function sum({
         const r = char.rating as keyof typeof sum;
 
         if (
-          partyIds.includes(char._id) ||
+          partyIds.includes(char.characterId) ||
           likesCharactersIds.includes(char.characterId) ||
           likesMediaIds.includes(char.mediaId)
         ) {

src/utils.ts

@@ -450,7 +450,7 @@ async function proxy(
   url?: string,
   size?: ImageSize,
 ): Promise<Attachment> {
-  let filename = url ? encodeURIComponent(basename(url)) : 'default.webp';
+  let filename = url ? basename(url) : 'default.webp';
 
   const file = await _proxy(url ?? '', size);
 
@@ -462,10 +462,15 @@ async function proxy(
     }
   }
 
-  filename = filename.replaceAll('_', '-');
+  const asciiFilename = Array.from(filename)
+    .map((char) => char.charCodeAt(0))
+    .map((code) => code < 128 ? String.fromCharCode(code) : '-')
+    .join('')
+    .replaceAll('_', '-')
+    .replace(/\s+/g, '');
 
   return {
-    filename,
+    filename: asciiFilename,
     arrayBuffer: file.image,
     type: file.format,
   };