Merge branch 'master' into tsnode

1 files changed, 9 insertions, 2 deletions

diff --git a/api/src/routes/guilds/#guild_id/roles.ts b/api/src/routes/guilds/#guild_id/roles.ts

index b1875598..b6894e3f 100644
--- a/api/src/routes/guilds/#guild_id/roles.ts
+++ b/api/src/routes/guilds/#guild_id/roles.ts
@@ -8,7 +8,8 @@ import {
 	GuildRoleDeleteEvent,
 	emitEvent,
 	Config,
-	DiscordApiErrors
+	DiscordApiErrors,
+	handleFile
 } from "@fosscord/util";
 import { HTTPError } from "lambert-server";
 import { route } from "@fosscord/api";
@@ -22,6 +23,8 @@ export interface RoleModifySchema {
 	hoist?: boolean; // whether the role should be displayed separately in the sidebar
 	mentionable?: boolean; // whether the role should be mentionable
 	position?: number;
+	icon?: string;
+	unicode_emoji?: string;
 }
 
 export type RolePositionUpdateSchema = {
@@ -58,7 +61,9 @@ router.post("/", route({ body: "RoleModifySchema", permission: "MANAGE_ROLES" })
 		guild_id: guild_id,
 		managed: false,
 		permissions: String(req.permission!.bitfield & BigInt(body.permissions || "0")),
-		tags: undefined
+		tags: undefined,
+		icon: null,
+		unicode_emoji: null
 	});
 
 	await Promise.all([
@@ -105,6 +110,8 @@ router.patch("/:role_id", route({ body: "RoleModifySchema", permission: "MANAGE_
 	const { role_id, guild_id } = req.params;
 	const body = req.body as RoleModifySchema;
 
+	if (body.icon) body.icon = await handleFile(`/role-icons/${role_id}`, body.icon as string); 
+
 	const role = new Role({
 		...body,
 		id: role_id,