alicia: rebase and rebuild flake

flake.nix

@@ -21,8 +21,8 @@
 			pname = "spacebar-client-react";
 			src = ./.;
 			name = "spacebar-client-react";
-			#buildInputs = with pkgs; [ prefetch-npm-deps ];
+			#buildInputs = with pkgs; [ ];
-			npmDepsHash = "sha256-b/L2pEhqRYVDNg5jYBIahAdbSW4GLgVQEnwziDBprW8=";
+			npmDepsHash = "sha256-BAsUdPWJk8/QVaRjOELusOf3TGoft4o90FJ11ef3xJE=";
 			makeCacheWritable = true;
 		};
 		devShell = pkgs.mkShell {

package-lock.json

@@ -15,6 +15,7 @@
 				"@hcaptcha/react-hcaptcha": "^1.8.0",
 				"@mattjennings/react-modal-stack": "^1.0.4",
 				"@mui/material": "^5.11.13",
+				"@spacebarchat/spacebar-api-types": "^0.37.46",
 				"@testing-library/jest-dom": "^5.16.5",
 				"@testing-library/react": "^13.4.0",
 				"@testing-library/user-event": "^13.5.0",
@@ -40,7 +41,6 @@
 				"reoverlay": "^1.0.3",
 				"slate": "^0.91.4",
 				"slate-react": "^0.92.0",
-				"spacebar-ts": "github:spacebarchat/spacebar-ts",
 				"styled-components": "^5.3.9",
 				"typescript": "^4.9.5"
 			},
@@ -3727,15 +3727,6 @@
 			"resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
 			"integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
 		},
-		"node_modules/@sapphire/snowflake": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.4.2.tgz",
-			"integrity": "sha512-KJwlv5gkGjs1uFV7/xx81n3tqgBwBJvH94n1xDyH3q+JSmtsMeSleJffarEBfG2yAFeJiFA4BnGOK6FFPHc19g==",
-			"engines": {
-				"node": ">=v14.0.0",
-				"npm": ">=7.0.0"
-			}
-		},
 		"node_modules/@sinclair/typebox": {
 			"version": "0.24.51",
 			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
@@ -3757,30 +3748,10 @@
 				"@sinonjs/commons": "^1.7.0"
 			}
 		},
-		"node_modules/@spacebarchat/oapi": {
+		"node_modules/@spacebarchat/spacebar-api-types": {
-			"version": "0.1.21",
+			"version": "0.37.46",
-			"resolved": "https://registry.npmjs.org/@spacebarchat/oapi/-/oapi-0.1.21.tgz",
+			"resolved": "https://registry.npmjs.org/@spacebarchat/spacebar-api-types/-/spacebar-api-types-0.37.46.tgz",
-			"integrity": "sha512-I29dVXrtDJPmtss9iTxBYkE/ZUdHIfzmFT9K0YxMrOgjWs947fRE5EKd6g8itNeyhelwMggNhlMhBWyKfYILhA==",
+			"integrity": "sha512-fuNZIMBWKezpkyvZHvAfQ1boCfEoncP+odg+bqr824WiGldiiAqhBuye1v/TMYkAm6A4R2p9/ifkCqmFQgemKA=="
-			"dependencies": {
-				"typescript": "^4.6.2"
-			},
-			"bin": {
-				"oapilib": "cli.js"
-			},
-			"optionalDependencies": {
-				"axios": "^0.26.1",
-				"openapi-typescript": "^5.2.0"
-			}
-		},
-		"node_modules/@spacebarchat/spacebar-types": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@spacebarchat/spacebar-types/-/spacebar-types-0.1.2.tgz",
-			"integrity": "sha512-eLjmNqpIoGo5YenVU7MtiBOGc/ibt3NKbiHHKWF/ZnloC6kIpju3pIP6GwnBj+QfyXWJYiaR7iY+OMujpiv4GA==",
-			"dependencies": {
-				"@spacebarchat/oapi": "0.1.21",
-				"axios": "^0.26.1",
-				"lodash.defaultsdeep": "^4.6.1"
-			}
 		},
 		"node_modules/@surma/rollup-plugin-off-main-thread": {
 			"version": "2.2.3",
@@ -5872,14 +5843,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/axios": {
-			"version": "0.26.1",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-			"integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
-			"dependencies": {
-				"follow-redirects": "^1.14.8"
-			}
-		},
 		"node_modules/axobject-query": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
@@ -6410,18 +6373,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/busboy": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
-			"integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
-			"optional": true,
-			"dependencies": {
-				"streamsearch": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=10.16.0"
-			}
-		},
 		"node_modules/bytes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -9573,11 +9524,6 @@
 				"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
 			}
 		},
