From fcd9e9e0c983238608f50f58825ca4d5fe098bf6 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Sun, 16 Aug 2026 14:53:25 +0200
Subject: Fix discovery

---
 src/api/routes/discoverable-guilds.ts |  2 +-
 src/database/entities/Guild.ts        | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts
index afe7f84a..88e85b6f 100644
--- a/src/api/routes/discoverable-guilds.ts
+++ b/src/api/routes/discoverable-guilds.ts
@@ -69,7 +69,7 @@ router.get(
             //     discovery_weight: undefined,
             //     discovery_splash: undefined,
             // })),
-            guilds: guilds.map((g) => g.toDiscoverableGuild()),
+            guilds: await Promise.all(guilds.map((g) => g.toDiscoverableGuild())),
             offset: Number(offset || Config.get().guild.discovery.offset),
             limit: Number(limit || configLimit),
         });
diff --git a/src/database/entities/Guild.ts b/src/database/entities/Guild.ts
index 0b3bd27e..f7de1032 100644
--- a/src/database/entities/Guild.ts
+++ b/src/database/entities/Guild.ts
@@ -336,9 +336,9 @@ export class Guild extends BaseClass {
                     },
                 },
             }),*/
-            emojis: this.emojis.map((e) => e.toJSON()) ?? undefined,
+            emojis: this.emojis?.map((e) => e.toJSON()) ?? undefined,
             emoji_count: this.emojis ? this.emojis.length : undefined,
-            stickers: this.stickers.map((s) => s.toJSON()) ?? undefined,
+            stickers: this.stickers?.map((s) => s.toJSON()) ?? undefined,
             sticker_count: this.stickers ? this.stickers.length : undefined,
             auto_removed: false,
             primary_category_id: this.primary_category_id!,
@@ -346,13 +346,15 @@ export class Guild extends BaseClass {
             is_published: false,
             reasons_to_join: [],
             created_at: new Date(Snowflake.deconstruct(this.id).timestamp).toISOString(), // TODO: make column
-            primary_category: (
-                await Categories.findOneOrFail({
-                    where: {
-                        id: this.primary_category_id!,
-                    },
-                })
-            ).toJSON(),
+            primary_category: this.primary_category_id
+                ? (
+                      await Categories.findOneOrFail({
+                          where: {
+                              id: this.primary_category_id!,
+                          },
+                      })
+                  ).toJSON()
+                : undefined,
         };
     }
 
-- 
cgit 1.5.1