diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts
index 8ec801c0..20a35b95 100644
--- a/src/util/entities/Channel.ts
+++ b/src/util/entities/Channel.ts
@@ -20,7 +20,17 @@ import { HTTPError } from "lambert-server";
import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm";
import { DmChannelDTO } from "../dtos";
import { ChannelCreateEvent, ChannelRecipientRemoveEvent } from "../interfaces";
-import { InvisibleCharacters, Snowflake, emitEvent, getPermission, trimSpecial, Permissions, BitField } from "../util";
+import {
+ InvisibleCharacters,
+ Snowflake,
+ containsAll,
+ emitEvent,
+ getPermission,
+ trimSpecial,
+ DiscordApiErrors,
+ Permissions,
+ BitField
+} from "../util";
import { BaseClass } from "./BaseClass";
import { Guild } from "./Guild";
import { Invite } from "./Invite";
@@ -263,7 +273,7 @@ export class Channel extends BaseClass {
if (otherRecipientsUsers.length !== recipients.length) {
throw new HTTPError("Recipient/s not found");
}
- **/
+ **/
const type = recipients.length > 1 ? ChannelType.GROUP_DM : ChannelType.DM;
@@ -377,7 +387,6 @@ export class Channel extends BaseClass {
static async deleteChannel(channel: Channel) {
// TODO Delete attachments from the CDN for messages in the channel
- await Channel.delete({ id: channel.id });
if (channel.guild_id) {
const guild = await Guild.findOneOrFail({
@@ -385,9 +394,42 @@ export class Channel extends BaseClass {
select: { channel_ordering: true },
});
- const updatedOrdering = guild.channel_ordering.filter((id) => id != channel.id);
- await Guild.update({ id: channel.guild_id }, { channel_ordering: updatedOrdering });
- }
+ if (guild.features.includes("COMMUNITY")) {
+ if (
+ [
+ guild.afk_channel_id,
+ guild.system_channel_id,
+ guild.rules_channel_id,
+ guild.public_updates_channel_id,
+ ].includes(channel.id)
+ ) {
+ throw DiscordApiErrors.CANNOT_DELETE_COMMUNITY_REQUIRED_CHANNEL;
+ }
+ }
+ else {
+ if (guild.afk_channel_id === channel.id) {
+ guild.afk_channel_id = null;
+ }
+ if (guild.system_channel_id === channel.id) {
+ guild.system_channel_id = null;
+ }
+ if (guild.rules_channel_id === channel.id) {
+ guild.rules_channel_id = null;
+ }
+ if (guild.public_updates_channel_id === channel.id) {
+ guild.public_updates_channel_id = null;
+ }
+ }
+
+ await Channel.delete({ id: channel.id });
+
+ const updatedOrdering = guild.channel_ordering.filter(
+ (id) => id != channel.id,
+ );
+ await Guild.update(
+ { id: channel.guild_id },
+ { channel_ordering: updatedOrdering },
+ );
}
static async calculatePosition(channel_id: string, guild_id: string, guild?: Guild) {
diff --git a/src/util/entities/UserSettingsProtos.ts b/src/util/entities/UserSettingsProtos.ts
index 864c60ea..42368b4a 100644
--- a/src/util/entities/UserSettingsProtos.ts
+++ b/src/util/entities/UserSettingsProtos.ts
@@ -19,7 +19,22 @@
import { Column, Entity, JoinColumn, OneToOne } from "typeorm";
import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
import { User } from "./User";
-import { FrecencyUserSettings, PreloadedUserSettings } from "discord-protos";
+import {
+ FrecencyUserSettings,
+ PreloadedUserSettings,
+ PreloadedUserSettings_AppearanceSettings,
+ PreloadedUserSettings_CustomStatus,
+ PreloadedUserSettings_LaunchPadMode,
+ PreloadedUserSettings_PrivacySettings,
+ PreloadedUserSettings_StatusSettings,
+ PreloadedUserSettings_SwipeRightToLeftMode,
+ PreloadedUserSettings_TextAndImagesSettings,
+ PreloadedUserSettings_Theme,
+ PreloadedUserSettings_TimestampHourCycle,
+ PreloadedUserSettings_UIDensity,
+ PreloadedUserSettings_VoiceAndVideoSettings,
+} from "discord-protos";
+import { BoolValue, UInt32Value } from "discord-protos/dist/discord_protos/google/protobuf/wrappers";
@Entity({
name: "user_settings_protos",
@@ -45,40 +60,13 @@ export class UserSettingsProtos extends BaseClassWithoutId {
// @Column({nullable: true, type: "simple-json"})
// testSettings: {};
- bigintReplacer(_key: string, value: unknown): unknown {
- if (typeof value === "bigint") {
- return (value as bigint).toString();
- } else if (value instanceof Uint8Array) {
- return {
- __type: "Uint8Array",
- data: Array.from(value as Uint8Array)
- .map((b) => b.toString(16).padStart(2, "0"))
- .join(""),
- };
- } else {
- return value;
- }
- }
-
- bigintReviver(_key: string, value: unknown): unknown {
- if (typeof value === "string" && /^\d+n$/.test(value)) {
- return BigInt((value as string).slice(0, -1));
- } else if (typeof value === "object" && value !== null && "__type" in value) {
- if (value.__type === "Uint8Array" && "data" in value) {
- return new Uint8Array((value.data as string).match(/.{1,2}/g)!.map((byte: string) => parseInt(byte, 16)));
- }
- }
- return value;
- }
-
get userSettings(): PreloadedUserSettings | undefined {
if (!this._userSettings) return undefined;
- return PreloadedUserSettings.fromJson(JSON.parse(this._userSettings, this.bigintReviver));
+ return PreloadedUserSettings.fromJsonString(this._userSettings);
}
set userSettings(value: PreloadedUserSettings | undefined) {
if (value) {
- // this._userSettings = JSON.stringify(value, this.bigintReplacer);
this._userSettings = PreloadedUserSettings.toJsonString(value);
} else {
this._userSettings = undefined;
@@ -87,33 +75,32 @@ export class UserSettingsProtos extends BaseClassWithoutId {
get frecencySettings(): FrecencyUserSettings | undefined {
if (!this._frecencySettings) return undefined;
- return FrecencyUserSettings.fromJson(JSON.parse(this._frecencySettings, this.bigintReviver));
+ return FrecencyUserSettings.fromJsonString(this._frecencySettings);
}
set frecencySettings(value: FrecencyUserSettings | undefined) {
if (value) {
- this._frecencySettings = JSON.stringify(value, this.bigintReplacer);
+ this._frecencySettings = FrecencyUserSettings.toJsonString(value);
} else {
this._frecencySettings = undefined;
}
}
- static async getOrDefault(user_id: string, save: boolean = false): Promise<UserSettingsProtos> {
- const user = await User.findOneOrFail({
- where: { id: user_id },
- select: { settings: true },
- });
+ static async getOrCreate(user_id: string, save: boolean = false): Promise<UserSettingsProtos> {
+ if (!(await User.existsBy({ id: user_id }))) throw new Error(`User with ID ${user_id} does not exist.`);
let userSettings = await UserSettingsProtos.findOne({
where: { user_id },
});
let modified = false;
+ let isNewSettings = false;
if (!userSettings) {
userSettings = UserSettingsProtos.create({
user_id,
});
modified = true;
+ isNewSettings = true;
}
if (!userSettings.userSettings) {
@@ -150,8 +137,73 @@ export class UserSettingsProtos extends BaseClassWithoutId {
modified = true;
}
+ if (isNewSettings) userSettings = await this.importLegacySettings(user_id, userSettings);
+
if (modified && save) userSettings = await userSettings.save();
return userSettings;
}
+
+ static async importLegacySettings(user_id: string, settings: UserSettingsProtos): Promise<UserSettingsProtos> {
+ const user = await User.findOneOrFail({
+ where: { id: user_id },
+ select: { settings: true },
+ });
+ if (!user) throw new Error(`User with ID ${user_id} does not exist.`);
+
+ const legacySettings = user.settings;
+ const { frecencySettings, userSettings } = settings;
+
+ if (userSettings === undefined) {
+ throw new Error("UserSettingsProtos.userSettings is undefined, this should not happen.");
+ }
+ if (frecencySettings === undefined) {
+ throw new Error("UserSettingsProtos.frecencySettings is undefined, this should not happen.");
+ }
+
+ if (legacySettings) {
+ if (legacySettings.afk_timeout !== null && legacySettings.afk_timeout !== undefined) {
+ userSettings.voiceAndVideo ??= PreloadedUserSettings_VoiceAndVideoSettings.create();
+ userSettings.voiceAndVideo.afkTimeout = UInt32Value.fromJson(legacySettings.afk_timeout);
+ }
+
+ if (legacySettings.allow_accessibility_detection !== null && legacySettings.allow_accessibility_detection !== undefined) {
+ userSettings.privacy ??= PreloadedUserSettings_PrivacySettings.create();
+ userSettings.privacy.allowAccessibilityDetection = legacySettings.allow_accessibility_detection;
+ }
+
+ if (legacySettings.animate_emoji !== null && legacySettings.animate_emoji !== undefined) {
+ userSettings.textAndImages ??= PreloadedUserSettings_TextAndImagesSettings.create();
+ userSettings.textAndImages.animateEmoji = BoolValue.fromJson(legacySettings.animate_emoji);
+ }
+
+ if (legacySettings.animate_stickers !== null && legacySettings.animate_stickers !== undefined) {
+ userSettings.textAndImages ??= PreloadedUserSettings_TextAndImagesSettings.create();
+ userSettings.textAndImages.animateStickers = UInt32Value.fromJson(legacySettings.animate_stickers);
+ }
+
+ if (legacySettings.contact_sync_enabled !== null && legacySettings.contact_sync_enabled !== undefined) {
+ userSettings.privacy ??= PreloadedUserSettings_PrivacySettings.create();
+ userSettings.privacy.contactSyncEnabled = BoolValue.fromJson(legacySettings.contact_sync_enabled);
+ }
+
+ if (legacySettings.convert_emoticons !== null && legacySettings.convert_emoticons !== undefined) {
+ userSettings.textAndImages ??= PreloadedUserSettings_TextAndImagesSettings.create();
+ userSettings.textAndImages.convertEmoticons = BoolValue.fromJson(legacySettings.convert_emoticons);
+ }
+
+ if (legacySettings.custom_status !== null && legacySettings.custom_status !== undefined) {
+ userSettings.status ??= PreloadedUserSettings_StatusSettings.create();
+ userSettings.status.customStatus = PreloadedUserSettings_CustomStatus.create({
+ emojiId: legacySettings.custom_status.emoji_id === undefined ? undefined : (BigInt(legacySettings.custom_status.emoji_id) as bigint),
+ emojiName: legacySettings.custom_status.emoji_name,
+ expiresAtMs: legacySettings.custom_status.expires_at === undefined ? undefined : (BigInt(legacySettings.custom_status.expires_at) as bigint),
+ text: legacySettings.custom_status.text,
+ createdAtMs: BigInt(Date.now()) as bigint,
+ });
+ }
+ }
+
+ return settings;
+ }
}
|
