From 50fd3b2d113bbc15f3415057125c64e5460a4bdb Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Mon, 8 Aug 2022 15:21:46 +0100
Subject: [PATCH] chore: clean up repository

---
 external/lang                        |  2 +-
 package.json                         |  4 +-
 src/pages/settings/server/Emojis.tsx |  2 +-
 yarn.lock                            | 56 +++++++++++-----------------
 4 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/external/lang b/external/lang
index dd597a0f..d4244046 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit dd597a0fb984e6c681dcf936bdbb1fc07c0521dd
+Subproject commit d42440461f1c661e4f341a81e253021d45d1d526
diff --git a/package.json b/package.json
index 0a6d24ad..03ab561c 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,6 @@
         }
     },
     "dependencies": {
-        "@floating-ui/react-dom": "^0.7.2",
-        "@floating-ui/react-dom-interactions": "^0.7.0",
         "fs-extra": "^10.0.0",
         "klaw": "^3.0.0",
         "sirv-cli": "^1.0.14",
@@ -52,6 +50,8 @@
     },
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.17.9",
+        "@floating-ui/react-dom": "^1.0.0",
+        "@floating-ui/react-dom-interactions": "^0.9.1",
         "@fontsource/atkinson-hyperlegible": "^4.4.5",
         "@fontsource/bitter": "^4.5.7",
         "@fontsource/comic-neue": "^4.4.5",
diff --git a/src/pages/settings/server/Emojis.tsx b/src/pages/settings/server/Emojis.tsx
index 1395e7d2..d5f4b3d1 100644
--- a/src/pages/settings/server/Emojis.tsx
+++ b/src/pages/settings/server/Emojis.tsx
@@ -44,7 +44,7 @@ const UserInfo = styled(Row)`
 
 export const Emojis = observer(({ server }: Props) => {
     const emoji = [...server.client.emojis.values()].filter(
-        (x) => x.parent.id === server._id,
+        (x) => x.parent.type === "Server" && x.parent.id === server._id,
     );
 
     return (
diff --git a/yarn.lock b/yarn.lock
index bf7b2581..bc412427 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1825,46 +1825,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^0.7.3":
-  version: 0.7.3
-  resolution: "@floating-ui/core@npm:0.7.3"
-  checksum: f48f9fb0d19dcbe7a68c38e8de7fabb11f0c0e6e0ef215ae60b5004900bacb1386e7b89cb377d91a90ff7d147ea1f06c2905136ecf34dea162d9696d8f448d5f
+"@floating-ui/core@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@floating-ui/core@npm:1.0.0"
+  checksum: 093eaa226c1317c1770218bfa9e689c57b3aaef9eab15521269b24f50aeb16143471347bf8025c70ea67a80a165242b6f3a3335a47cbda565d3e055fbfa29501
   languageName: node
   linkType: hard
 
-"@floating-ui/dom@npm:^0.5.3":
-  version: 0.5.4
-  resolution: "@floating-ui/dom@npm:0.5.4"
+"@floating-ui/dom@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@floating-ui/dom@npm:1.0.0"
   dependencies:
-    "@floating-ui/core": ^0.7.3
-  checksum: 9f9d8a51a828c6be5f187204aa6d293c6c9ef70d51dcc5891a4d85683745fceebf79ff8826d0f75ae41b45c3b138367d339756f27f41be87a8770742ebc0de42
+    "@floating-ui/core": ^1.0.0
+  checksum: dd2f2fab4498b194cabc564b1fa9c7f79885271054a5d64f0bf546a374b12a11732f774d97798397f4bae8e87cfb817d110b8a950ae2422c8ffc571647c263d5
   languageName: node
   linkType: hard
 
-"@floating-ui/react-dom-interactions@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "@floating-ui/react-dom-interactions@npm:0.7.0"
+"@floating-ui/react-dom-interactions@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "@floating-ui/react-dom-interactions@npm:0.9.1"
   dependencies:
-    "@floating-ui/react-dom": ^0.7.2
+    "@floating-ui/react-dom": ^1.0.0
     aria-hidden: ^1.1.3
-    use-isomorphic-layout-effect: ^1.1.1
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 7cf0875a65c55c06a0d0cc91e07d725cb0be8cccf61d6c08ab91f24c80c9dce370d6a47e6b7c4d49c3d9456136d840a57ca548b0bc2316f3ff869ac8e1797424
+  checksum: 00f077547e883f3be45386a6e74c64913c02af417ae2b15cf86b10af79724b52095b820e8ba034b0bac5eba597010b1ea95095ba692c33cbc307f1df7608c54a
   languageName: node
   linkType: hard
 
-"@floating-ui/react-dom@npm:^0.7.2":
-  version: 0.7.2
-  resolution: "@floating-ui/react-dom@npm:0.7.2"
+"@floating-ui/react-dom@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@floating-ui/react-dom@npm:1.0.0"
   dependencies:
-    "@floating-ui/dom": ^0.5.3
-    use-isomorphic-layout-effect: ^1.1.1
+    "@floating-ui/dom": ^1.0.0
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: bc3f2b5557f87f6f4bbccfe3e8d097abafad61a41083d3b79f3499f27590e273bcb3dc7136c2444841ee7a8c0d2a70cc1385458c16103fa8b70eade80c24af52
+  checksum: d79e3c8570b0eaef5e968cd9c69de2c6bb372a5316e4e69a1cd12dae81771863ef430e81b74a0c21cefba663a2f971d8540c7294d7fb3b9807e32ba2a00c1e76
   languageName: node
   linkType: hard
 
@@ -3655,8 +3653,8 @@ __metadata:
   resolution: "client@workspace:."
   dependencies:
     "@babel/plugin-proposal-decorators": ^7.17.9
-    "@floating-ui/react-dom": ^0.7.2
-    "@floating-ui/react-dom-interactions": ^0.7.0
+    "@floating-ui/react-dom": ^1.0.0
+    "@floating-ui/react-dom-interactions": ^0.9.1
     "@fontsource/atkinson-hyperlegible": ^4.4.5
     "@fontsource/bitter": ^4.5.7
     "@fontsource/comic-neue": ^4.4.5
@@ -9185,18 +9183,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-isomorphic-layout-effect@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "use-isomorphic-layout-effect@npm:1.1.2"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: a6532f7fc9ae222c3725ff0308aaf1f1ddbd3c00d685ef9eee6714fd0684de5cb9741b432fbf51e61a784e2955424864f7ea9f99734a02f237b17ad3e18ea5cb
-  languageName: node
-  linkType: hard
-
 "use-memo-one@npm:^1.1.1":
   version: 1.1.2
   resolution: "use-memo-one@npm:1.1.2"