summary refs log tree commit diff
path: root/src/api
diff options
context:
space:
mode:
authorTomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>2024-08-18 10:41:45 +0200
committerTomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>2024-08-18 10:41:45 +0200
commitcae9d7ebed47d39a3143771241bb32148d473eee (patch)
tree2776a561c87084882e50baaeedc51c150a72cb61 /src/api
parentMerge pull request #1182 from DEVTomatoCake/fix/msg-update-pinned (diff)
downloadserver-ts-cae9d7ebed47d39a3143771241bb32148d473eee.tar.xz
widget.json channel_ordering, fix channel deletion
Diffstat (limited to 'src/api')
-rw-r--r--src/api/routes/channels/#channel_id/index.ts2
-rw-r--r--src/api/routes/guilds/#guild_id/widget.json.ts13
2 files changed, 10 insertions, 5 deletions
diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts

index 291b6472..883bb266 100644 --- a/src/api/routes/channels/#channel_id/index.ts +++ b/src/api/routes/channels/#channel_id/index.ts
@@ -115,7 +115,7 @@ router.delete( } await Promise.all([ - Channel.delete({ id: channel_id }), + Channel.deleteChannel(channel), emitEvent({ event: "CHANNEL_DELETE", data: channel, diff --git a/src/api/routes/guilds/#guild_id/widget.json.ts b/src/api/routes/guilds/#guild_id/widget.json.ts
index 39f49804..362a4a1c 100644 --- a/src/api/routes/guilds/#guild_id/widget.json.ts +++ b/src/api/routes/guilds/#guild_id/widget.json.ts
@@ -1,17 +1,17 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Spacebar and Spacebar 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 <https://www.gnu.org/licenses/>. */ @@ -47,7 +47,12 @@ router.get( async (req: Request, res: Response) => { const { guild_id } = req.params; - const guild = await Guild.findOneOrFail({ where: { id: guild_id } }); + const guild = await Guild.findOneOrFail({ + where: { id: guild_id }, + select: { + channel_ordering: true, + } + }); if (!guild.widget_enabled) throw new HTTPError("Widget Disabled", 404); // Fetch existing widget invite for widget channel