Merge branch 'fosscord:master' into master

This commit is contained in:
Featyre 2022-01-23 15:57:00 +00:00 committed by GitHub
commit f6774cb3ec
12 changed files with 7 additions and 6 deletions

BIN
api/package-lock.json generated

Binary file not shown.

View File

@ -86,7 +86,7 @@
"missing-native-js-functions": "^1.2.18",
"morgan": "^1.10.0",
"multer": "^1.4.2",
"node-fetch": "^2.6.1",
"node-fetch": "^3.1.1",
"patch-package": "^6.4.7",
"picocolors": "^1.0.0",
"proxy-agent": "^5.0.0",

Binary file not shown.

View File

@ -19,7 +19,8 @@ router.post("/:code", route({}), async (req: Request, res: Response) => {
const { features } = await Guild.findOneOrFail({ id: guild_id});
const { public_flags } = await User.findOneOrFail({ id: req.user_id });
if(features.includes("INTERNAL_EMPLOYEE_ONLY") && (public_flags & 1) !== 1) throw new HTTPError("The Maze isn't meant for you.", 401)
if(features.includes("INTERNAL_EMPLOYEE_ONLY") && (public_flags & 1) !== 1) throw new HTTPError("Only intended for the staff of this server.", 401);
if(features.includes("INVITES_CLOSED")) throw new HTTPError("Sorry, this guild has joins closed.", 403);
const invite = await Invite.joinGuild(req.user_id, code);

BIN
bundle/package-lock.json generated

Binary file not shown.

View File

@ -91,7 +91,7 @@
"missing-native-js-functions": "^1.2.18",
"morgan": "^1.10.0",
"multer": "^1.4.2",
"node-fetch": "^2.6.1",
"node-fetch": "^2.6.7",
"node-os-utils": "^1.3.5",
"patch-package": "^6.4.7",
"pg": "^8.7.1",

BIN
cdn/package-lock.json generated

Binary file not shown.

View File

@ -54,7 +54,7 @@
"missing-native-js-functions": "^1.2.17",
"multer": "^1.4.2",
"nanocolors": "^0.2.12",
"node-fetch": "^2.6.1",
"node-fetch": "^2.6.7",
"supertest": "^6.1.6",
"typescript": "^4.1.2"
},

Binary file not shown.

View File

@ -32,7 +32,7 @@
"jsonwebtoken": "^8.5.1",
"lambert-server": "^1.2.11",
"missing-native-js-functions": "^1.2.18",
"node-fetch": "^2.6.1",
"node-fetch": "^3.1.1",
"proxy-agent": "^5.0.0",
"typeorm": "^0.2.37",
"ws": "^7.4.2"

BIN
util/package-lock.json generated

Binary file not shown.

View File

@ -44,7 +44,7 @@
"lambert-server": "^1.2.12",
"missing-native-js-functions": "^1.2.18",
"multer": "^1.4.3",
"node-fetch": "^2.6.1",
"node-fetch": "^2.6.7",
"patch-package": "^6.4.7",
"pg": "^8.7.1",
"picocolors": "^1.0.0",