From 764d2801a683e343de0ff88e46053952f8a8ab46 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Sat, 23 Apr 2022 16:37:16 +0300 Subject: self commands and /me messages --- util/src/entities/Message.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util/src/entities') diff --git a/util/src/entities/Message.ts b/util/src/entities/Message.ts index b32bbd94..8bd50455 100644 --- a/util/src/entities/Message.ts +++ b/util/src/entities/Message.ts @@ -39,11 +39,13 @@ export enum MessageType { USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2 = 10, USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3 = 11, CHANNEL_FOLLOW_ADD = 12, + ACTION = 13, // /me messages GUILD_DISCOVERY_DISQUALIFIED = 14, GUILD_DISCOVERY_REQUALIFIED = 15, ENCRYPTED = 16, REPLY = 19, - APPLICATION_COMMAND = 20, + APPLICATION_COMMAND = 20, // application command or self command invocation + SELF_COMMAND_SCRIPT = 21, // self command scripts ROUTE_ADDED = 41, // custom message routing: new route affecting that channel ROUTE_DISABLED = 42, // custom message routing: given route no longer affecting that channel ENCRYPTION = 50, -- cgit 1.5.1 From e69c8a31a5f051c75a1c5544d210b8c0ae76e9c6 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Sat, 23 Apr 2022 16:40:54 +0300 Subject: Update Message.ts --- util/src/entities/Message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/src/entities') diff --git a/util/src/entities/Message.ts b/util/src/entities/Message.ts index 8bd50455..e18cf691 100644 --- a/util/src/entities/Message.ts +++ b/util/src/entities/Message.ts @@ -45,9 +45,9 @@ export enum MessageType { ENCRYPTED = 16, REPLY = 19, APPLICATION_COMMAND = 20, // application command or self command invocation - SELF_COMMAND_SCRIPT = 21, // self command scripts ROUTE_ADDED = 41, // custom message routing: new route affecting that channel ROUTE_DISABLED = 42, // custom message routing: given route no longer affecting that channel + SELF_COMMAND_SCRIPT = 43, // self command scripts ENCRYPTION = 50, CUSTOM_START = 63, UNHANDLED = 255 -- cgit 1.5.1 From cb4325f15d12629af7de4139043b2cf12e53a2e0 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Wed, 27 Apr 2022 21:35:36 +0300 Subject: Forum and guild directory types --- util/src/entities/Channel.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'util/src/entities') diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts index 98766a9d..69c08be7 100644 --- a/util/src/entities/Channel.ts +++ b/util/src/entities/Channel.ts @@ -28,6 +28,8 @@ export enum ChannelType { 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 + DIRECTORY = 14, // guild directory listing channel + GUILD_FORUM = 15, // forum composed of IM threads TICKET_TRACKER = 33, // ticket tracker, individual ticket items shall have type 12 KANBAN = 34, // confluence like kanban board VOICELESS_WHITEBOARD = 35, // whiteboard but without voice (whiteboard + voice is the same as stage) -- cgit 1.5.1 From 69b5bb96ae2539971db5fac3bb8dec858dd455e8 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Tue, 10 May 2022 19:43:28 +0300 Subject: more event types --- util/src/entities/AuditLog.ts | 58 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 4 deletions(-) (limited to 'util/src/entities') diff --git a/util/src/entities/AuditLog.ts b/util/src/entities/AuditLog.ts index 4b81ed6a..be26374b 100644 --- a/util/src/entities/AuditLog.ts +++ b/util/src/entities/AuditLog.ts @@ -4,41 +4,91 @@ import { ChannelPermissionOverwrite } from "./Channel"; import { User } from "./User"; export enum AuditLogEvents { - GUILD_UPDATE = 1, - CHANNEL_CREATE = 10, + // guild level + GUILD_UPDATE = 1, + GUILD_IMPORT = 2, + GUILD_EXPORTED = 3, + GUILD_ARCHIVE = 4, + GUILD_UNARCHIVE = 5, + // join-leave + USER_JOIN = 6, + USER_LEAVE = 7, + // channels + CHANNEL_CREATE = 10, CHANNEL_UPDATE = 11, CHANNEL_DELETE = 12, - CHANNEL_OVERWRITE_CREATE = 13, + // permission overrides + CHANNEL_OVERWRITE_CREATE = 13, CHANNEL_OVERWRITE_UPDATE = 14, CHANNEL_OVERWRITE_DELETE = 15, - MEMBER_KICK = 20, + // kick and ban + MEMBER_KICK = 20, MEMBER_PRUNE = 21, MEMBER_BAN_ADD = 22, MEMBER_BAN_REMOVE = 23, + // member updates MEMBER_UPDATE = 24, MEMBER_ROLE_UPDATE = 25, MEMBER_MOVE = 26, MEMBER_DISCONNECT = 27, BOT_ADD = 28, + // roles ROLE_CREATE = 30, ROLE_UPDATE = 31, ROLE_DELETE = 32, + ROLE_SWAP = 33, + // invites INVITE_CREATE = 40, INVITE_UPDATE = 41, INVITE_DELETE = 42, + // webhooks WEBHOOK_CREATE = 50, WEBHOOK_UPDATE = 51, WEBHOOK_DELETE = 52, + WEBHOOK_SWAP = 53, + // custom emojis EMOJI_CREATE = 60, EMOJI_UPDATE = 61, EMOJI_DELETE = 62, + EMOJI_SWAP = 63, + // deletion + MESSAGE_CREATE = 70, // messages sent using non-primary seat of the user only + MESSAGE_EDIT = 71, // non-self edits only MESSAGE_DELETE = 72, MESSAGE_BULK_DELETE = 73, + // pinning MESSAGE_PIN = 74, MESSAGE_UNPIN = 75, + // integrations INTEGRATION_CREATE = 80, INTEGRATION_UPDATE = 81, INTEGRATION_DELETE = 82, + // stage actions + STAGE_INSTANCE_CREATE = 83, + STAGE_INSTANCE_UPDATE = 84, + STAGE_INSTANCE_DELETE = 85, + // stickers + STICKER_CREATE = 90, + STICKER_UPDATE = 91, + STICKER_DELETE = 92, + STICKER_SWAP = 93, + // threads + THREAD_CREATE = 110, + THREAD_UPDATE = 111, + THREAD_DELETE = 112, + // application commands + APPLICATION_COMMAND_PERMISSION_UPDATE = 121, + // automod + POLICY_CREATE = 140, + POLICY_UPDATE = 141, + // instance policies affecting the guild + GUILD_CROPPED_BY_POLICIES = 216, + // message moves + IN_GUILD_MESSAGE_MOVE = 223, + CROSS_GUILD_MESSAGE_MOVE = 224, + // message routing + ROUTE_CREATE = 225, + ROUTE_UPDATE = 226, } @Entity("audit_logs") -- cgit 1.5.1 From 41564c79561d68f00c37d3ca980bbd8e6405160d Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Sun, 15 May 2022 09:12:28 +0300 Subject: user groups --- util/src/entities/Group.ts | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 util/src/entities/Group.ts (limited to 'util/src/entities') diff --git a/util/src/entities/Group.ts b/util/src/entities/Group.ts new file mode 100644 index 00000000..b24d38cf --- /dev/null +++ b/util/src/entities/Group.ts @@ -0,0 +1,33 @@ +import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; + +import { BaseClass } from "./BaseClass"; + +@Entity("groups") +export class UserGroup extends BaseClass { + @Column({ nullable: true }) + parent?: BigInt; + + @Column() + color: number; + + @Column() + hoist: boolean; + + @Column() + mentionable: boolean; + + @Column() + name: string; + + @Column() + rights: BigInt; + + @Column() + position: number; + + @Column({ nullable: true }) + icon: BigInt; + + @Column({ nullable: true }) + unicode_emoji: BigInt; +} -- cgit 1.5.1 From 36ebef6eaf43c17c8b7d842946543c3c5896dd5e Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Sun, 15 May 2022 16:28:57 +0300 Subject: Update AuditLog.ts --- util/src/entities/AuditLog.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util/src/entities') diff --git a/util/src/entities/AuditLog.ts b/util/src/entities/AuditLog.ts index be26374b..b003e7ba 100644 --- a/util/src/entities/AuditLog.ts +++ b/util/src/entities/AuditLog.ts @@ -81,8 +81,10 @@ export enum AuditLogEvents { // automod POLICY_CREATE = 140, POLICY_UPDATE = 141, + POLICY_DELETE = 142, + MESSAGE_BLOCKED_BY_POLICIES = 143, // in fosscord, blocked messages are stealth-dropped // instance policies affecting the guild - GUILD_CROPPED_BY_POLICIES = 216, + GUILD_AFFECTED_BY_POLICIES = 216, // message moves IN_GUILD_MESSAGE_MOVE = 223, CROSS_GUILD_MESSAGE_MOVE = 224, -- cgit 1.5.1 From 215df37be52b46fd3d5eb48e58e8d77cd9091c96 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Sun, 15 May 2022 17:52:17 +0300 Subject: Extended settings --- util/src/entities/User.ts | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'util/src/entities') diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts index a5c4c136..558a4190 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts @@ -163,6 +163,10 @@ export class User extends BaseClass { @Column({ type: "simple-json", select: false }) settings: UserSettings; + + // workaround to prevent fossord-unaware clients from deleting settings not used by them + @Column({ type: "simple-json", select: false }) + extended_settings: UserSettings; @Column({ type: "simple-json" }) notes: { [key: string]: string }; //key is ID of user @@ -273,6 +277,7 @@ export class User extends BaseClass { valid_tokens_since: new Date(), }, settings: { ...defaultSettings, locale: language }, + extended_settings: {}, fingerprints: [], notes: {}, }); -- cgit 1.5.1 From 1573edb505fd70238239218fac04029f496c33e5 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Sun, 15 May 2022 17:53:24 +0300 Subject: Extended settings will not be type checked --- util/src/entities/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/src/entities') diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts index 558a4190..9b1c494e 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts @@ -166,7 +166,7 @@ export class User extends BaseClass { // workaround to prevent fossord-unaware clients from deleting settings not used by them @Column({ type: "simple-json", select: false }) - extended_settings: UserSettings; + extended_settings: string; @Column({ type: "simple-json" }) notes: { [key: string]: string }; //key is ID of user -- cgit 1.5.1 From f420cfd36c8ed263487c9aac2209a3052eecc3a7 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Mon, 30 May 2022 23:28:23 +1000 Subject: Respect register_dateOfBirth_required = false --- api/src/routes/auth/register.ts | 2 +- util/src/entities/Config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'util/src/entities') diff --git a/api/src/routes/auth/register.ts b/api/src/routes/auth/register.ts index cd1bcb72..94dd6502 100644 --- a/api/src/routes/auth/register.ts +++ b/api/src/routes/auth/register.ts @@ -128,7 +128,7 @@ router.post("/", route({ body: "RegisterSchema" }), async (req: Request, res: Re throw FieldErrors({ date_of_birth: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") } }); - } else if (register.dateOfBirth.minimum) { + } else if (register.dateOfBirth.required && register.dateOfBirth.minimum) { const minimum = new Date(); minimum.setFullYear(minimum.getFullYear() - register.dateOfBirth.minimum); body.date_of_birth = new Date(body.date_of_birth as Date); diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 8d29b387..063a4d4d 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -324,7 +324,7 @@ export const DefaultConfigOptions: ConfigValue = { // domains: fs.readFileSync(__dirname + "/blockedEmailDomains.txt", { encoding: "utf8" }).split("\n"), }, dateOfBirth: { - required: false, + required: true, minimum: 13, }, disabled: false, -- cgit 1.5.1