From 245c7a46edc6bd8804c7dfeea1a605b8dd59ebce Mon Sep 17 00:00:00 2001
From: trashtemp <96388163+trashtemp@users.noreply.github.com>
Date: Fri, 24 Dec 2021 23:27:35 +0100
Subject: [PATCH] fix(settings): more work on server settings pages

---
 external/lang                           |  2 +-
 src/pages/settings/ChannelSettings.tsx  |  7 +------
 src/pages/settings/ServerSettings.tsx   |  4 +++-
 src/pages/settings/channel/Overview.tsx | 25 +++++++++++--------------
 src/pages/settings/server/Overview.tsx  | 10 +++++++---
 5 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/external/lang b/external/lang
index 2f0326b8..cfe757a8 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit 2f0326b892174985809ec1b82a0f3a658df0f792
+Subproject commit cfe757a806f038ce68b50d907c43f9f1742756a6
diff --git a/src/pages/settings/ChannelSettings.tsx b/src/pages/settings/ChannelSettings.tsx
index abc5baf1..f25a557f 100644
--- a/src/pages/settings/ChannelSettings.tsx
+++ b/src/pages/settings/ChannelSettings.tsx
@@ -49,12 +49,7 @@ export default function ChannelSettings() {
         <GenericSettings
             pages={[
                 {
-                    category: (
-                        <Category
-                            variant="uniform"
-                            text={getChannelName(channel, true)}
-                        />
-                    ),
+                    category: <div>{getChannelName(channel, true)}</div>,
                     id: "overview",
                     icon: <InfoCircle size={20} />,
                     title: (
diff --git a/src/pages/settings/ServerSettings.tsx b/src/pages/settings/ServerSettings.tsx
index ff4be4e1..61a34448 100644
--- a/src/pages/settings/ServerSettings.tsx
+++ b/src/pages/settings/ServerSettings.tsx
@@ -72,7 +72,9 @@ export default observer(() => {
                     hideTitle: true,
                 },
                 {
-                    category: "User Management",
+                    category: (
+                        <Text id="app.settings.server_pages.management.title" />
+                    ),
                     id: "members",
                     icon: <Group size={20} />,
                     title: (
diff --git a/src/pages/settings/channel/Overview.tsx b/src/pages/settings/channel/Overview.tsx
index 09143f55..254eade6 100644
--- a/src/pages/settings/channel/Overview.tsx
+++ b/src/pages/settings/channel/Overview.tsx
@@ -10,8 +10,8 @@ import TextAreaAutoSize from "../../../lib/TextAreaAutoSize";
 import { FileUploader } from "../../../context/revoltjs/FileUploads";
 
 import Button from "../../../components/ui/Button";
-import InputBox from "../../../components/ui/InputBox";
 import Checkbox from "../../../components/ui/Checkbox";
+import InputBox from "../../../components/ui/InputBox";
 
 interface Props {
     channel: Channel;
@@ -40,10 +40,7 @@ export default observer(({ channel }: Props) => {
         () => setDescription(channel.description ?? ""),
         [channel.description],
     );
-    useEffect(
-        () => setNSFW(channel.nsfw ?? false),
-        [channel.nsfw],
-    );
+    useEffect(() => setNSFW(channel.nsfw ?? false), [channel.nsfw]);
 
     const [changed, setChanged] = useState(false);
     function save() {
@@ -51,8 +48,7 @@ export default observer(({ channel }: Props) => {
         if (name !== channel.name) changes.name = name;
         if (description !== channel.description)
             changes.description = description;
-        if (nsfw !== channel.nsfw)
-            changes.nsfw = nsfw;
+        if (nsfw !== channel.nsfw) changes.nsfw = nsfw;
 
         channel.edit(changes);
         setChanged(false);
@@ -118,15 +114,16 @@ export default observer(({ channel }: Props) => {
                     if (!changed) setChanged(true);
                 }}
             />
-            {channel.channel_type === "VoiceChannel" ? '' : (
+            <hr />
+            {channel.channel_type === "VoiceChannel" ? (
+                ""
+            ) : (
                 <Checkbox
                     checked={nsfw ?? false}
-                    onChange={
-                        (nsfwchange) => { 
-                            setNSFW(nsfwchange);
-                            if (!changed) setChanged(true);
-                        }
-                    }
+                    onChange={(nsfwchange) => {
+                        setNSFW(nsfwchange);
+                        if (!changed) setChanged(true);
+                    }}
                     description="Set this channel to NSFW.">
                     NSFW
                 </Checkbox>
diff --git a/src/pages/settings/server/Overview.tsx b/src/pages/settings/server/Overview.tsx
index c4b962a2..9086e5fb 100644
--- a/src/pages/settings/server/Overview.tsx
+++ b/src/pages/settings/server/Overview.tsx
@@ -93,7 +93,7 @@ export const Overview = observer(({ server }: Props) => {
                     if (!changed) setChanged(true);
                 }}
             />
-
+            <hr />
             <h3>
                 <Text id="app.main.servers.custom_banner" />
             </h3>
@@ -107,7 +107,7 @@ export const Overview = observer(({ server }: Props) => {
                 previewURL={server.generateBannerURL({ width: 1000 }, true)}
                 remove={() => server.edit({ remove: "Banner" })}
             />
-
+            <hr />
             <h3>
                 <Text id="app.settings.server_pages.overview.system_messages" />
             </h3>
@@ -152,7 +152,11 @@ export const Overview = observer(({ server }: Props) => {
                             <Text id="general.disabled" />
                         </option>
                         {server.channels
-                            .filter((x) => (typeof x !== "undefined" && x.channel_type === "TextChannel"))
+                            .filter(
+                                (x) =>
+                                    typeof x !== "undefined" &&
+                                    x.channel_type === "TextChannel",
+                            )
                             .map((channel) => (
                                 <option key={channel!._id} value={channel!._id}>
                                     {getChannelName(channel!, true)}