diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts
index 9f7041d4..8efddc73 100644
--- a/src/util/entities/Channel.ts
+++ b/src/util/entities/Channel.ts
@@ -126,9 +126,6 @@ export class Channel extends BaseClass {
@Column({ nullable: true })
default_auto_archive_duration?: number;
- @Column({ nullable: true })
- position?: number;
-
@Column({ type: "simple-json", nullable: true })
permission_overwrites?: ChannelPermissionOverwrite[];
@@ -193,6 +190,9 @@ export class Channel extends BaseClass {
@Column()
default_thread_rate_limit_per_user: number = 0;
+ /** Must be calculated Channel.calculatePosition */
+ position: number;
+
// TODO: DM channel
static async createChannel(
channel: Partial<Channel>,
@@ -211,10 +211,16 @@ export class Channel extends BaseClass {
permissions.hasThrow("MANAGE_CHANNELS");
}
+ const guild = await Guild.findOneOrFail({
+ where: { id: channel.guild_id },
+ select: {
+ features: !opts?.skipNameChecks,
+ channelOrdering: true,
+ id: true,
+ },
+ });
+
if (!opts?.skipNameChecks) {
- const guild = await Guild.findOneOrFail({
- where: { id: channel.guild_id },
- });
if (
!guild.features.includes("ALLOW_INVALID_CHANNEL_NAMES") &&
channel.name
@@ -293,14 +299,15 @@ export class Channel extends BaseClass {
if (!channel.permission_overwrites) channel.permission_overwrites = [];
// TODO: eagerly auto generate position of all guild channels
+ const position =
+ (channel.type === ChannelType.UNHANDLED ? 0 : channel.position) ||
+ 0;
+
channel = {
...channel,
...(!opts?.keepId && { id: Snowflake.generate() }),
created_at: new Date(),
- position:
- (channel.type === ChannelType.UNHANDLED
- ? 0
- : channel.position) || 0,
+ position,
};
const ret = Channel.create(channel);
@@ -314,6 +321,7 @@ export class Channel extends BaseClass {
guild_id: channel.guild_id,
} as ChannelCreateEvent)
: Promise.resolve(),
+ Guild.insertChannelInOrder(guild.id, ret.id, position, guild),
]);
return ret;
@@ -456,6 +464,40 @@ export class Channel extends BaseClass {
await Channel.delete({ id: channel.id });
}
+ static async calculatePosition(
+ channel_id: string,
+ guild_id: string,
+ guild?: Guild,
+ ) {
+ if (!guild)
+ guild = await Guild.findOneOrFail({
+ where: { id: guild_id },
+ select: { channelOrdering: true },
+ });
+
+ return guild.channelOrdering.findIndex((id) => channel_id == id);
+ }
+
+ static async getOrderedChannels(guild_id: string, guild?: Guild) {
+ if (!guild)
+ guild = await Guild.findOneOrFail({
+ where: { id: guild_id },
+ select: { channelOrdering: true },
+ });
+
+ const channels = await Promise.all(
+ guild.channelOrdering.map((id) =>
+ Channel.findOneOrFail({ where: { id } }),
+ ),
+ );
+
+ return channels.reduce((r, v) => {
+ v.position = (guild as Guild).channelOrdering.indexOf(v.id);
+ r[v.position] = v;
+ return r;
+ }, [] as Array<Channel>);
+ }
+
isDm() {
return (
this.type === ChannelType.DM || this.type === ChannelType.GROUP_DM
diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts
index bdbda74b..cf28f4ae 100644
--- a/src/util/entities/Guild.ts
+++ b/src/util/entities/Guild.ts
@@ -297,6 +297,9 @@ export class Guild extends BaseClass {
@Column({ nullable: true })
premium_progress_bar_enabled: boolean = false;
+ @Column({ select: false, type: "simple-array" })
+ channelOrdering: string[];
+
static async createGuild(body: {
name?: string;
icon?: string | null;
@@ -324,6 +327,7 @@ export class Guild extends BaseClass {
description: "",
welcome_channels: [],
},
+ channelOrdering: [],
afk_timeout: Config.get().defaults.guild.afkTimeout,
default_message_notifications:
@@ -376,7 +380,7 @@ export class Guild extends BaseClass {
const parent_id = ids.get(channel.parent_id);
- await Channel.createChannel(
+ const saved = await Channel.createChannel(
{ ...channel, guild_id, id, parent_id },
body.owner_id,
{
@@ -386,15 +390,69 @@ export class Guild extends BaseClass {
skipEventEmit: true,
},
);
+
+ await Guild.insertChannelInOrder(
+ guild.id,
+ saved.id,
+ parent_id ?? channel.position ?? 0,
+ guild,
+ );
}
return guild;
}
- toJSON() {
+ /** Insert a channel into the guild ordering by parent channel id or position */
+ static async insertChannelInOrder(
+ guild_id: string,
+ channel_id: string,
+ position: number,
+ guild?: Guild,
+ ): Promise<number>;
+ static async insertChannelInOrder(
+ guild_id: string,
+ channel_id: string,
+ parent_id: string,
+ guild?: Guild,
+ ): Promise<number>;
+ static async insertChannelInOrder(
+ guild_id: string,
+ channel_id: string,
+ insertPoint: string | number,
+ guild?: Guild,
+ ): Promise<number>;
+ static async insertChannelInOrder(
+ guild_id: string,
+ channel_id: string,
+ insertPoint: string | number,
+ guild?: Guild,
+ ): Promise<number> {
+ if (!guild)
+ guild = await Guild.findOneOrFail({
+ where: { id: guild_id },
+ select: { channelOrdering: true },
+ });
+
+ let position;
+ if (typeof insertPoint == "string")
+ position = guild.channelOrdering.indexOf(insertPoint) + 1;
+ else position = insertPoint;
+
+ guild.channelOrdering.remove(channel_id);
+
+ guild.channelOrdering.splice(position, 0, channel_id);
+ await Guild.update(
+ { id: guild_id },
+ { channelOrdering: guild.channelOrdering },
+ );
+ return position;
+ }
+
+ toJSON(): Guild {
return {
...this,
unavailable: this.unavailable == false ? undefined : true,
+ channelOrdering: undefined,
};
}
}
diff --git a/src/util/migration/mariadb/1696420827239-guildChannelOrdering.ts b/src/util/migration/mariadb/1696420827239-guildChannelOrdering.ts
new file mode 100644
index 00000000..bbab72e7
--- /dev/null
+++ b/src/util/migration/mariadb/1696420827239-guildChannelOrdering.ts
@@ -0,0 +1,40 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class guildChannelOrdering1696420827239 implements MigrationInterface {
+ name = "guildChannelOrdering1696420827239";
+
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ const guilds = await queryRunner.query(
+ `SELECT id FROM guilds`,
+ undefined,
+ true,
+ );
+
+ await queryRunner.query(
+ `ALTER TABLE guilds ADD channelOrdering text NOT NULL DEFAULT '[]'`,
+ );
+
+ for (const guild_id of guilds.records.map((x) => x.id)) {
+ const channels: Array<{ position: number; id: string }> = (
+ await queryRunner.query(
+ `SELECT id, position FROM channels WHERE guild_id = ?`,
+ [guild_id],
+ true,
+ )
+ ).records;
+
+ channels.sort((a, b) => a.position - b.position);
+
+ await queryRunner.query(
+ `UPDATE guilds SET channelOrdering = ? WHERE id = ?`,
+ [JSON.stringify(channels.map((x) => x.id)), guild_id],
+ );
+ }
+
+ await queryRunner.query(`ALTER TABLE channels DROP COLUMN position`);
+ }
+
+ public async down(): Promise<void> {
+ // don't care actually, sorry.
+ }
+}
diff --git a/src/util/migration/mysql/1696420827239-guildChannelOrdering.ts b/src/util/migration/mysql/1696420827239-guildChannelOrdering.ts
new file mode 100644
index 00000000..bbab72e7
--- /dev/null
+++ b/src/util/migration/mysql/1696420827239-guildChannelOrdering.ts
@@ -0,0 +1,40 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class guildChannelOrdering1696420827239 implements MigrationInterface {
+ name = "guildChannelOrdering1696420827239";
+
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ const guilds = await queryRunner.query(
+ `SELECT id FROM guilds`,
+ undefined,
+ true,
+ );
+
+ await queryRunner.query(
+ `ALTER TABLE guilds ADD channelOrdering text NOT NULL DEFAULT '[]'`,
+ );
+
+ for (const guild_id of guilds.records.map((x) => x.id)) {
+ const channels: Array<{ position: number; id: string }> = (
+ await queryRunner.query(
+ `SELECT id, position FROM channels WHERE guild_id = ?`,
+ [guild_id],
+ true,
+ )
+ ).records;
+
+ channels.sort((a, b) => a.position - b.position);
+
+ await queryRunner.query(
+ `UPDATE guilds SET channelOrdering = ? WHERE id = ?`,
+ [JSON.stringify(channels.map((x) => x.id)), guild_id],
+ );
+ }
+
+ await queryRunner.query(`ALTER TABLE channels DROP COLUMN position`);
+ }
+
+ public async down(): Promise<void> {
+ // don't care actually, sorry.
+ }
+}
diff --git a/src/util/migration/postgres/1696420827239-guildChannelOrdering.ts b/src/util/migration/postgres/1696420827239-guildChannelOrdering.ts
new file mode 100644
index 00000000..82085991
--- /dev/null
+++ b/src/util/migration/postgres/1696420827239-guildChannelOrdering.ts
@@ -0,0 +1,40 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class guildChannelOrdering1696420827239 implements MigrationInterface {
+ name = "guildChannelOrdering1696420827239";
+
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ const guilds = await queryRunner.query(
+ `SELECT id FROM guilds`,
+ undefined,
+ true,
+ );
+
+ await queryRunner.query(
+ `ALTER TABLE guilds ADD channelOrdering text NOT NULL DEFAULT '[]'`,
+ );
+
+ for (const guild_id of guilds.records.map((x) => x.id)) {
+ const channels: Array<{ position: number; id: string }> = (
+ await queryRunner.query(
+ `SELECT id, position FROM channels WHERE guild_id = $1`,
+ [guild_id],
+ true,
+ )
+ ).records;
+
+ channels.sort((a, b) => a.position - b.position);
+
+ await queryRunner.query(
+ `UPDATE guilds SET channelOrdering = $1 WHERE id = $2`,
+ [JSON.stringify(channels.map((x) => x.id)), guild_id],
+ );
+ }
+
+ await queryRunner.query(`ALTER TABLE channels DROP COLUMN position`);
+ }
+
+ public async down(): Promise<void> {
+ // don't care actually, sorry.
+ }
+}
|