-		"node_modules/exponential-backoff": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-			"integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw=="
-		},
 		"node_modules/express": {
 			"version": "4.18.2",
 			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
@@ -10396,12 +10342,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/globalyzer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz",
-			"integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==",
-			"optional": true
-		},
 		"node_modules/globby": {
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -10421,12 +10361,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/globrex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-			"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-			"optional": true
-		},
 		"node_modules/gopd": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -11522,14 +11456,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/isomorphic-ws": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz",
-			"integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==",
-			"peerDependencies": {
-				"ws": "*"
-			}
-		},
 		"node_modules/istanbul-lib-coverage": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
@@ -13861,16 +13787,6 @@
 			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
 			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
 		},
-		"node_modules/lodash.defaultsdeep": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
-			"integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="
-		},
-		"node_modules/lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-		},
 		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -14718,65 +14634,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/openapi-typescript": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-5.4.1.tgz",
-			"integrity": "sha512-AGB2QiZPz4rE7zIwV3dRHtoUC/CWHhUjuzGXvtmMQN2AFV8xCTLKcZUHLcdPQmt/83i22nRE7+TxXOXkK+gf4Q==",
-			"optional": true,
-			"dependencies": {
-				"js-yaml": "^4.1.0",
-				"mime": "^3.0.0",
-				"prettier": "^2.6.2",
-				"tiny-glob": "^0.2.9",
-				"undici": "^5.4.0",
-				"yargs-parser": "^21.0.1"
-			},
-			"bin": {
-				"openapi-typescript": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">= 14.0.0"
-			}
-		},
-		"node_modules/openapi-typescript/node_modules/argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"optional": true
-		},
-		"node_modules/openapi-typescript/node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"optional": true,
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/openapi-typescript/node_modules/mime": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
-			"integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
-			"optional": true,
-			"bin": {
-				"mime": "cli.js"
-			},
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
-		"node_modules/openapi-typescript/node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"optional": true,
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/optionator": {
 			"version": "0.9.1",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -16307,21 +16164,6 @@
 				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/prettier": {
-			"version": "2.8.8",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-			"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-			"optional": true,
-			"bin": {
-				"prettier": "bin-prettier.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
 		"node_modules/pretty-bytes": {
 			"version": "5.6.0",
 			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
@@ -18493,47 +18335,6 @@
 			"integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
 			"deprecated": "Please use @jridgewell/sourcemap-codec instead"
 		},
-		"node_modules/spacebar-ts": {
-			"version": "0.0.2",
-			"resolved": "git+ssh://git@github.com/spacebarchat/spacebar-ts.git#486920522b9a185f0d8cec802bc38605e6eef207",
-			"license": "AGPL-3.0-only",
-			"dependencies": {
-				"@sapphire/snowflake": "^3.4.2",
-				"@spacebarchat/spacebar-types": "^0.1.2",
-				"eventemitter3": "^5.0.0",
-				"exponential-backoff": "^3.1.1",
-				"isomorphic-ws": "^5.0.0",
-				"lodash.defaultsdeep": "^4.6.1",
-				"lodash.isequal": "^4.5.0",
-				"mobx": "^6.9.0",
-				"ws": "^8.13.0"
-			}
-		},
-		"node_modules/spacebar-ts/node_modules/eventemitter3": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.0.tgz",
-			"integrity": "sha512-riuVbElZZNXLeLEoprfNYoDSwTBRR44X3mnhdI1YcnENpWTCsTTVZ2zFuqQcpoyqPQIUXdiPEU0ECAq0KQRaHg=="
-		},
-		"node_modules/spacebar-ts/node_modules/ws": {
-			"version": "8.13.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-			"engines": {
-				"node": ">=10.0.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": ">=5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/spdy": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
@@ -18724,15 +18525,6 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/streamsearch": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
-			"integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
-			"optional": true,
-			"engines": {
-				"node": ">=10.0.0"
-			}
-		},
 		"node_modules/string_decoder": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -19314,16 +19106,6 @@
 			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
 			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
 		},
-		"node_modules/tiny-glob": {
-			"version": "0.2.9",
-			"resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
-			"integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==",
-			"optional": true,
-			"dependencies": {
-				"globalyzer": "0.1.0",
-				"globrex": "^0.1.2"
-			}
-		},
 		"node_modules/tiny-invariant": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz",
@@ -19644,18 +19426,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/undici": {
-			"version": "5.22.0",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-5.22.0.tgz",
-			"integrity": "sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==",
-			"optional": true,
-			"dependencies": {
-				"busboy": "^1.6.0"
-			},
-			"engines": {
-				"node": ">=14.0"
-			}
-		},
 		"node_modules/unicode-canonical-property-names-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",