From e31d8e85a62114e275cb495d0378109542824033 Mon Sep 17 00:00:00 2001 From: Daniel Huber <30466471+daniel0611@users.noreply.github.com> Date: Mon, 3 Jan 2022 11:02:42 +0100 Subject: [PATCH 01/31] Incrementing user discriminators Closes #328 --- util/src/entities/Config.ts | 2 ++ util/src/entities/User.ts | 49 +++++++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 9e25c7379..6993cc095 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -149,6 +149,7 @@ export interface ConfigValue { minUpperCase: number; minSymbols: number; }; + incrementingDiscriminators: boolean; // random otherwise }; regions: { default: string; @@ -335,6 +336,7 @@ export const DefaultConfigOptions: ConfigValue = { minUpperCase: 2, minSymbols: 0, }, + incrementingDiscriminators: false, }, regions: { default: "fosscord", diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts index bc852616d..5f2618e0e 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts @@ -64,7 +64,7 @@ export class User extends BaseClass { setDiscriminator(val: string) { const number = Number(val); if (isNaN(number)) throw new Error("invalid discriminator"); - if (number <= 0 || number > 10000) throw new Error("discriminator must be between 1 and 9999"); + if (number <= 0 || number >= 10000) throw new Error("discriminator must be between 1 and 9999"); this.discriminator = val.toString().padStart(4, "0"); } @@ -178,6 +178,35 @@ export class User extends BaseClass { ); } + private static async generateDiscriminator(username: string): Promise { + if (Config.get().register.incrementingDiscriminators) { + // discriminator will be incrementally generated + + // First we need to figure out the currently highest discrimnator for the given username and then increment it + const users = await User.find({ where: { username }, select: ["discriminator"] }); + const highestDiscriminator = Math.max(0, ...users.map((u) => Number(u.discriminator))); + + const discriminator = highestDiscriminator + 1; + if (discriminator >= 10000) { + return undefined; + } + + return discriminator.toString().padStart(4, "0"); + } else { + // discriminator will be randomly generated + + // randomly generates a discriminator between 1 and 9999 and checks max five times if it already exists + // TODO: is there any better way to generate a random discriminator only once, without checking if it already exists in the database? + for (let tries = 0; tries < 5; tries++) { + const discriminator = Math.randomIntBetween(1, 9999).toString().padStart(4, "0"); + const exists = await User.findOne({ where: { discriminator, username: username }, select: ["id"] }); + if (!exists) return discriminator; + } + + return undefined; + } + } + static async register({ email, username, @@ -194,21 +223,9 @@ export class User extends BaseClass { // trim special uf8 control characters -> Backspace, Newline, ... username = trimSpecial(username); - // discriminator will be randomly generated - let discriminator = ""; - - let exists; - // randomly generates a discriminator between 1 and 9999 and checks max five times if it already exists - // if it all five times already exists, abort with USERNAME_TOO_MANY_USERS error - // else just continue - // TODO: is there any better way to generate a random discriminator only once, without checking if it already exists in the database? - for (let tries = 0; tries < 5; tries++) { - discriminator = Math.randomIntBetween(1, 9999).toString().padStart(4, "0"); - exists = await User.findOne({ where: { discriminator, username: username }, select: ["id"] }); - if (!exists) break; - } - - if (exists) { + const discriminator = await User.generateDiscriminator(username); + if (!discriminator) { + // We've failed to generate a valid and unused discriminator throw FieldErrors({ username: { code: "USERNAME_TOO_MANY_USERS", From 029263372152accba11cb2a95b6340753de5b5c5 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Tue, 4 Jan 2022 20:51:04 +0300 Subject: [PATCH 02/31] Update documents --- .github/relase_body_template.md | 3 ++- api/package.json | 2 +- cdn/package.json | 2 +- dashboard/LICENSE | 14 ++++++++++++++ dashboard/package.json | 24 +++++++++++++++++++++++- dashboard/src/index.ts | 0 gateway/package.json | 2 +- rtc/LICENSE | 14 ++++++++++++++ webrtc/LICENSE | 29 +++++++++++------------------ 9 files changed, 67 insertions(+), 23 deletions(-) create mode 100644 dashboard/LICENSE create mode 100644 dashboard/src/index.ts create mode 100644 rtc/LICENSE diff --git a/.github/relase_body_template.md b/.github/relase_body_template.md index 34b468804..994e83d35 100644 --- a/.github/relase_body_template.md +++ b/.github/relase_body_template.md @@ -1,9 +1,10 @@ ## Notes ## Additions +- ## Fixes - +- ## Download - [Windows]() - [MacOS]() diff --git a/api/package.json b/api/package.json index 303d58716..182e53de2 100644 --- a/api/package.json +++ b/api/package.json @@ -30,7 +30,7 @@ "discord-open-source" ], "author": "Fosscord", - "license": "ISC", + "license": "GPLV3", "bugs": { "url": "https://github.com/fosscord/fosscord-server/issues" }, diff --git a/cdn/package.json b/cdn/package.json index fec43785c..d626e2f45 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -15,7 +15,7 @@ }, "keywords": [], "author": "", - "license": "ISC", + "license": "GPLV3", "bugs": { "url": "https://github.com/fosscord/fosscord-server/issues" }, diff --git a/dashboard/LICENSE b/dashboard/LICENSE new file mode 100644 index 000000000..f19bf5202 --- /dev/null +++ b/dashboard/LICENSE @@ -0,0 +1,14 @@ +Copyright (C) 2021 Fosscord and contributors + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . \ No newline at end of file diff --git a/dashboard/package.json b/dashboard/package.json index 0967ef424..1009d658e 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -1 +1,23 @@ -{} +{ + "name": "@fosscord/dashboard", + "version": "1.0.0", + "description": "Dashboard for Fosscord", + "main": "dist/index.js", + "types": "src/index.ts", + "scripts": { + "test": "npm run build && jest --coverage ./tests", + "build": "npx tsc -p .", + "start": "node dist/start.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/fosscord/fosscord-server.git" + }, + "keywords": [], + "author": "", + "license": "GPLV3", + "bugs": { + "url": "https://github.com/fosscord/fosscord-server/issues" + }, + "homepage": "https://github.com/fosscord/fosscord-server#readme" +} diff --git a/dashboard/src/index.ts b/dashboard/src/index.ts new file mode 100644 index 000000000..e69de29bb diff --git a/gateway/package.json b/gateway/package.json index e02a0000f..f976b3e7a 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -13,7 +13,7 @@ }, "keywords": [], "author": "Fosscord", - "license": "ISC", + "license": "GPLV3", "devDependencies": { "@types/amqplib": "^0.8.1", "@types/jsonwebtoken": "^8.5.0", diff --git a/rtc/LICENSE b/rtc/LICENSE new file mode 100644 index 000000000..f19bf5202 --- /dev/null +++ b/rtc/LICENSE @@ -0,0 +1,14 @@ +Copyright (C) 2021 Fosscord and contributors + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . \ No newline at end of file diff --git a/webrtc/LICENSE b/webrtc/LICENSE index e8ea215a4..f19bf5202 100644 --- a/webrtc/LICENSE +++ b/webrtc/LICENSE @@ -1,21 +1,14 @@ -MIT License +Copyright (C) 2021 Fosscord and contributors -Copyright (c) 2021 Fosscord (former Discord Open Source) +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . \ No newline at end of file From aaf5df14e1523ef70fcb9aa5ff9fc0b73ff42fee Mon Sep 17 00:00:00 2001 From: Chris Chrome Date: Wed, 5 Jan 2022 05:44:14 -0500 Subject: [PATCH 03/31] Add Role Icons (#574) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Role Icons Co-authored-by: Erkin Alp Güney * Cache coherency rules Co-authored-by: MANIKILLER Co-authored-by: ImAaronFR <96433859+ImAaronFR@users.noreply.github.com> --- api/src/routes/guilds/#guild_id/roles.ts | 11 ++- bundle/package.json | 2 +- cdn/src/Server.ts | 4 + cdn/src/routes/role-icons.ts | 102 +++++++++++++++++++++++ util/src/entities/Guild.ts | 2 + util/src/entities/Role.ts | 6 ++ 6 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 cdn/src/routes/role-icons.ts diff --git a/api/src/routes/guilds/#guild_id/roles.ts b/api/src/routes/guilds/#guild_id/roles.ts index b1875598b..b6894e3f2 100644 --- a/api/src/routes/guilds/#guild_id/roles.ts +++ b/api/src/routes/guilds/#guild_id/roles.ts @@ -8,7 +8,8 @@ import { GuildRoleDeleteEvent, emitEvent, Config, - DiscordApiErrors + DiscordApiErrors, + handleFile } from "@fosscord/util"; import { HTTPError } from "lambert-server"; import { route } from "@fosscord/api"; @@ -22,6 +23,8 @@ export interface RoleModifySchema { hoist?: boolean; // whether the role should be displayed separately in the sidebar mentionable?: boolean; // whether the role should be mentionable position?: number; + icon?: string; + unicode_emoji?: string; } export type RolePositionUpdateSchema = { @@ -58,7 +61,9 @@ router.post("/", route({ body: "RoleModifySchema", permission: "MANAGE_ROLES" }) guild_id: guild_id, managed: false, permissions: String(req.permission!.bitfield & BigInt(body.permissions || "0")), - tags: undefined + tags: undefined, + icon: null, + unicode_emoji: null }); await Promise.all([ @@ -105,6 +110,8 @@ router.patch("/:role_id", route({ body: "RoleModifySchema", permission: "MANAGE_ const { role_id, guild_id } = req.params; const body = req.body as RoleModifySchema; + if (body.icon) body.icon = await handleFile(`/role-icons/${role_id}`, body.icon as string); + const role = new Role({ ...body, id: role_id, diff --git a/bundle/package.json b/bundle/package.json index e0ae6156f..456c89d7b 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -107,4 +107,4 @@ "ws": "^7.4.2", "nanocolors": "^0.2.12" } -} \ No newline at end of file +} diff --git a/cdn/src/Server.ts b/cdn/src/Server.ts index cac34a80d..b8d71fa95 100644 --- a/cdn/src/Server.ts +++ b/cdn/src/Server.ts @@ -2,6 +2,7 @@ import { Server, ServerOptions } from "lambert-server"; import { Config, initDatabase, registerRoutes } from "@fosscord/util"; import path from "path"; import avatarsRoute from "./routes/avatars"; +import iconsRoute from "./routes/role-icons"; import bodyParser from "body-parser"; export interface CDNServerOptions extends ServerOptions {} @@ -40,6 +41,9 @@ export class CDNServer extends Server { this.app.use("/icons/", avatarsRoute); this.log("verbose", "[Server] Route /icons registered"); + this.app.use("/role-icons/", iconsRoute); + this.log("verbose", "[Server] Route /role-icons registered"); + this.app.use("/emojis/", avatarsRoute); this.log("verbose", "[Server] Route /emojis registered"); diff --git a/cdn/src/routes/role-icons.ts b/cdn/src/routes/role-icons.ts new file mode 100644 index 000000000..1ad1637d2 --- /dev/null +++ b/cdn/src/routes/role-icons.ts @@ -0,0 +1,102 @@ +import { Router, Response, Request } from "express"; +import { Config, Snowflake } from "@fosscord/util"; +import { storage } from "../util/Storage"; +import FileType from "file-type"; +import { HTTPError } from "lambert-server"; +import crypto from "crypto"; +import { multer } from "../util/multer"; + +//Role icons ---> avatars.ts modified + +// TODO: check premium and animated pfp are allowed in the config +// TODO: generate different sizes of icon +// TODO: generate different image types of icon +// TODO: delete old icons + +const STATIC_MIME_TYPES = [ + "image/png", + "image/jpeg", + "image/webp", + "image/svg+xml", + "image/svg", +]; +const ALLOWED_MIME_TYPES = [...STATIC_MIME_TYPES]; + +const router = Router(); + +router.post( + "/:role_id", + multer.single("file"), + async (req: Request, res: Response) => { + if (req.headers.signature !== Config.get().security.requestSignature) + throw new HTTPError("Invalid request signature"); + if (!req.file) throw new HTTPError("Missing file"); + const { buffer, mimetype, size, originalname, fieldname } = req.file; + const { role_id } = req.params; + + var hash = crypto + .createHash("md5") + .update(Snowflake.generate()) + .digest("hex"); + + const type = await FileType.fromBuffer(buffer); + if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) + throw new HTTPError("Invalid file type"); + + const path = `role-icons/${role_id}/${hash}.png`; + const endpoint = + Config.get().cdn.endpointPublic || "http://localhost:3003"; + + await storage.set(path, buffer); + + return res.json({ + id: hash, + content_type: type.mime, + size, + url: `${endpoint}${req.baseUrl}/${role_id}/${hash}`, + }); + } +); + +router.get("/:role_id", async (req: Request, res: Response) => { + var { role_id } = req.params; + //role_id = role_id.split(".")[0]; // remove .file extension + const path = `role-icons/${role_id}`; + + const file = await storage.get(path); + if (!file) throw new HTTPError("not found", 404); + const type = await FileType.fromBuffer(file); + + res.set("Content-Type", type?.mime); + res.set("Cache-Control", "public, max-age=31536000, must-revalidate"); + + return res.send(file); +}); + +router.get("/:role_id/:hash", async (req: Request, res: Response) => { + var { role_id, hash } = req.params; + //hash = hash.split(".")[0]; // remove .file extension + const path = `role-icons/${role_id}/${hash}`; + + const file = await storage.get(path); + if (!file) throw new HTTPError("not found", 404); + const type = await FileType.fromBuffer(file); + + res.set("Content-Type", type?.mime); + res.set("Cache-Control", "public, max-age=31536000, must-revalidate"); + + return res.send(file); +}); + +router.delete("/:role_id/:id", async (req: Request, res: Response) => { + if (req.headers.signature !== Config.get().security.requestSignature) + throw new HTTPError("Invalid request signature"); + const { role_id, id } = req.params; + const path = `role-icons/${role_id}/${id}`; + + await storage.delete(path); + + return res.send({ success: true }); +}); + +export default router; diff --git a/util/src/entities/Guild.ts b/util/src/entities/Guild.ts index 157f0921b..f4c94a642 100644 --- a/util/src/entities/Guild.ts +++ b/util/src/entities/Guild.ts @@ -340,6 +340,8 @@ export class Guild extends BaseClass { name: "@everyone", permissions: String("2251804225"), position: 0, + icon: null, + unicode_emoji: null }).save(); if (!body.channels || !body.channels.length) body.channels = [{ id: "01", type: 0, name: "general" }]; diff --git a/util/src/entities/Role.ts b/util/src/entities/Role.ts index 9fca99a5b..4b721b5bb 100644 --- a/util/src/entities/Role.ts +++ b/util/src/entities/Role.ts @@ -36,6 +36,12 @@ export class Role extends BaseClass { @Column() position: number; + @Column({ nullable: true }) + icon: string; + + @Column({ nullable: true }) + unicode_emoji: string; + @Column({ type: "simple-json", nullable: true }) tags?: { bot_id?: string; From a8bd9cc7954c9411df85277a8ff7ff44d2a041d0 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 6 Jan 2022 22:14:00 +0300 Subject: [PATCH 04/31] Correct the invite response --- 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 a2cf4cb5e..ac8131269 100644 --- a/api/src/routes/invites/index.ts +++ b/api/src/routes/invites/index.ts @@ -19,7 +19,7 @@ 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("You are not allowed to join this guild.", 401) + if(features.includes("INTERNAL_EMPLOYEE_ONLY") && (public_flags & 1) !== 1) throw new HTTPError("The Maze isn't meant for you.", 401) const invite = await Invite.joinGuild(req.user_id, code); From 1b42df8a32fc333ded943557dce0b0835fb11480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Sun, 9 Jan 2022 23:28:26 +0300 Subject: [PATCH 05/31] Update role-icons.ts --- cdn/src/routes/role-icons.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cdn/src/routes/role-icons.ts b/cdn/src/routes/role-icons.ts index 1ad1637d2..12aae8a4e 100644 --- a/cdn/src/routes/role-icons.ts +++ b/cdn/src/routes/role-icons.ts @@ -8,10 +8,9 @@ import { multer } from "../util/multer"; //Role icons ---> avatars.ts modified -// TODO: check premium and animated pfp are allowed in the config +// TODO: check user rights and perks and animated pfp are allowed in the policies // TODO: generate different sizes of icon // TODO: generate different image types of icon -// TODO: delete old icons const STATIC_MIME_TYPES = [ "image/png", From e275d2c77d7798f3dc3043f2afeaa3f9b07183c0 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Wed, 12 Jan 2022 01:27:55 +1100 Subject: [PATCH 06/31] Message fixes | Character limits and embed fixes (#581) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adds message character limits (#503) * Fixed message `embeds` being ignored for `embed` * Update Message.ts Co-authored-by: Erkin Alp Güney --- .../channels/#channel_id/messages/index.ts | 2 +- api/src/util/handlers/Message.ts | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/api/src/routes/channels/#channel_id/messages/index.ts b/api/src/routes/channels/#channel_id/messages/index.ts index b2fb615c3..c3d3d408e 100644 --- a/api/src/routes/channels/#channel_id/messages/index.ts +++ b/api/src/routes/channels/#channel_id/messages/index.ts @@ -172,7 +172,7 @@ router.post( } const channel = await Channel.findOneOrFail({ where: { id: channel_id }, relations: ["recipients", "recipients.user"] }); - const embeds = []; + const embeds = body.embeds || []; if (body.embed) embeds.push(body.embed); let message = await handleMessage({ ...body, diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index ba6763948..294141774 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -17,13 +17,14 @@ import { User, Application, Webhook, - Attachment + Attachment, + Config, } from "@fosscord/util"; import { HTTPError } from "lambert-server"; import fetch from "node-fetch"; import cheerio from "cheerio"; import { MessageCreateSchema } from "../../routes/channels/#channel_id/messages"; - +const allow_empty = false; // TODO: check webhook, application, system author, stickers // TODO: embed gifs/videos/images @@ -55,6 +56,10 @@ export async function handleMessage(opts: MessageOptions): Promise { type: opts.type ?? 0 }); + if (message.content && message.content.length > Config.get().limits.message.maxCharacters) { + throw new HTTPError("Content length over max character limit") + } + // TODO: are tts messages allowed in dm channels? should permission be checked? if (opts.author_id) { message.author = await User.getPublicUser(opts.author_id); @@ -67,7 +72,7 @@ export async function handleMessage(opts: MessageOptions): Promise { } const permission = await getPermission(opts.author_id, channel.guild_id, opts.channel_id); - permission.hasThrow("SEND_MESSAGES"); + permission.hasThrow("SEND_MESSAGES"); // TODO: add the rights check if (permission.cache.member) { message.member = permission.cache.member; } @@ -75,6 +80,7 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.tts) permission.hasThrow("SEND_TTS_MESSAGES"); if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); + // code below has to be redone when we add custom message routing and cross-channel replies if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); // TODO: should be checked if the referenced message exists? @@ -83,7 +89,7 @@ export async function handleMessage(opts: MessageOptions): Promise { } // TODO: stickers/activity - if (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length) { + if (!allow_empty || (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length)) { throw new HTTPError("Empty messages are not allowed", 50006); } @@ -93,7 +99,7 @@ export async function handleMessage(opts: MessageOptions): Promise { var mention_user_ids = [] as string[]; var mention_everyone = false; - if (content) { + if (content) { // TODO: explicit-only mentions message.content = content.trim(); for (const [_, mention] of content.matchAll(CHANNEL_MENTION)) { if (!mention_channel_ids.includes(mention)) mention_channel_ids.push(mention); @@ -135,7 +141,7 @@ export async function postHandleMessage(message: Message) { const data = { ...message }; data.embeds = data.embeds.filter((x) => x.type !== "link"); - links = links.slice(0, 5); // embed max 5 links + links = links.slice(0, 20); // embed max 20 links — TODO: make this configurable with instance policies for (const link of links) { try { @@ -188,7 +194,7 @@ export async function sendMessage(opts: MessageOptions) { emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, data: message.toJSON() } as MessageCreateEvent) ]); - postHandleMessage(message).catch((e) => {}); // no await as it shouldnt block the message send function and silently catch error + postHandleMessage(message).catch((e) => {}); // no await as it should catch error non-blockingly return message; } From 1887703c56b56ec7d9f2c66f5b740cb30db08122 Mon Sep 17 00:00:00 2001 From: ced777ric Date: Tue, 11 Jan 2022 18:38:10 +0100 Subject: [PATCH 07/31] fix the message endpoint always returning Empty message error (cherry picked from commit 8b8344e860920f3c3b911dfde1a7a078fef43c9b) --- api/src/util/handlers/Message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index 294141774..a3055aed7 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -89,7 +89,7 @@ export async function handleMessage(opts: MessageOptions): Promise { } // TODO: stickers/activity - if (!allow_empty || (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length)) { + if (!allow_empty && (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length)) { throw new HTTPError("Empty messages are not allowed", 50006); } From d10c53fffe3a31ee10001c86ca4cea479146c5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Tue, 11 Jan 2022 21:58:51 +0300 Subject: [PATCH 08/31] Use the boomerang logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc831e627..1bcea1e32 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- +

