From dc436e34d7177b89b615959a757931f80401b4ae Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Mon, 25 Apr 2022 14:59:48 +0200 Subject: [PATCH 1/7] New translations auth.json (Polish) --- api/locales/pl/auth.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/locales/pl/auth.json b/api/locales/pl/auth.json index 3988e9cd..711cb4d7 100644 --- a/api/locales/pl/auth.json +++ b/api/locales/pl/auth.json @@ -1,13 +1,13 @@ { "login": { - "INVALID_LOGIN": "E-mail lub telefon nie został znaleziony", + "INVALID_LOGIN": "E-mail lub numer telefonu nie został znaleziony", "INVALID_PASSWORD": "Nieprawidłowe hasło", "ACCOUNT_DISABLED": "To konto jest nieaktywne" }, "register": { "REGISTRATION_DISABLED": "Rejestracja nowych użytkowników jest wyłączona", "INVITE_ONLY": "Aby się zarejestrować, musisz zostać zaproszony", - "EMAIL_INVALID": "Nieprawidłowy email", + "EMAIL_INVALID": "Nieprawidłowy E-mail", "EMAIL_ALREADY_REGISTERED": "E-mail jest już zarejestrowany", "DATE_OF_BIRTH_UNDERAGE": "Musisz mieć {{years}} lat lub więcej", "CONSENT_REQUIRED": "Musisz zaakceptować Regulamin i Politykę Prywatności.", From 9a552f50f0a64b2aa299dc9f41367a0c18fe74f9 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Mon, 25 Apr 2022 14:59:49 +0200 Subject: [PATCH 2/7] New translations common.json (Polish) --- api/locales/pl/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/locales/pl/common.json b/api/locales/pl/common.json index 3b618c1f..98c0906b 100644 --- a/api/locales/pl/common.json +++ b/api/locales/pl/common.json @@ -10,9 +10,9 @@ "BASE_TYPE_OBJECT": "To pole musi być obiektem", "BASE_TYPE_ARRAY": "To pole musi być tablicą", "UNKOWN_FIELD": "Nieznany klucz: {{key}}", - "BASE_TYPE_CONSTANT": "To pole musi być {{value}}", + "BASE_TYPE_CONSTANT": "To pole musi wynosić {{value}}", "EMAIL_TYPE_INVALID_EMAIL": "Źle sformułowany adres e-mail", "DATE_TYPE_PARSE": "Nie można przetworzyć {{date}}. Powinno być ISO8601", - "BASE_TYPE_BAD_LENGTH": "Długość musi wynosić między {{length}}" + "BASE_TYPE_BAD_LENGTH": "Długość musi wynosić pomiędzy {{length}}" } } From 72d8bffde67ef7c76e7897acc80eaf6c184a9ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Sun, 26 Jun 2022 14:20:34 +0300 Subject: [PATCH 3/7] Update Rights.ts --- util/src/util/Rights.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/src/util/Rights.ts b/util/src/util/Rights.ts index 35ad9514..b28c75b7 100644 --- a/util/src/util/Rights.ts +++ b/util/src/util/Rights.ts @@ -71,6 +71,8 @@ export class Rights extends BitField { INITIATE_INTERACTIONS: BitFlag(40), // can initiate interactions RESPOND_TO_INTERACTIONS: BitFlag(41), // can respond to interactions SEND_BACKDATED_EVENTS: BitFlag(42), // can send backdated events + USE_MASS_INVITES: BitFlag(43), // added per @xnacly's request — can accept mass invites + ACCEPT_INVITES: BitFlag(44) // added per @xnacly's request — can accept user-specific invites and DM requests }; any(permission: RightResolvable, checkOperator = true) { From 582d413f2c5051c096c333e2a13af6a1b6e347ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Sun, 26 Jun 2022 14:26:36 +0300 Subject: [PATCH 4/7] JOIN_GUILDS is not the right flag there --- api/src/routes/invites/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/routes/invites/index.ts b/api/src/routes/invites/index.ts index 21da2d18..eeafb22a 100644 --- a/api/src/routes/invites/index.ts +++ b/api/src/routes/invites/index.ts @@ -13,7 +13,7 @@ router.get("/:code", route({}), async (req: Request, res: Response) => { res.status(200).send(invite); }); -router.post("/:code", route({right: "JOIN_GUILDS"}), async (req: Request, res: Response) => { +router.post("/:code", route({right: "USE_MASS_INVITES"}), async (req: Request, res: Response) => { const { code } = req.params; const { guild_id } = await Invite.findOneOrFail({ code }) const { features } = await Guild.findOneOrFail({ id: guild_id}); From 4a6ed7ec1f538315bcb843cb665df98e987fae96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Sun, 26 Jun 2022 14:41:06 +0300 Subject: [PATCH 5/7] self-leave logic --- .../#guild_id/members/#member_id/index.ts | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts index 34836292..756b8955 100644 --- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts @@ -1,5 +1,5 @@ import { Request, Response, Router } from "express"; -import { Member, getPermission, Role, GuildMemberUpdateEvent, emitEvent, Sticker, Emoji, Guild } from "@fosscord/util"; +import { Member, getPermission, getRights, Role, GuildMemberUpdateEvent, emitEvent, Sticker, Emoji, Rights, Guild } from "@fosscord/util"; import { HTTPError } from "lambert-server"; import { route } from "@fosscord/api"; @@ -51,9 +51,16 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re router.put("/", route({}), async (req: Request, res: Response) => { // TODO: Lurker mode + + const rights = await getRights(req.user_id); let { guild_id, member_id } = req.params; - if (member_id === "@me") member_id = req.user_id; + if (member_id === "@me") { + member_id = req.user_id; + rights.hasThrow("JOIN_GUILDS"); + } else { + // TODO: join others by controller + } var guild = await Guild.findOneOrFail({ where: { id: guild_id } }); @@ -71,7 +78,16 @@ router.put("/", route({}), async (req: Request, res: Response) => { res.send({...guild, emojis: emoji, roles: roles, stickers: stickers}); }); -router.delete("/", route({ permission: "KICK_MEMBERS" }), async (req: Request, res: Response) => { +router.delete("/", route(), async (req: Request, res: Response) => { + const permission = await getPermission(req.user_id); + const rights = await getRights(req.user_id); + if (member_id !== "@me" || member_id === req.user_id) { + // TODO: unless force-joined + rights.hasThrow("SELF_LEAVE_GUILDS"); + } else { + rights.hasThrow("KICK_BAN_MEMBERS"); + permission.hasThrow("KICK_MEMBERS"); + } const { guild_id, member_id } = req.params; await Member.removeFromGuild(member_id, guild_id); From d94d94aa3cc4ab0358e5ef5c78764238fce3e3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Sun, 26 Jun 2022 14:42:06 +0300 Subject: [PATCH 6/7] fix the wrong name --- api/src/routes/guilds/#guild_id/members/#member_id/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts index 756b8955..38f2a529 100644 --- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts @@ -83,7 +83,7 @@ router.delete("/", route(), async (req: Request, res: Response) => { const rights = await getRights(req.user_id); if (member_id !== "@me" || member_id === req.user_id) { // TODO: unless force-joined - rights.hasThrow("SELF_LEAVE_GUILDS"); + rights.hasThrow("SELF_LEAVE_GROUPS"); } else { rights.hasThrow("KICK_BAN_MEMBERS"); permission.hasThrow("KICK_MEMBERS"); From 446ff62bfe32a110bd9d25f1d60aba635e7e74ad Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sun, 26 Jun 2022 23:33:30 +1000 Subject: [PATCH 7/7] Fix compile errors in latest --- .../#guild_id/members/#member_id/index.ts | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts index 38f2a529..c285abb3 100644 --- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts @@ -51,7 +51,7 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re router.put("/", route({}), async (req: Request, res: Response) => { // TODO: Lurker mode - + const rights = await getRights(req.user_id); let { guild_id, member_id } = req.params; @@ -59,28 +59,33 @@ router.put("/", route({}), async (req: Request, res: Response) => { member_id = req.user_id; rights.hasThrow("JOIN_GUILDS"); } else { - // TODO: join others by controller + // TODO: join others by controller } var guild = await Guild.findOneOrFail({ - where: { id: guild_id } }); + where: { id: guild_id } + }); var emoji = await Emoji.find({ - where: { guild_id: guild_id } }); + where: { guild_id: guild_id } + }); var roles = await Role.find({ - where: { guild_id: guild_id } }); + where: { guild_id: guild_id } + }); var stickers = await Sticker.find({ - where: { guild_id: guild_id } }); - + where: { guild_id: guild_id } + }); + await Member.addToGuild(member_id, guild_id); - res.send({...guild, emojis: emoji, roles: roles, stickers: stickers}); + res.send({ ...guild, emojis: emoji, roles: roles, stickers: stickers }); }); -router.delete("/", route(), async (req: Request, res: Response) => { +router.delete("/", route({}), async (req: Request, res: Response) => { const permission = await getPermission(req.user_id); const rights = await getRights(req.user_id); + const { guild_id, member_id } = req.params; if (member_id !== "@me" || member_id === req.user_id) { // TODO: unless force-joined rights.hasThrow("SELF_LEAVE_GROUPS"); @@ -88,7 +93,6 @@ router.delete("/", route(), async (req: Request, res: Response) => { rights.hasThrow("KICK_BAN_MEMBERS"); permission.hasThrow("KICK_MEMBERS"); } - const { guild_id, member_id } = req.params; await Member.removeFromGuild(member_id, guild_id); res.sendStatus(204);