Fix loading discord guild templates

2 files changed, 26 insertions, 5 deletions

diff --git a/src/api/routes/guilds/index.ts b/src/api/routes/guilds/index.ts

index 78ba93a2..663677dc 100644
--- a/src/api/routes/guilds/index.ts
+++ b/src/api/routes/guilds/index.ts
@@ -55,7 +55,7 @@ router.post(
         const guild = await Guild.createGuild({
             ...body,
             owner_id: req.user_id,
-            template_guild_id: null,
+            source_guild_id: null,
         });
 
         const { autoJoin } = Config.get().guild;
diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts

index 391f9c8a..6eb6ffbe 100644
--- a/src/api/routes/guilds/templates/index.ts
+++ b/src/api/routes/guilds/templates/index.ts
@@ -17,10 +17,10 @@
 */
 
 import { route } from "@spacebar/api";
-import { Config, DiscordApiErrors, Guild, Member, Template } from "@spacebar/util";
+import { Config, DiscordApiErrors, Guild, Member, Tag, Template } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
-import { GuildTemplateCreateSchema } from "@spacebar/schemas";
+import { ChannelType, GuildTemplateCreateSchema } from "@spacebar/schemas";
 
 const router: Router = Router({ mergeParams: true });
 
@@ -64,7 +64,7 @@ router.post("/:template_code", route({ requestBody: "GuildTemplateCreateSchema"
         // body comes after the template
         ...body,
         owner_id: req.user_id,
-        template_guild_id: template.source_guild_id,
+        source_guild_id: template.source_guild_id,
     });
 
     await Member.addToGuild(req.user_id, guild.id);
@@ -87,7 +87,28 @@ async function getTemplate(code: string) {
             headers: { "Content-Type": "application/json" },
         });
 
-        return (await discordTemplateData.json()) as Template;
+        const templateData = (await discordTemplateData.json()) as Template;
+
+        // Role ID is position in new Discord template schema. Do a little converting.
+        templateData.serialized_source_guild.roles.forEach((role) => {
+            role.position = role.id as unknown as number;
+        });
+
+        templateData.serialized_source_guild.channels.forEach((channel) => {
+            if (channel.type === ChannelType.GUILD_FORUM) {
+                channel.available_tags =
+                    channel.available_tags?.map((tag) =>
+                        Tag.create({
+                            name: tag.name,
+                            emoji_id: tag.emoji_id,
+                            emoji_name: tag.emoji_name,
+                            moderated: tag.moderated,
+                        }),
+                    ) ?? [];
+            }
+        });
+
+        return templateData;
     }
 
     if (code.startsWith("external:")) {