Fosscord Server

From 90ba897ca4283d549208df1efa56795f1d133843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Wed, 12 Jan 2022 09:55:14 +0300 Subject: [PATCH 09/31] Schema change for group specific emojis --- util/src/entities/Emoji.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/src/entities/Emoji.ts b/util/src/entities/Emoji.ts index 03218375b..32d39234f 100644 --- a/util/src/entities/Emoji.ts +++ b/util/src/entities/Emoji.ts @@ -10,7 +10,7 @@ export class Emoji extends BaseClass { animated: boolean; @Column() - available: boolean; // whether this emoji can be used, may be false due to loss of Server Boosts + available: boolean; // whether this emoji can be used, may be false due to various reasons @Column() guild_id: string; @@ -40,4 +40,7 @@ export class Emoji extends BaseClass { @Column({ type: "simple-array" }) roles: string[]; // roles this emoji is whitelisted to (new discord feature?) + + @Column({ type: "simple-array" }) + groups: string[]; // user groups this emoji is whitelisted to (Fosscord extension) } From 4baa6e0620760b93e68e780b8746cf2a257800df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Wed, 12 Jan 2022 09:58:22 +0300 Subject: [PATCH 10/31] Add cross channel replies Resolves #533 --- api/src/util/handlers/Message.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index a3055aed7..dae6f7e8c 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -81,8 +81,10 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); // code below has to be redone when we add custom message routing and cross-channel replies - if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); - if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); + if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) { + if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); + if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); + } // TODO: should be checked if the referenced message exists? // @ts-ignore message.type = MessageType.REPLY; From 26781e736c5877d31f7a1fbde3bebe188caa008a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Wed, 12 Jan 2022 10:19:05 +0300 Subject: [PATCH 11/31] Update Guild.ts --- util/src/entities/Guild.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/util/src/entities/Guild.ts b/util/src/entities/Guild.ts index f4c94a642..00f92679b 100644 --- a/util/src/entities/Guild.ts +++ b/util/src/entities/Guild.ts @@ -330,6 +330,7 @@ export class Guild extends BaseClass { }).save(); // we have to create the role _after_ the guild because else we would get a "SQLITE_CONSTRAINT: FOREIGN KEY constraint failed" error + // TODO: make the @everyone a pseudorole that is dynamically generated at runtime so we can save storage await new Role({ id: guild_id, guild_id: guild_id, From 072a60fb03fbf5f261c0e9888ce49847e1a350d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Wed, 12 Jan 2022 16:04:34 +0300 Subject: [PATCH 12/31] Fix the feature check --- api/src/util/handlers/Message.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index dae6f7e8c..92bb23354 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -2,6 +2,7 @@ import { Channel, Embed, emitEvent, + Guild, Message, MessageCreateEvent, MessageUpdateEvent, @@ -81,6 +82,7 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); // code below has to be redone when we add custom message routing and cross-channel replies + const guild = await Guild.findOneOrFail({ id: guild_id }); if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) { if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); From cc698225a0e6cab61363b3585bbab30d022c0207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Wed, 12 Jan 2022 16:13:13 +0300 Subject: [PATCH 13/31] update defaults --- util/src/entities/Guild.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/util/src/entities/Guild.ts b/util/src/entities/Guild.ts index 00f92679b..6a1df4d6f 100644 --- a/util/src/entities/Guild.ts +++ b/util/src/entities/Guild.ts @@ -213,7 +213,7 @@ export class Guild extends BaseClass { owner: User; @Column({ nullable: true }) - preferred_locale?: string; // only community guilds can choose this + preferred_locale?: string; @Column({ nullable: true }) premium_subscription_count?: number; @@ -301,22 +301,22 @@ export class Guild extends BaseClass { name: body.name || "Fosscord", icon: await handleFile(`/icons/${guild_id}`, body.icon as string), region: Config.get().regions.default, - owner_id: body.owner_id, + owner_id: body.owner_id, // TODO: need to figure out a way for ownerless guilds and multiply-owned guilds afk_timeout: 300, - default_message_notifications: 0, + default_message_notifications: 1, // defaults effect: setting the push default at mentions-only will save a lot explicit_content_filter: 0, features: [], id: guild_id, max_members: 250000, max_presences: 250000, - max_video_channel_users: 25, + max_video_channel_users: 200, presence_count: 0, member_count: 0, // will automatically be increased by addMember() mfa_level: 0, preferred_locale: "en-US", premium_subscription_count: 0, premium_tier: 0, - system_channel_flags: 0, + system_channel_flags: 4, // defaults effect: suppress the setup tips to save performance unavailable: false, nsfw: false, nsfw_level: 0, @@ -326,7 +326,7 @@ export class Guild extends BaseClass { description: "No description", welcome_channels: [], }, - widget_enabled: false, + widget_enabled: true, // NB: don't set it as false to prevent artificial restrictions }).save(); // we have to create the role _after_ the guild because else we would get a "SQLITE_CONSTRAINT: FOREIGN KEY constraint failed" error @@ -337,6 +337,7 @@ export class Guild extends BaseClass { color: 0, hoist: false, managed: false, + // NB: in Fosscord, every role will be non-managed, as we use user-groups instead of roles for managed groups mentionable: false, name: "@everyone", permissions: String("2251804225"), @@ -358,7 +359,6 @@ export class Guild extends BaseClass { for (const channel of body.channels?.sort((a, b) => (a.parent_id ? 1 : -1))) { var id = ids.get(channel.id) || Snowflake.generate(); - // TODO: should we abort if parent_id is a category? (to disallow sub category channels) var parent_id = ids.get(channel.parent_id); await Channel.createChannel({ ...channel, guild_id, id, parent_id }, body.owner_id, { From 41fca13db2e88e4e2c53544658ee99cf1800f664 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Thu, 13 Jan 2022 18:45:23 +1100 Subject: [PATCH 14/31] Fix typo in commit 277b28c --- api/src/util/handlers/Message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index 92bb23354..216643686 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -82,7 +82,7 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); // code below has to be redone when we add custom message routing and cross-channel replies - const guild = await Guild.findOneOrFail({ id: guild_id }); + const guild = await Guild.findOneOrFail({ id: channel.guild_id }); if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) { if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); From 4f6a1a8e12a04696692f61efa2df161b9b669848 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Thu, 13 Jan 2022 20:02:09 +0000 Subject: [PATCH 15/31] Add erlpack warning (#587) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add warning if erlpack is missing Co-authored-by: Erkin Alp Güney --- gateway/src/util/Send.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gateway/src/util/Send.ts b/gateway/src/util/Send.ts index 196d4205c..c8627b032 100644 --- a/gateway/src/util/Send.ts +++ b/gateway/src/util/Send.ts @@ -1,7 +1,9 @@ var erlpack: any; try { erlpack = require("@yukikaze-bot/erlpack"); -} catch (error) {} +} catch (error) { + console.log("Missing @yukikaze-bot/erlpack, electron-based desktop clients designed for discord.com will not be able to connect!"); +} import { Payload, WebSocket } from "@fosscord/gateway"; export async function Send(socket: WebSocket, data: Payload) { From aa38c188ea9e62c7dc8606938b126283457d9768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Fri, 14 Jan 2022 23:03:57 +0300 Subject: [PATCH 16/31] Further debranding of premium tiers --- .../skus/#sku_id/subscription-plans.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index 723a51607..d0b533d81 100644 --- a/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -14,7 +14,7 @@ const skus = new Map([ interval_count: 1, tax_inclusive: true, sku_id: "521842865731534868", - currency: "usd", + currency: "eur", price: 0, price_tier: null }, @@ -25,7 +25,7 @@ const skus = new Map([ interval_count: 1, tax_inclusive: true, sku_id: "521842865731534868", - currency: "usd", + currency: "eur", price: 0, price_tier: null } @@ -36,23 +36,23 @@ const skus = new Map([ [ { id: "511651871736201216", - name: "Premium Classic Monthly", + name: "Individual Premium Tier 1 Monthly", interval: 1, interval_count: 1, tax_inclusive: true, sku_id: "521846918637420545", - currency: "usd", + currency: "eur", price: 0, price_tier: null }, { id: "511651876987469824", - name: "Premium Classic Yearly", + name: "Individual Premium Tier 1 Yearly", interval: 2, interval_count: 1, tax_inclusive: true, sku_id: "521846918637420545", - currency: "usd", + currency: "eur", price: 0, price_tier: null } @@ -63,34 +63,34 @@ const skus = new Map([ [ { id: "642251038925127690", - name: "Premium Quarterly", + name: "Individual Premium Tier 2 Quarterly", interval: 1, interval_count: 3, tax_inclusive: true, sku_id: "521847234246082599", - currency: "usd", + currency: "eur", price: 0, price_tier: null }, { id: "511651880837840896", - name: "Premium Monthly", + name: "Individual Premium Tier 2 Monthly", interval: 1, interval_count: 1, tax_inclusive: true, sku_id: "521847234246082599", - currency: "usd", + currency: "eur", price: 0, price_tier: null }, { id: "511651885459963904", - name: "Premium Yearly", + name: "Individual Premium Tier 2 Yearly", interval: 2, interval_count: 1, tax_inclusive: true, sku_id: "521847234246082599", - currency: "usd", + currency: "eur", price: 0, price_tier: null } @@ -101,25 +101,25 @@ const skus = new Map([ [ { id: "590665532894740483", - name: "Server Boost Monthly", + name: "Crowd Premium Monthly", interval: 1, interval_count: 1, tax_inclusive: true, sku_id: "590663762298667008", discount_price: 0, - currency: "usd", + currency: "eur", price: 0, price_tier: null }, { id: "590665538238152709", - name: "Server Boost Yearly", + name: "Crowd Premium Yearly", interval: 2, interval_count: 1, tax_inclusive: true, sku_id: "590663762298667008", discount_price: 0, - currency: "usd", + currency: "eur", price: 0, price_tier: null } From dbe88d5b188fc91c560da3b8a839b743acc543b0 Mon Sep 17 00:00:00 2001 From: Chris Chrome Date: Sun, 16 Jan 2022 23:51:04 -0500 Subject: [PATCH 17/31] Revert previous commit --- .../skus/#sku_id/subscription-plans.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index d0b533d81..723a51607 100644 --- a/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -14,7 +14,7 @@ const skus = new Map([ interval_count: 1, tax_inclusive: true, sku_id: "521842865731534868", - currency: "eur", + currency: "usd", price: 0, price_tier: null }, @@ -25,7 +25,7 @@ const skus = new Map([ interval_count: 1, tax_inclusive: true, sku_id: "521842865731534868", - currency: "eur", + currency: "usd", price: 0, price_tier: null } @@ -36,23 +36,23 @@ const skus = new Map([ [ { id: "511651871736201216", - name: "Individual Premium Tier 1 Monthly", + name: "Premium Classic Monthly", interval: 1, interval_count: 1, tax_inclusive: true, sku_id: "521846918637420545", - currency: "eur", + currency: "usd", price: 0, price_tier: null }, { id: "511651876987469824", - name: "Individual Premium Tier 1 Yearly", + name: "Premium Classic Yearly", interval: 2, interval_count: 1, tax_inclusive: true, sku_id: "521846918637420545", - currency: "eur", + currency: "usd", price: 0, price_tier: null } @@ -63,34 +63,34 @@ const skus = new Map([ [ { id: "642251038925127690", - name: "Individual Premium Tier 2 Quarterly", + name: "Premium Quarterly", interval: 1, interval_count: 3, tax_inclusive: true, sku_id: "521847234246082599", - currency: "eur", + currency: "usd", price: 0, price_tier: null }, { id: "511651880837840896", - name: "Individual Premium Tier 2 Monthly", + name: "Premium Monthly", interval: 1, interval_count: 1, tax_inclusive: true, sku_id: "521847234246082599", - currency: "eur", + currency: "usd", price: 0, price_tier: null }, { id: "511651885459963904", - name: "Individual Premium Tier 2 Yearly", + name: "Premium Yearly", interval: 2, interval_count: 1, tax_inclusive: true, sku_id: "521847234246082599", - currency: "eur", + currency: "usd", price: 0, price_tier: null } @@ -101,25 +101,25 @@ const skus = new Map([ [ { id: "590665532894740483", - name: "Crowd Premium Monthly", + name: "Server Boost Monthly", interval: 1, interval_count: 1, tax_inclusive: true, sku_id: "590663762298667008", discount_price: 0, - currency: "eur", + currency: "usd", price: 0, price_tier: null }, { id: "590665538238152709", - name: "Crowd Premium Yearly", + name: "Server Boost Yearly", interval: 2, interval_count: 1, tax_inclusive: true, sku_id: "590663762298667008", discount_price: 0, - currency: "eur", + currency: "usd", price: 0, price_tier: null } From d5987856450545ab551b8737a8a9c6e86692eafd Mon Sep 17 00:00:00 2001 From: Featyre Date: Sun, 23 Jan 2022 02:03:14 +0800 Subject: [PATCH 18/31] Branding updates --- api/assets/fosscord-login.css | 6 +++--- api/assets/fosscord.css | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/api/assets/fosscord-login.css b/api/assets/fosscord-login.css index bc32b82ea..34cf542bf 100644 --- a/api/assets/fosscord-login.css +++ b/api/assets/fosscord-login.css @@ -22,10 +22,10 @@ h3.title-jXR8lp.marginBottom8-AtZOdT.base-1x0h_U.size24-RIRrxO::after { /* Logo in top left when bg removed */ #app-mount > div.app-1q1i1E > div > a { /* replace me: original dimensions: 130x36 */ - background: url(https://raw.githubusercontent.com/fosscord/fosscord/9900329e5ef2c17bdeb6893e04c0511f72027f97/assets/logo/temp.svg); + background: url(https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Gradient.svg); + width: 130px; + height: 23px; background-size: contain; - width: 128px; - height: 128px; border-radius: 50%; } diff --git a/api/assets/fosscord.css b/api/assets/fosscord.css index 6a8b4c64e..6078fdeb4 100644 --- a/api/assets/fosscord.css +++ b/api/assets/fosscord.css @@ -13,10 +13,14 @@ /* home button icon */ #app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div.tutorialContainer-2sGCg9 > div > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div > div { - background-image: url(https://raw.githubusercontent.com/fosscord/fosscord/9900329e5ef2c17bdeb6893e04c0511f72027f97/assets/logo/temp.svg); + background-image: url(https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Icon-Rounded-Subtract.svg); background-size: contain; border-radius: 50%; } + +#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div.tutorialContainer-2sGCg9 > div > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div > div, #app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div.tutorialContainer-2sGCg9 > div > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div > div:hover { + background-color: white; +} /* Login QR */ #app-mount > div.app-1q1i1E > div > div > div > div > form > div > div > div.transitionGroup-aR7y1d.qrLogin-1AOZMt, #app-mount > div.app-1q1i1E > div > div > div > div > form > div > div > div.verticalSeparator-3huAjp, From 46860979be03995b4ada511598cab0b539138485 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Jan 2022 23:09:07 +0000 Subject: [PATCH 19/31] Bump node-fetch from 2.6.2 to 3.1.1 in /api Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.2 to 3.1.1. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.2...v3.1.1) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api/package-lock.json | Bin 810634 -> 830717 bytes api/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/package-lock.json b/api/package-lock.json index aa0c07c5ac7e42777567eeb0b1192af1eb83d085..28af2e8b1ca5b3b2a69c3a28342ce75f47ca53da 100644 GIT binary patch delta 11874 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 delta 3040 zcmcImeN>cH8b9~W`@VDUyaNNu%6}jI?4CVm-#_Mk z?tPz+`#itr{+_vcDxrD*w3cJKx$`q{Wt3KGXQ5KX>bbQ05X?Ff zt?dM%Wvvt_@^xev8C~L=L(-00HhzuGdvKP()xQkujh*ocB>ekFI#%foo`c7#EGq^@9GVP5>6w~l0+x>Ot=xO zdORDW#dVsO;gFgR2=$TJ8{}#8iNgH+2(N-M~d+&#AWg(6)i4KkSXz2 zNA%An2NeJ2`z{j3P+_H35m!Q*2!<<2CIV*4W6?iTKHyWIbRWr+efb~FkbC_uo?1%& zs`u^vZWVdV>UY-gD7hxVRwY+>?XaavKI0SGYUIN{Pk(PF#Xs{E$P-kgN6V9BrMPUQ zi}XHwn088~xEV{#qWmlQb$_4}7V03f?|y)ks#cFnNO)s`6jeMwD}Pyf?t|;@nNqi) za$RkCW5u%D%H1W)>SyGnl-5)xH{MxOu(+5WzO%OA)t zT2Po#l~tKJueNr@9qyW}?7M5{r{}GKixUUFu+nz_k#fG48_*X@En-O+?UVi3&v{oZ`d0pa*MP-#cUOxiHoRZ~zOtaNYQ zY8Dx@=*m9X2R+R)+LmtCrz22P%y)JM@oI}4A+v} zlN?R+dGFq|8Z% zd6ovDd#wh~KW8ekbYPn1vh{pY#T^~9ey@~aYmhu-} z+AR4bk&pEZUsT25Q>@eA3yzXKTonV)uro}Y+{wlS8b*q*z2Hn%%@|75!lb>-nicVo z-Z+tn$i3_n8R~P)EYf<}27;4`TAfVEhE4t8*}wvHLi$!Z)c z&J40mI-FLtG4lM!Y^X}?FXWdLxKh;>;`UO0km^VN%i!2sEDQzdeB8qS3sXNZYnEfA z*c%#YIIQ>cr$qn#T*%()hTz6htpFNHAH=NNc_cDER4sUIJr6|MDK4QYP9KfSc3Ost zRF;5+m0ZS)Hi_ZzLW31Aj-z_)eT`YgwQ_#98OBKlGah}2UlrTe^P_Qo)VsU+Jm!lf zX6)f_N+aT4UTnElv2-^H74P-)PjxtXoOk1e6Z|E=+Sd1Ycp!eVMmy-$zwry-g8;L$ zRlApXRrJo`R%q;720qCUDSFRyh2q!+?G_BaB{Mjm(=f4L;LAtCzjcY*NBY_E55D9F z`&VfF+a8GSEo`>PB!+Kd`~|yrvcV);CKy^(kv84%)2YzL+;%*@*pP&?Mq{98Ut@UT zb%7)`iiyu=t7N0ta!@sg{O`0_@_(VlbgeJM_Ooi94#OX*8Ue Date: Sat, 22 Jan 2022 23:09:41 +0000 Subject: [PATCH 20/31] Bump node-fetch from 2.6.2 to 3.1.1 in /gateway Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.2 to 3.1.1. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.2...v3.1.1) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- gateway/package-lock.json | Bin 432728 -> 543051 bytes gateway/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gateway/package-lock.json b/gateway/package-lock.json index a9813b6f2685458f684fca6a70ebed92a727a058..d02106f803bfbede3f5b3658e822a962e7cd2c1d 100644 GIT binary patch delta 26502 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 G_WvK+oU4NX delta 13321 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 diff --git a/gateway/package.json b/gateway/package.json index f976b3e7a..7daddfc0d 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -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" From bb07db99790cb052b741d4fc28d38cb606f1ee6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Jan 2022 04:42:07 +0000 Subject: [PATCH 21/31] Bump node-fetch from 2.6.2 to 2.6.7 in /util Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.2 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.2...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- util/package-lock.json | Bin 491038 -> 497311 bytes util/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/util/package-lock.json b/util/package-lock.json index c6f2ed6fc7f3ab3f4e94143563280098d4bfec91..2b33b7de44ff37d98a5d8cd383b31bbd02e352fa 100644 GIT binary patch delta 3360 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 delta 2361 zcmcIleNa@_6`%X=yZ5onHw(Lbqbr%lD7y<(P-?mAn)5%Q#$ouQQ zch5Wbch33!ez)gDZ1;3bZvcTymuRqJE=jR0v@C$qQpu=B6V+DU=&E!%U7NR<7tb=6 z*epqw#3b{4y-qylMpspJLQQpZWv#ZEWJ$Ipsu#(V?nvqEdurH4lNvbm2(~Aa2zSm^ zJyEx`8`Xj9vFgcdQ{Y%aX50hU6#{u_#Pc~$wGBT|C*Lu`o~0zw{mLKaM8mByYJy{9 zvIFWX6rFnLPJkLU9i=wkzYUXi5(S+z)CY1M0&3)Rv^qHcchDz`KN9v!eyVknyZs;7 z30zL0W(b;)_0U!%nY$85j3@fX6CZsU?6yvp64-E!)`+cf@NJfi5cH|6a~C{1O`!gu zczyksB-CB>c{kM{-cBVP7g6FQT5#7+3h*i=L8^5)ey@$`pnj6ig{NMk3~t9LkudA~ z^fHcek{JLmU7_g^?avIJa`0>zkpiLRfH>h-lTs8&k?bbqRSuPycmK$lx(-c;RMSCw4-Y*AHnYWAXH zmouexh3h-zo9kSe_DZ|Mwkq4TaCwnqdviu>Lvzi>tb+CV%Ny*@%-p7?+GWqW>{&TY zYctlgK+^#!5+aUB54FMJn%AT(ore}UbV4!{c$L#M82YWmu=u2uL)16ht&n$43~HoT zGQpfwGHZSLYFBH4Yh`kNP4PUNBX?6nVaCSBMe|l?RxPjNx3szvX(#h-*B zLIZF|8okRsDh|ijSI|Gt(q`FTO^sZQKVn4LNv8=|HVA^GHPTNsJz$lKz8ej7!__t9!O^-3WK_- z?JH7C=%(RcE49wU)M4@v>@jF-mi!=Uy%YyQhlMt)_ zxVAxPX=V%94f&J_CiA!fg=?)M82JxbCUE5d3&UqVlS2s{OkknVHp2Zpj%0wI5$*%S_vKM7 z21HB<{HajUVaz{ePM~L<;t$0S6G?Ic)8Ngkxe^JpxY zk*RiCDE53V*L#=n3mXf8okk@Nw-L6?*Zcoxe(X1Xcq@V>>Hkxs{|j;i96Txq!2oiYWMN!sYXDer5bhnZWy#^kDPjs2ProKllF|MbS566dTjh zgl|913HeG%!Y!`iXbEpoydAw#BMf!qgpg%#4WEX4y`00`OL9P$k0j&0jXeE-8A#DL zV;~;9SDf4(;elqrv%7c-!LWAzlO=fIZ64#}ov<(o!L36ff~M62{C1#L2YL*HdrLaH zg1WHmFWegSZ*FzH$wE&LDtQc2xbhIzDayDvQustU-tkfDP1+=(emAX!euH9E`)v$@ z;uRklyewq-a=UW;zZe6Sc!i^3j&h%3!nc%L%$xD%C2^k)?57oQDnYsH1$@Jz9RE69 v>`PKMg}|b7%n1FQ_ Date: Sun, 23 Jan 2022 04:42:07 +0000 Subject: [PATCH 22/31] Bump node-fetch from 2.6.6 to 2.6.7 in /cdn Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- cdn/package-lock.json | Bin 500032 -> 500169 bytes cdn/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cdn/package-lock.json b/cdn/package-lock.json index 367f411e68a970a65c9bf3e0ca71f00b999847b5..a6c2df2d47d99fcb8fc19e17c0d4d401913cb995 100644 GIT binary patch delta 391 zcmX?bNbclexd~e)Pi9q`Ea1jD{hv7t$Hu2#OpNB64VdkjC(ANRPhQSuGCgcEqsVlp ze=Hu&((LWh?2JInv|XB=`I6oABpW9EX>ZtAr(3^Z6Q5ob$*2$-mE{}Y=9(5(VVb2~ zX;kTEZ0cQAVOs2Fp6yaqQRM6qGo1eMHIohpOmzChHYV$K19#@_2JS5DwxM{Y9q5_uPXAbszNDK6rZ41SmjU@e WVfuu}Y+}>*c`~zaS9r;$umb?@GKBvC delta 331 zcmX?kSnj|fxd~gCJ%gPmPmERDct41V(Qva7vpw@ Date: Sun, 23 Jan 2022 04:45:47 +0000 Subject: [PATCH 23/31] Bump node-fetch from 2.6.5 to 2.6.7 in /bundle Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.5 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.5...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- bundle/package-lock.json | Bin 606883 -> 607272 bytes bundle/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/package-lock.json b/bundle/package-lock.json index e8b99037923888c5a45a3d5e0cb11678489edec6..d026e7c7785fe4ff8a10d165315f79892d994f10 100644 GIT binary patch delta 603 zcmZ47s=A^>bwd#=qxt4y*4eBRD}|U73o<88l$)O3%_1w1lbM{FSDdP3rJ&><;1gy% z{o^$zmFad`Z0wT_*qtWVGjdL!Wx*D^{e%@;FXQA5yla?^^$a)1^L=LqnUtK8H*umS zD_G}bK^OJu5A4|THVX(pW@I# zDXF??sU^u7`nviEj;@iOnV$LdjWZbKL!+{M1KeEG!YWL&v@4A&-Hc7Wt13*3-ORIH zswzrdvdpS7Jxtu(lKcxS%&WXzqWmf>DqSnQJd+Ge{oUP6{BlYxJw4n!eVwv{a!d@v zQp%G3Qj#Wrv{0CCE5V^KEsjxgdd^B_k?FrLu_y?n<|XH+Wag!VLN(4n&v3e9Hlq#) zOmuo-4~zBmh84_Q?F&{i12N0?1uI$iOa_JQ_IO)1A7ET<2L@gx6T<85{;q7>{ax7; TFAcPx+Z81^wkt|-HfaF>XS~JN delta 472 zcmZ3{p}M$Lbwd&B^tcX2?#;EV6Imy}cIKX*@R5;c`f~v$*~xL-+{~WA&XW^^ zJkN@B*YwmXvm{IR^zewJ?5Hf$$SCu)3T>kzOOr$+SMAWuqT&KGkK%xkfSml?v=on$ zf)afvgX9$Nvdr@A{6t@~g37W`|LGs+F)2=eu#(w#@}G-h)9UDm)3Rz7dCAsh_cxd wa?>NuvG7gq;nHb8;KsK7fE&BoC6G5lY2l56>4I Date: Sun, 23 Jan 2022 04:45:21 +0000 Subject: [PATCH 24/31] Bump node-fetch from 2.6.6 to 2.6.7 in /api/scripts/stresstest Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- api/scripts/stresstest/package-lock.json | Bin 29134 -> 29271 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/api/scripts/stresstest/package-lock.json b/api/scripts/stresstest/package-lock.json index ca84a8cf4fff99e8a6aa59d3771c3fe512eb9502..81c9b817abcc9af86421cec78987cefed923e50b 100644 GIT binary patch delta 349 zcmX^2nDP1(#trLL7|ka$YUxeBry>Jn84AgVMP>O0xVffk63CK;IeySthA<&;=@dboM|I%Nmt zm>7nolqLJ6Bn3_`P|e}i;o{`vR4PbKEpnNh$R(PRnwOlPl9`vTWTl`KXP{@OXP^X9 zQH!K5wIDSQq%JeH*f+H#5vZ~nq=ZumNiRf%Qz^foBr`uRF$buqq^L9%tgd#lAglD| PPpZD=bn@t?xO2h)x-x4D delta 237 zcmccqgz?;C#trLL7|kY64Aq-_PelgEG8B>zi?Yx+D+|gA33bj0PVr3lO*A#kst7d6 zDJs|Zsx%Gu4>vUMPfBz&G1m`r%_(;DGfFlM$g@ZaNq2J(&(qILDzAzNakVHcFEWg* nsxY!BD^5+0aCMwqpqeweTt#eiwVJOvz3dc>mfpN1ZnH1|V}?)9 From f9ff5b35f3b65d72302ff131cdd6375d572c1842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Sun, 23 Jan 2022 17:46:04 +0300 Subject: [PATCH 25/31] Closed-join guilds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves #537 Signed-off-by: Erkin Alp Güney --- api/src/routes/invites/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/routes/invites/index.ts b/api/src/routes/invites/index.ts index ac8131269..37e9e05a3 100644 --- a/api/src/routes/invites/index.ts +++ b/api/src/routes/invites/index.ts @@ -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); From 35c7489f72feb3c432d67e2d6d1d0ef8c70c08a4 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 14 Jan 2022 01:20:26 +1100 Subject: [PATCH 26/31] Added `ILLEGAL_CHANNEL_NAMES` and `NULL_CHANNEL_NAMES` guild feature flags --- util/src/entities/Channel.ts | 682 ++++++++++++++------------- util/src/util/InvisibleCharacters.ts | 55 +++ util/src/util/index.ts | 1 + 3 files changed, 406 insertions(+), 332 deletions(-) create mode 100644 util/src/util/InvisibleCharacters.ts diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts index 4036b5d66..e7e0bace5 100644 --- a/util/src/entities/Channel.ts +++ b/util/src/entities/Channel.ts @@ -1,332 +1,350 @@ -import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; -import { Guild } from "./Guild"; -import { PublicUserProjection, User } from "./User"; -import { HTTPError } from "lambert-server"; -import { containsAll, emitEvent, getPermission, Snowflake, trimSpecial } from "../util"; -import { ChannelCreateEvent, ChannelRecipientRemoveEvent } from "../interfaces"; -import { Recipient } from "./Recipient"; -import { Message } from "./Message"; -import { ReadState } from "./ReadState"; -import { Invite } from "./Invite"; -import { VoiceState } from "./VoiceState"; -import { Webhook } from "./Webhook"; -import { DmChannelDTO } from "../dtos"; - -export enum ChannelType { - GUILD_TEXT = 0, // a text channel within a server - DM = 1, // a direct message between users - GUILD_VOICE = 2, // a voice channel within a server - GROUP_DM = 3, // a direct message between multiple users - GUILD_CATEGORY = 4, // an organizational category that contains up to 50 channels - GUILD_NEWS = 5, // a channel that users can follow and crosspost into their own server - GUILD_STORE = 6, // a channel in which game developers can sell their game on Discord - // TODO: what are channel types between 7-9? - GUILD_NEWS_THREAD = 10, // a temporary sub-channel within a GUILD_NEWS channel - GUILD_PUBLIC_THREAD = 11, // a temporary sub-channel within a GUILD_TEXT channel - GUILD_PRIVATE_THREAD = 12, // a temporary sub-channel within a GUILD_TEXT channel that is only viewable by those invited and those with the MANAGE_THREADS permission - GUILD_STAGE_VOICE = 13, // a voice channel for hosting events with an audience -} - -@Entity("channels") -export class Channel extends BaseClass { - @Column() - created_at: Date; - - @Column({ nullable: true }) - name?: string; - - @Column({ type: "text", nullable: true }) - icon?: string | null; - - @Column({ type: "int" }) - type: ChannelType; - - @OneToMany(() => Recipient, (recipient: Recipient) => recipient.channel, { - cascade: true, - orphanedRowAction: "delete", - }) - recipients?: Recipient[]; - - @Column({ nullable: true }) - last_message_id: string; - - @Column({ nullable: true }) - @RelationId((channel: Channel) => channel.guild) - guild_id?: string; - - @JoinColumn({ name: "guild_id" }) - @ManyToOne(() => Guild, { - onDelete: "CASCADE", - }) - guild: Guild; - - @Column({ nullable: true }) - @RelationId((channel: Channel) => channel.parent) - parent_id: string; - - @JoinColumn({ name: "parent_id" }) - @ManyToOne(() => Channel) - parent?: Channel; - - // only for group dms - @Column({ nullable: true }) - @RelationId((channel: Channel) => channel.owner) - owner_id: string; - - @JoinColumn({ name: "owner_id" }) - @ManyToOne(() => User) - owner: User; - - @Column({ nullable: true }) - last_pin_timestamp?: number; - - @Column({ nullable: true }) - default_auto_archive_duration?: number; - - @Column({ nullable: true }) - position?: number; - - @Column({ type: "simple-json", nullable: true }) - permission_overwrites?: ChannelPermissionOverwrite[]; - - @Column({ nullable: true }) - video_quality_mode?: number; - - @Column({ nullable: true }) - bitrate?: number; - - @Column({ nullable: true }) - user_limit?: number; - - @Column({ nullable: true }) - nsfw?: boolean; - - @Column({ nullable: true }) - rate_limit_per_user?: number; - - @Column({ nullable: true }) - topic?: string; - - @OneToMany(() => Invite, (invite: Invite) => invite.channel, { - cascade: true, - orphanedRowAction: "delete", - }) - invites?: Invite[]; - - @OneToMany(() => Message, (message: Message) => message.channel, { - cascade: true, - orphanedRowAction: "delete", - }) - messages?: Message[]; - - @OneToMany(() => VoiceState, (voice_state: VoiceState) => voice_state.channel, { - cascade: true, - orphanedRowAction: "delete", - }) - voice_states?: VoiceState[]; - - @OneToMany(() => ReadState, (read_state: ReadState) => read_state.channel, { - cascade: true, - orphanedRowAction: "delete", - }) - read_states?: ReadState[]; - - @OneToMany(() => Webhook, (webhook: Webhook) => webhook.channel, { - cascade: true, - orphanedRowAction: "delete", - }) - webhooks?: Webhook[]; - - // TODO: DM channel - static async createChannel( - channel: Partial, - user_id: string = "0", - opts?: { - keepId?: boolean; - skipExistsCheck?: boolean; - skipPermissionCheck?: boolean; - skipEventEmit?: boolean; - } - ) { - if (!opts?.skipPermissionCheck) { - // Always check if user has permission first - const permissions = await getPermission(user_id, channel.guild_id); - permissions.hasThrow("MANAGE_CHANNELS"); - } - - switch (channel.type) { - case ChannelType.GUILD_TEXT: - case ChannelType.GUILD_VOICE: - if (channel.parent_id && !opts?.skipExistsCheck) { - const exists = await Channel.findOneOrFail({ id: channel.parent_id }); - if (!exists) throw new HTTPError("Parent id channel doesn't exist", 400); - if (exists.guild_id !== channel.guild_id) - throw new HTTPError("The category channel needs to be in the guild"); - } - break; - case ChannelType.GUILD_CATEGORY: - break; - case ChannelType.DM: - case ChannelType.GROUP_DM: - throw new HTTPError("You can't create a dm channel in a guild"); - // TODO: check if guild is community server - case ChannelType.GUILD_STORE: - case ChannelType.GUILD_NEWS: - default: - throw new HTTPError("Not yet supported"); - } - - if (!channel.permission_overwrites) channel.permission_overwrites = []; - // TODO: auto generate position - - channel = { - ...channel, - ...(!opts?.keepId && { id: Snowflake.generate() }), - created_at: new Date(), - position: channel.position || 0, - }; - - await Promise.all([ - new Channel(channel).save(), - !opts?.skipEventEmit - ? emitEvent({ - event: "CHANNEL_CREATE", - data: channel, - guild_id: channel.guild_id, - } as ChannelCreateEvent) - : Promise.resolve(), - ]); - - return channel; - } - - static async createDMChannel(recipients: string[], creator_user_id: string, name?: string) { - recipients = recipients.unique().filter((x) => x !== creator_user_id); - const otherRecipientsUsers = await User.find({ where: recipients.map((x) => ({ id: x })) }); - - // TODO: check config for max number of recipients - if (otherRecipientsUsers.length !== recipients.length) { - throw new HTTPError("Recipient/s not found"); - } - - const type = recipients.length === 1 ? ChannelType.DM : ChannelType.GROUP_DM; - - let channel = null; - - const channelRecipients = [...recipients, creator_user_id]; - - const userRecipients = await Recipient.find({ - where: { user_id: creator_user_id }, - relations: ["channel", "channel.recipients"], - }); - - for (let ur of userRecipients) { - let re = ur.channel.recipients!.map((r) => r.user_id); - if (re.length === channelRecipients.length) { - if (containsAll(re, channelRecipients)) { - if (channel == null) { - channel = ur.channel; - await ur.assign({ closed: false }).save(); - } - } - } - } - - if (channel == null) { - name = trimSpecial(name); - - channel = await new Channel({ - name, - type, - owner_id: type === ChannelType.DM ? undefined : creator_user_id, - created_at: new Date(), - last_message_id: null, - recipients: channelRecipients.map( - (x) => - new Recipient({ user_id: x, closed: !(type === ChannelType.GROUP_DM || x === creator_user_id) }) - ), - }).save(); - } - - const channel_dto = await DmChannelDTO.from(channel); - - if (type === ChannelType.GROUP_DM) { - for (let recipient of channel.recipients!) { - await emitEvent({ - event: "CHANNEL_CREATE", - data: channel_dto.excludedRecipients([recipient.user_id]), - user_id: recipient.user_id, - }); - } - } else { - await emitEvent({ event: "CHANNEL_CREATE", data: channel_dto, user_id: creator_user_id }); - } - - return channel_dto.excludedRecipients([creator_user_id]); - } - - static async removeRecipientFromChannel(channel: Channel, user_id: string) { - await Recipient.delete({ channel_id: channel.id, user_id: user_id }); - channel.recipients = channel.recipients?.filter((r) => r.user_id !== user_id); - - if (channel.recipients?.length === 0) { - await Channel.deleteChannel(channel); - await emitEvent({ - event: "CHANNEL_DELETE", - data: await DmChannelDTO.from(channel, [user_id]), - user_id: user_id, - }); - return; - } - - await emitEvent({ - event: "CHANNEL_DELETE", - data: await DmChannelDTO.from(channel, [user_id]), - user_id: user_id, - }); - - //If the owner leave we make the first recipient in the list the new owner - if (channel.owner_id === user_id) { - channel.owner_id = channel.recipients!.find((r) => r.user_id !== user_id)!.user_id; //Is there a criteria to choose the new owner? - await emitEvent({ - event: "CHANNEL_UPDATE", - data: await DmChannelDTO.from(channel, [user_id]), - channel_id: channel.id, - }); - } - - await channel.save(); - - await emitEvent({ - event: "CHANNEL_RECIPIENT_REMOVE", - data: { - channel_id: channel.id, - user: await User.findOneOrFail({ where: { id: user_id }, select: PublicUserProjection }), - }, - channel_id: channel.id, - } as ChannelRecipientRemoveEvent); - } - - static async deleteChannel(channel: Channel) { - await Message.delete({ channel_id: channel.id }); //TODO we should also delete the attachments from the cdn but to do that we need to move cdn.ts in util - //TODO before deleting the channel we should check and delete other relations - await Channel.delete({ id: channel.id }); - } - - isDm() { - return this.type === ChannelType.DM || this.type === ChannelType.GROUP_DM; - } -} - -export interface ChannelPermissionOverwrite { - allow: string; - deny: string; - id: string; - type: ChannelPermissionOverwriteType; -} - -export enum ChannelPermissionOverwriteType { - role = 0, - member = 1, -} +import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm"; +import { BaseClass } from "./BaseClass"; +import { Guild } from "./Guild"; +import { PublicUserProjection, User } from "./User"; +import { HTTPError } from "lambert-server"; +import { containsAll, emitEvent, getPermission, Snowflake, trimSpecial, InvisibleCharacters } from "../util"; +import { ChannelCreateEvent, ChannelRecipientRemoveEvent } from "../interfaces"; +import { Recipient } from "./Recipient"; +import { Message } from "./Message"; +import { ReadState } from "./ReadState"; +import { Invite } from "./Invite"; +import { VoiceState } from "./VoiceState"; +import { Webhook } from "./Webhook"; +import { DmChannelDTO } from "../dtos"; + +export enum ChannelType { + GUILD_TEXT = 0, // a text channel within a server + DM = 1, // a direct message between users + GUILD_VOICE = 2, // a voice channel within a server + GROUP_DM = 3, // a direct message between multiple users + GUILD_CATEGORY = 4, // an organizational category that contains up to 50 channels + GUILD_NEWS = 5, // a channel that users can follow and crosspost into their own server + GUILD_STORE = 6, // a channel in which game developers can sell their game on Discord + // TODO: what are channel types between 7-9? + GUILD_NEWS_THREAD = 10, // a temporary sub-channel within a GUILD_NEWS channel + GUILD_PUBLIC_THREAD = 11, // a temporary sub-channel within a GUILD_TEXT channel + GUILD_PRIVATE_THREAD = 12, // a temporary sub-channel within a GUILD_TEXT channel that is only viewable by those invited and those with the MANAGE_THREADS permission + GUILD_STAGE_VOICE = 13, // a voice channel for hosting events with an audience +} + +@Entity("channels") +export class Channel extends BaseClass { + @Column() + created_at: Date; + + @Column({ nullable: true }) + name?: string; + + @Column({ type: "text", nullable: true }) + icon?: string | null; + + @Column({ type: "int" }) + type: ChannelType; + + @OneToMany(() => Recipient, (recipient: Recipient) => recipient.channel, { + cascade: true, + orphanedRowAction: "delete", + }) + recipients?: Recipient[]; + + @Column({ nullable: true }) + last_message_id: string; + + @Column({ nullable: true }) + @RelationId((channel: Channel) => channel.guild) + guild_id?: string; + + @JoinColumn({ name: "guild_id" }) + @ManyToOne(() => Guild, { + onDelete: "CASCADE", + }) + guild: Guild; + + @Column({ nullable: true }) + @RelationId((channel: Channel) => channel.parent) + parent_id: string; + + @JoinColumn({ name: "parent_id" }) + @ManyToOne(() => Channel) + parent?: Channel; + + // only for group dms + @Column({ nullable: true }) + @RelationId((channel: Channel) => channel.owner) + owner_id: string; + + @JoinColumn({ name: "owner_id" }) + @ManyToOne(() => User) + owner: User; + + @Column({ nullable: true }) + last_pin_timestamp?: number; + + @Column({ nullable: true }) + default_auto_archive_duration?: number; + + @Column({ nullable: true }) + position?: number; + + @Column({ type: "simple-json", nullable: true }) + permission_overwrites?: ChannelPermissionOverwrite[]; + + @Column({ nullable: true }) + video_quality_mode?: number; + + @Column({ nullable: true }) + bitrate?: number; + + @Column({ nullable: true }) + user_limit?: number; + + @Column({ nullable: true }) + nsfw?: boolean; + + @Column({ nullable: true }) + rate_limit_per_user?: number; + + @Column({ nullable: true }) + topic?: string; + + @OneToMany(() => Invite, (invite: Invite) => invite.channel, { + cascade: true, + orphanedRowAction: "delete", + }) + invites?: Invite[]; + + @OneToMany(() => Message, (message: Message) => message.channel, { + cascade: true, + orphanedRowAction: "delete", + }) + messages?: Message[]; + + @OneToMany(() => VoiceState, (voice_state: VoiceState) => voice_state.channel, { + cascade: true, + orphanedRowAction: "delete", + }) + voice_states?: VoiceState[]; + + @OneToMany(() => ReadState, (read_state: ReadState) => read_state.channel, { + cascade: true, + orphanedRowAction: "delete", + }) + read_states?: ReadState[]; + + @OneToMany(() => Webhook, (webhook: Webhook) => webhook.channel, { + cascade: true, + orphanedRowAction: "delete", + }) + webhooks?: Webhook[]; + + // TODO: DM channel + static async createChannel( + channel: Partial, + user_id: string = "0", + opts?: { + keepId?: boolean; + skipExistsCheck?: boolean; + skipPermissionCheck?: boolean; + skipEventEmit?: boolean; + skipNameChecks?: boolean; + } + ) { + if (!opts?.skipPermissionCheck) { + // Always check if user has permission first + const permissions = await getPermission(user_id, channel.guild_id); + permissions.hasThrow("MANAGE_CHANNELS"); + } + + if (!opts?.skipNameChecks) { + const guild = await Guild.findOneOrFail({ id: channel.guild_id }); + if (!guild.features.includes("ILLEGAL_CHANNEL_NAMES") && channel.name) { + for (var character of InvisibleCharacters) + channel.name = channel.name.split(character).join("-"); + + channel.name = channel.name.split(/\-+/g).join("-"); //replace multiple occurances with just one + channel.name = channel.name.split("-").filter(Boolean).join("-"); //trim '-' character + } + + if (!guild.features.includes("NULL_CHANNEL_NAMES")) { + if (channel.name) channel.name = channel.name.trim(); + + if (!channel.name) throw new HTTPError("Channel name cannot be empty."); + } + } + + switch (channel.type) { + case ChannelType.GUILD_TEXT: + case ChannelType.GUILD_VOICE: + if (channel.parent_id && !opts?.skipExistsCheck) { + const exists = await Channel.findOneOrFail({ id: channel.parent_id }); + if (!exists) throw new HTTPError("Parent id channel doesn't exist", 400); + if (exists.guild_id !== channel.guild_id) + throw new HTTPError("The category channel needs to be in the guild"); + } + break; + case ChannelType.GUILD_CATEGORY: + break; + case ChannelType.DM: + case ChannelType.GROUP_DM: + throw new HTTPError("You can't create a dm channel in a guild"); + // TODO: check if guild is community server + case ChannelType.GUILD_STORE: + case ChannelType.GUILD_NEWS: + default: + throw new HTTPError("Not yet supported"); + } + + if (!channel.permission_overwrites) channel.permission_overwrites = []; + // TODO: auto generate position + + channel = { + ...channel, + ...(!opts?.keepId && { id: Snowflake.generate() }), + created_at: new Date(), + position: channel.position || 0, + }; + + await Promise.all([ + new Channel(channel).save(), + !opts?.skipEventEmit + ? emitEvent({ + event: "CHANNEL_CREATE", + data: channel, + guild_id: channel.guild_id, + } as ChannelCreateEvent) + : Promise.resolve(), + ]); + + return channel; + } + + static async createDMChannel(recipients: string[], creator_user_id: string, name?: string) { + recipients = recipients.unique().filter((x) => x !== creator_user_id); + const otherRecipientsUsers = await User.find({ where: recipients.map((x) => ({ id: x })) }); + + // TODO: check config for max number of recipients + if (otherRecipientsUsers.length !== recipients.length) { + throw new HTTPError("Recipient/s not found"); + } + + const type = recipients.length === 1 ? ChannelType.DM : ChannelType.GROUP_DM; + + let channel = null; + + const channelRecipients = [...recipients, creator_user_id]; + + const userRecipients = await Recipient.find({ + where: { user_id: creator_user_id }, + relations: ["channel", "channel.recipients"], + }); + + for (let ur of userRecipients) { + let re = ur.channel.recipients!.map((r) => r.user_id); + if (re.length === channelRecipients.length) { + if (containsAll(re, channelRecipients)) { + if (channel == null) { + channel = ur.channel; + await ur.assign({ closed: false }).save(); + } + } + } + } + + if (channel == null) { + name = trimSpecial(name); + + channel = await new Channel({ + name, + type, + owner_id: type === ChannelType.DM ? undefined : creator_user_id, + created_at: new Date(), + last_message_id: null, + recipients: channelRecipients.map( + (x) => + new Recipient({ user_id: x, closed: !(type === ChannelType.GROUP_DM || x === creator_user_id) }) + ), + }).save(); + } + + const channel_dto = await DmChannelDTO.from(channel); + + if (type === ChannelType.GROUP_DM) { + for (let recipient of channel.recipients!) { + await emitEvent({ + event: "CHANNEL_CREATE", + data: channel_dto.excludedRecipients([recipient.user_id]), + user_id: recipient.user_id, + }); + } + } else { + await emitEvent({ event: "CHANNEL_CREATE", data: channel_dto, user_id: creator_user_id }); + } + + return channel_dto.excludedRecipients([creator_user_id]); + } + + static async removeRecipientFromChannel(channel: Channel, user_id: string) { + await Recipient.delete({ channel_id: channel.id, user_id: user_id }); + channel.recipients = channel.recipients?.filter((r) => r.user_id !== user_id); + + if (channel.recipients?.length === 0) { + await Channel.deleteChannel(channel); + await emitEvent({ + event: "CHANNEL_DELETE", + data: await DmChannelDTO.from(channel, [user_id]), + user_id: user_id, + }); + return; + } + + await emitEvent({ + event: "CHANNEL_DELETE", + data: await DmChannelDTO.from(channel, [user_id]), + user_id: user_id, + }); + + //If the owner leave we make the first recipient in the list the new owner + if (channel.owner_id === user_id) { + channel.owner_id = channel.recipients!.find((r) => r.user_id !== user_id)!.user_id; //Is there a criteria to choose the new owner? + await emitEvent({ + event: "CHANNEL_UPDATE", + data: await DmChannelDTO.from(channel, [user_id]), + channel_id: channel.id, + }); + } + + await channel.save(); + + await emitEvent({ + event: "CHANNEL_RECIPIENT_REMOVE", + data: { + channel_id: channel.id, + user: await User.findOneOrFail({ where: { id: user_id }, select: PublicUserProjection }), + }, + channel_id: channel.id, + } as ChannelRecipientRemoveEvent); + } + + static async deleteChannel(channel: Channel) { + await Message.delete({ channel_id: channel.id }); //TODO we should also delete the attachments from the cdn but to do that we need to move cdn.ts in util + //TODO before deleting the channel we should check and delete other relations + await Channel.delete({ id: channel.id }); + } + + isDm() { + return this.type === ChannelType.DM || this.type === ChannelType.GROUP_DM; + } +} + +export interface ChannelPermissionOverwrite { + allow: string; + deny: string; + id: string; + type: ChannelPermissionOverwriteType; +} + +export enum ChannelPermissionOverwriteType { + role = 0, + member = 1, +} diff --git a/util/src/util/InvisibleCharacters.ts b/util/src/util/InvisibleCharacters.ts new file mode 100644 index 000000000..147f51c21 --- /dev/null +++ b/util/src/util/InvisibleCharacters.ts @@ -0,0 +1,55 @@ +export const InvisibleCharacters = [ + "\t", + " ", + "­", + "͏", + "؜", + "ᅟ", + "ᅠ", + "឴", + "឵", + "᠎", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "​", + "‌", + "‍", + "‎", + "‏", + " ", + " ", + "⁠", + "⁡", + "⁢", + "⁣", + "⁤", + "", + "", + "", + "", + "", + "", + "　", + "⠀", + "ㅤ", + "", + "ﾠ", + "𝅙", + "𝅳", + "𝅴", + "𝅵", + "𝅶", + "𝅷", + "𝅸", + "𝅹", + "𝅺" +] \ No newline at end of file diff --git a/util/src/util/index.ts b/util/src/util/index.ts index c57034685..98e1146ca 100644 --- a/util/src/util/index.ts +++ b/util/src/util/index.ts @@ -18,3 +18,4 @@ export * from "./Snowflake"; export * from "./String"; export * from "./Array"; export * from "./TraverseDirectory"; +export * from "./InvisibleCharacters"; \ No newline at end of file From 0df2a0adf6da4a86b4c14eb00c2d170191412757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Thu, 13 Jan 2022 22:57:55 +0300 Subject: [PATCH 27/31] Update Channel.ts --- util/src/entities/Channel.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts index e7e0bace5..f0bbfe960 100644 --- a/util/src/entities/Channel.ts +++ b/util/src/entities/Channel.ts @@ -21,11 +21,14 @@ export enum ChannelType { GUILD_CATEGORY = 4, // an organizational category that contains up to 50 channels GUILD_NEWS = 5, // a channel that users can follow and crosspost into their own server GUILD_STORE = 6, // a channel in which game developers can sell their game on Discord - // TODO: what are channel types between 7-9? + ENCRYPTED = 7, // end-to-end encrypted channel + ENCRYPTED_THREAD = 8, // end-to-end encrypted thread channel GUILD_NEWS_THREAD = 10, // a temporary sub-channel within a GUILD_NEWS channel GUILD_PUBLIC_THREAD = 11, // a temporary sub-channel within a GUILD_TEXT channel GUILD_PRIVATE_THREAD = 12, // a temporary sub-channel within a GUILD_TEXT channel that is only viewable by those invited and those with the MANAGE_THREADS permission GUILD_STAGE_VOICE = 13, // a voice channel for hosting events with an audience + CUSTOM_START = 64, // start custom channel types from here + UNHANDLED = 255 // unhandled unowned pass-through channel type } @Entity("channels") @@ -257,7 +260,7 @@ export class Channel extends BaseClass { channel = await new Channel({ name, type, - owner_id: type === ChannelType.DM ? undefined : creator_user_id, + owner_id: type === ChannelType.DM ? undefined : null, // 1:1 DMs are ownerless in fosscord-server created_at: new Date(), last_message_id: null, recipients: channelRecipients.map( @@ -304,9 +307,9 @@ export class Channel extends BaseClass { user_id: user_id, }); - //If the owner leave we make the first recipient in the list the new owner + //If the owner leave the server user is the new owner if (channel.owner_id === user_id) { - channel.owner_id = channel.recipients!.find((r) => r.user_id !== user_id)!.user_id; //Is there a criteria to choose the new owner? + channel.owner_id = 1; // The channel is now owned by the server user await emitEvent({ event: "CHANNEL_UPDATE", data: await DmChannelDTO.from(channel, [user_id]), From 028fd7b8b3fb6a94afce0176f38da1a766f936cc Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:00:54 +1100 Subject: [PATCH 28/31] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Erkin Alp Güney --- util/src/entities/Channel.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts index f0bbfe960..aa1b823e9 100644 --- a/util/src/entities/Channel.ts +++ b/util/src/entities/Channel.ts @@ -161,7 +161,8 @@ export class Channel extends BaseClass { if (!opts?.skipNameChecks) { const guild = await Guild.findOneOrFail({ id: channel.guild_id }); - if (!guild.features.includes("ILLEGAL_CHANNEL_NAMES") && channel.name) { + if (!guild.features.includes("ALLOW_INVALID_CHANNEL_NAMES") && channel.name) { + for (var character of InvisibleCharacters) channel.name = channel.name.split(character).join("-"); @@ -169,7 +170,8 @@ export class Channel extends BaseClass { channel.name = channel.name.split("-").filter(Boolean).join("-"); //trim '-' character } - if (!guild.features.includes("NULL_CHANNEL_NAMES")) { + if (!guild.features.includes("ALLOW_UNNAMED_CHANNELS")) { + if (channel.name) channel.name = channel.name.trim(); if (!channel.name) throw new HTTPError("Channel name cannot be empty."); From d6f5a08cb5bda45131e2195b12307204f6e1eebb Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:42:29 +1100 Subject: [PATCH 29/31] Add unhandled channel types to IsTextChannel method --- api/src/routes/channels/#channel_id/messages/index.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/api/src/routes/channels/#channel_id/messages/index.ts b/api/src/routes/channels/#channel_id/messages/index.ts index c3d3d408e..1ae9d6761 100644 --- a/api/src/routes/channels/#channel_id/messages/index.ts +++ b/api/src/routes/channels/#channel_id/messages/index.ts @@ -37,7 +37,11 @@ export function isTextChannel(type: ChannelType): boolean { case ChannelType.GUILD_PUBLIC_THREAD: case ChannelType.GUILD_PRIVATE_THREAD: case ChannelType.GUILD_TEXT: + case ChannelType.ENCRYPTED: + case ChannelType.ENCRYPTED_THREAD: return true; + default: + throw new HTTPError("unimplemented", 400); } } @@ -87,7 +91,7 @@ router.get("/", async (req: Request, res: Response) => { permissions.hasThrow("VIEW_CHANNEL"); if (!permissions.has("READ_MESSAGE_HISTORY")) return res.json([]); - var query: FindManyOptions & { where: { id?: any } } = { + var query: FindManyOptions & { where: { id?: any; }; } = { order: { id: "DESC" }, take: limit, where: { channel_id }, @@ -216,7 +220,7 @@ router.post( channel.save() ]); - postHandleMessage(message).catch((e) => {}); // no await as it shouldnt block the message send function and silently catch error + postHandleMessage(message).catch((e) => { }); // no await as it shouldnt block the message send function and silently catch error return res.json(message); } From 0a53860645dbddd4f127988ccd8da0abee7c6f2b Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:44:04 +1100 Subject: [PATCH 30/31] channel.owner_id is type string not number --- util/src/entities/Channel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts index aa1b823e9..6750a0024 100644 --- a/util/src/entities/Channel.ts +++ b/util/src/entities/Channel.ts @@ -311,7 +311,7 @@ export class Channel extends BaseClass { //If the owner leave the server user is the new owner if (channel.owner_id === user_id) { - channel.owner_id = 1; // The channel is now owned by the server user + channel.owner_id = "1"; // The channel is now owned by the server user await emitEvent({ event: "CHANNEL_UPDATE", data: await DmChannelDTO.from(channel, [user_id]), From f8f236afb24d5c806ea0e5981e7f95de6ee4885c Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:48:22 +1100 Subject: [PATCH 31/31] * Replaced list of invisible characters with unicode codepoints * No longer silently edit invalid channel names * No longer trim channel names in unnamed check --- util/src/entities/Channel.ts | 18 +++-- util/src/util/InvisibleCharacters.ts | 109 ++++++++++++++------------- 2 files changed, 65 insertions(+), 62 deletions(-) diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts index 6750a0024..1cc4a5386 100644 --- a/util/src/entities/Channel.ts +++ b/util/src/entities/Channel.ts @@ -162,19 +162,21 @@ export class Channel extends BaseClass { if (!opts?.skipNameChecks) { const guild = await Guild.findOneOrFail({ id: channel.guild_id }); if (!guild.features.includes("ALLOW_INVALID_CHANNEL_NAMES") && channel.name) { - for (var character of InvisibleCharacters) - channel.name = channel.name.split(character).join("-"); + if (channel.name.includes(character)) + throw new HTTPError("Channel name cannot include invalid characters", 403); - channel.name = channel.name.split(/\-+/g).join("-"); //replace multiple occurances with just one - channel.name = channel.name.split("-").filter(Boolean).join("-"); //trim '-' character + if (channel.name.match(/\-\-+/g)) + throw new HTTPError("Channel name cannot include multiple adjacent dashes.", 403) + + if (channel.name.charAt(0) === "-" || + channel.name.charAt(channel.name.length - 1) === "-") + throw new HTTPError("Channel name cannot start/end with dash.", 403) } if (!guild.features.includes("ALLOW_UNNAMED_CHANNELS")) { - - if (channel.name) channel.name = channel.name.trim(); - - if (!channel.name) throw new HTTPError("Channel name cannot be empty."); + if (!channel.name) + throw new HTTPError("Channel name cannot be empty.", 403); } } diff --git a/util/src/util/InvisibleCharacters.ts b/util/src/util/InvisibleCharacters.ts index 147f51c21..2b014e146 100644 --- a/util/src/util/InvisibleCharacters.ts +++ b/util/src/util/InvisibleCharacters.ts @@ -1,55 +1,56 @@ +// List from https://invisible-characters.com/ export const InvisibleCharacters = [ - "\t", - " ", - "­", - "͏", - "؜", - "ᅟ", - "ᅠ", - "឴", - "឵", - "᠎", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "​", - "‌", - "‍", - "‎", - "‏", - " ", - " ", - "⁠", - "⁡", - "⁢", - "⁣", - "⁤", - "", - "", - "", - "", - "", - "", - "　", - "⠀", - "ㅤ", - "", - "ﾠ", - "𝅙", - "𝅳", - "𝅴", - "𝅵", - "𝅶", - "𝅷", - "𝅸", - "𝅹", - "𝅺" -] \ No newline at end of file + '\u{9}', //Tab + '\u{20}', //Space + '\u{ad}', //Soft hyphen + '\u{34f}', //Combining grapheme joiner + '\u{61c}', //Arabic letter mark + '\u{115f}', //Hangul choseong filler + '\u{1160}', //Hangul jungseong filler + '\u{17b4}', //Khmer vowel inherent AQ + '\u{17b5}', //Khmer vowel inherent AA + '\u{180e}', //Mongolian vowel separator + '\u{2000}', //En quad + '\u{2001}', //Em quad + '\u{2002}', //En space + '\u{2003}', //Em space + '\u{2004}', //Three-per-em space + '\u{2005}', //Four-per-em space + '\u{2006}', //Six-per-em space + '\u{2007}', //Figure space + '\u{2008}', //Punctuation space + '\u{2009}', //Thin space + '\u{200a}', //Hair space + '\u{200b}', //Zero width space + '\u{200c}', //Zero width non-joiner + '\u{200d}', //Zero width joiner + '\u{200e}', //Left-to-right mark + '\u{200f}', //Right-to-left mark + '\u{202f}', //Narrow no-break space + '\u{205f}', //Medium mathematical space + '\u{2060}', //Word joiner + '\u{2061}', //Function application + '\u{2062}', //Invisible times + '\u{2063}', //Invisible separator + '\u{2064}', //Invisible plus + '\u{206a}', //Inhibit symmetric swapping + '\u{206b}', //Activate symmetric swapping + '\u{206c}', //Inhibit arabic form shaping + '\u{206d}', //Activate arabic form shaping + '\u{206e}', //National digit shapes + '\u{206f}', //Nominal digit shapes + '\u{3000}', //Ideographic space + '\u{2800}', //Braille pattern blank + '\u{3164}', //Hangul filler + '\u{feff}', //Zero width no-break space + '\u{ffa0}', //Haldwidth hangul filler + '\u{1d159}', //Musical symbol null notehead + '\u{1d173}', //Musical symbol begin beam + '\u{1d174}', //Musical symbol end beam + '\u{1d175}', //Musical symbol begin tie + '\u{1d176}', //Musical symbol end tie + '\u{1d177}', //Musical symbol begin slur + '\u{1d178}', //Musical symbol end slur + '\u{1d179}', //Musical symbol begin phrase + '\u{1d17a}' //Musical symbol end phrase +]; \ No newline at end of file