Add <Channel>.position to public endpoints
This commit is contained in:
parent
ef13c8c814
commit
e116e93693
@ -50,7 +50,13 @@ router.get(
|
|||||||
const channel = await Channel.findOneOrFail({
|
const channel = await Channel.findOneOrFail({
|
||||||
where: { id: channel_id },
|
where: { id: channel_id },
|
||||||
});
|
});
|
||||||
|
if (!channel.guild_id) return res.send(channel);
|
||||||
|
|
||||||
|
channel.position = await Channel.calculatePosition(
|
||||||
|
channel_id,
|
||||||
|
channel.guild_id,
|
||||||
|
channel.guild,
|
||||||
|
);
|
||||||
return res.send(channel);
|
return res.send(channel);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
/*
|
/*
|
||||||
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
||||||
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
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
|
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
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU Affero General Public License for more details.
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
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/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
@ -53,6 +53,11 @@ router.put(
|
|||||||
where: { id: channel_id },
|
where: { id: channel_id },
|
||||||
});
|
});
|
||||||
if (!channel.guild_id) throw new HTTPError("Channel not found", 404);
|
if (!channel.guild_id) throw new HTTPError("Channel not found", 404);
|
||||||
|
channel.position = await Channel.calculatePosition(
|
||||||
|
channel_id,
|
||||||
|
channel.guild_id,
|
||||||
|
channel.guild,
|
||||||
|
);
|
||||||
|
|
||||||
if (body.type === 0) {
|
if (body.type === 0) {
|
||||||
if (!(await Role.count({ where: { id: overwrite_id } })))
|
if (!(await Role.count({ where: { id: overwrite_id } })))
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
/*
|
/*
|
||||||
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
||||||
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
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
|
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
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU Affero General Public License for more details.
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
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/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
@ -41,6 +41,14 @@ router.get(
|
|||||||
const { guild_id } = req.params;
|
const { guild_id } = req.params;
|
||||||
const channels = await Channel.find({ where: { guild_id } });
|
const channels = await Channel.find({ where: { guild_id } });
|
||||||
|
|
||||||
|
for await (const channel of channels) {
|
||||||
|
channel.position = await Channel.calculatePosition(
|
||||||
|
channel.id,
|
||||||
|
guild_id,
|
||||||
|
channel.guild,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
res.json(channels);
|
res.json(channels);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@ -71,6 +79,11 @@ router.post(
|
|||||||
{ ...body, guild_id },
|
{ ...body, guild_id },
|
||||||
req.user_id,
|
req.user_id,
|
||||||
);
|
);
|
||||||
|
channel.position = await Channel.calculatePosition(
|
||||||
|
channel.id,
|
||||||
|
guild_id,
|
||||||
|
channel.guild,
|
||||||
|
);
|
||||||
|
|
||||||
res.status(201).json(channel);
|
res.status(201).json(channel);
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user