From 14a2f4882e88246d2f5fef6ff6c6ac14e7574059 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Thu, 28 Apr 2022 15:02:22 +0100
Subject: [PATCH] chore: refactor permission checks

---
 external/lang                                          |  2 +-
 package.json                                           |  2 +-
 src/components/common/messaging/MessageBox.tsx         |  4 ++--
 .../common/messaging/bars/MessageOverlayBar.tsx        |  2 +-
 src/pages/invite/InviteBot.tsx                         |  5 +----
 yarn.lock                                              | 10 +++++-----
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/external/lang b/external/lang
index 039fabd2..50a710d7 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit 039fabd2a9663456ad28a7c456fd55bc3fd153e5
+Subproject commit 50a710d761330632716b3f6d17ed964465d79213
diff --git a/package.json b/package.json
index 43679d30..61822508 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
         "react-scroll": "^1.8.2",
         "react-virtualized-auto-sizer": "^1.0.5",
         "react-virtuoso": "^1.10.4",
-        "revolt.js": "6.0.0-rc.19",
+        "revolt.js": "6.0.0-rc.20",
         "rimraf": "^3.0.2",
         "sass": "^1.35.1",
         "shade-blend-color": "^1.0.0",
diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx
index 0bc562f7..6d3a87b7 100644
--- a/src/components/common/messaging/MessageBox.tsx
+++ b/src/components/common/messaging/MessageBox.tsx
@@ -151,7 +151,7 @@ export default observer(({ channel }: Props) => {
 
     const renderer = getRenderer(channel);
 
-    if (!(channel.permission & Permission.SendMessage)) {
+    if (!channel.havePermission("SendMessage")) {
         return (
             <Base>
                 <Blocked>
@@ -479,7 +479,7 @@ export default observer(({ channel }: Props) => {
                 setReplies={setReplies}
             />
             <Base>
-                {channel.permission & Permission.UploadFiles ? (
+                {channel.havePermission("UploadFiles") ? (
                     <FileAction>
                         <FileUploader
                             size={24}
diff --git a/src/components/common/messaging/bars/MessageOverlayBar.tsx b/src/components/common/messaging/bars/MessageOverlayBar.tsx
index 6c17bb94..e559325b 100644
--- a/src/components/common/messaging/bars/MessageOverlayBar.tsx
+++ b/src/components/common/messaging/bars/MessageOverlayBar.tsx
@@ -131,7 +131,7 @@ export const MessageOverlayBar = observer(({ message, queued }: Props) => {
             )}
             {isAuthor ||
             (message.channel &&
-                message.channel.permission & Permission.ManageMessages) ? (
+                message.channel.havePermission("ManageMessages")) ? (
                 <Tooltip content="Delete">
                     <Entry
                         onClick={(e) =>
diff --git a/src/pages/invite/InviteBot.tsx b/src/pages/invite/InviteBot.tsx
index 2d356d52..9426e3c1 100644
--- a/src/pages/invite/InviteBot.tsx
+++ b/src/pages/invite/InviteBot.tsx
@@ -70,10 +70,7 @@ export default function InviteBot() {
                             onChange={(e) => setServer(e.currentTarget.value)}>
                             <option value="none">Select a server</option>
                             {[...client.servers.values()]
-                                .filter(
-                                    (x) =>
-                                        x.permission & Permission.ManageServer,
-                                )
+                                .filter((x) => x.havePermission("ManageServer"))
                                 .map((server) => (
                                     <option value={server._id} key={server._id}>
                                         {server.name}
diff --git a/yarn.lock b/yarn.lock
index e2feb0b2..7f3d6371 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3404,7 +3404,7 @@ __metadata:
     react-scroll: ^1.8.2
     react-virtualized-auto-sizer: ^1.0.5
     react-virtuoso: ^1.10.4
-    revolt.js: 6.0.0-rc.19
+    revolt.js: 6.0.0-rc.20
     rimraf: ^3.0.2
     sass: ^1.35.1
     shade-blend-color: ^1.0.0
@@ -6710,9 +6710,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"revolt.js@npm:6.0.0-rc.19":
-  version: 6.0.0-rc.19
-  resolution: "revolt.js@npm:6.0.0-rc.19"
+"revolt.js@npm:6.0.0-rc.20":
+  version: 6.0.0-rc.20
+  resolution: "revolt.js@npm:6.0.0-rc.20"
   dependencies:
     "@insertish/exponential-backoff": 3.1.0-patch.2
     "@insertish/isomorphic-ws": ^4.0.1
@@ -6726,7 +6726,7 @@ __metadata:
     revolt-api: 0.5.3-rc.15
     ulid: ^2.3.0
     ws: ^8.2.2
-  checksum: 8cbc4a40c10dce858cdd792be11681580e1fdb9ee48feeac9a826ae5e797496fe5c750a41ec3a4f5610c40197e7baea7b7ae109d8b0165938d845d0251bb7d66
+  checksum: a8d6e3eca6a6d7ea96911b40262763bfc9a0cf0dc8f36b63615f4c4c0a18430fa95e49f020f153299ac518019b5c2ef7c2de5940fe83332d8edb8957e7d9e3ed
   languageName: node
   linkType: hard