From 47fa58fd3615e14e6775e68358e5900795ea6151 Mon Sep 17 00:00:00 2001
From: Katalina Okano <git@kat.cafe>
Date: Thu, 8 Jul 2021 17:36:38 -0500
Subject: [PATCH] fix(ServerCategoryEditor): unselectedRoles shouldn't include
 @everyone and unsafe roles

---
 .../ServerCategoryEditor.tsx                      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.tsx b/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.tsx
index c476828..a137044 100644
--- a/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.tsx
+++ b/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.tsx
@@ -4,7 +4,13 @@ import { FaderOpacity } from '@roleypoly/design-system/atoms/fader';
 import { LargeText } from '@roleypoly/design-system/atoms/typography';
 import { EditorCategory } from '@roleypoly/design-system/molecules/editor-category';
 import { CategoryContainer } from '@roleypoly/design-system/organisms/role-picker/RolePicker.styled';
-import { Category, CategoryType, PresentableGuild, Role } from '@roleypoly/types';
+import {
+  Category,
+  CategoryType,
+  PresentableGuild,
+  Role,
+  RoleSafety,
+} from '@roleypoly/types';
 import KSUID from 'ksuid';
 import { flatten, sortBy } from 'lodash';
 import React from 'react';
@@ -33,7 +39,12 @@ export const ServerCategoryEditor = (props: Props) => {
 
   const unselectedRoles = React.useMemo(() => {
     const selectedRoles = flatten(props.guild.data.categories.map((c) => c.roles));
-    return props.guild.roles.filter((r) => !selectedRoles.includes(r.id));
+    return props.guild.roles.filter(
+      (r) =>
+        !selectedRoles.includes(r.id) &&
+        r.id !== props.guild.id &&
+        r.safety === RoleSafety.Safe
+    );
   }, [props.guild.data.categories, props.guild.roles]);
 
   const updateSingleCategory = (category: Category) => {