diff --git a/api/src/routes/users/@me/channels.ts b/api/src/routes/users/@me/channels.ts
index 6fd396b8..b5782eca 100644
--- a/api/src/routes/users/@me/channels.ts
+++ b/api/src/routes/users/@me/channels.ts
@@ -1,46 +1,22 @@
-import { Router, Request, Response } from "express";
-import { Channel, ChannelCreateEvent, ChannelType, Snowflake, trimSpecial, User, emitEvent } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
-
-import { DmChannelCreateSchema } from "../../../schema/Channel";
-import { check } from "../../../util/instanceOf";
-import { In } from "typeorm";
-import { Recipient } from "../../../../../util/dist/entities/Recipient";
+import { Request, Response, Router } from "express";
+import { Recipient, DmChannelDTO, Channel } from "@fosscord/util";
+import { route } from "@fosscord/api";
const router: Router = Router();
-router.get("/", async (req: Request, res: Response) => {
- const recipients = await Recipient.find({ where: { user_id: req.user_id }, relations: ["channel"] });
-
- res.json(recipients.map((x) => x.channel));
+router.get("/", route({}), async (req: Request, res: Response) => {
+ const recipients = await Recipient.find({ where: { user_id: req.user_id, closed: false }, relations: ["channel", "channel.recipients"] });
+ res.json(await Promise.all(recipients.map(r => DmChannelDTO.from(r.channel, [req.user_id]))));
});
-router.post("/", check(DmChannelCreateSchema), async (req: Request, res: Response) => {
- const body = req.body as DmChannelCreateSchema;
-
- body.recipients = body.recipients.filter((x) => x !== req.user_id).unique();
-
- const recipients = await User.find({ id: In(body.recipients) });
+export interface DmChannelCreateSchema {
+ name?: string;
+ recipients: string[];
+}
- if (recipients.length !== body.recipients.length) {
- throw new HTTPError("Recipient/s not found");
- }
-
- const type = body.recipients.length === 1 ? ChannelType.DM : ChannelType.GROUP_DM;
- const name = trimSpecial(body.name);
-
- const channel = await new Channel({
- name,
- type,
- owner_id: req.user_id,
- created_at: new Date(),
- last_message_id: null,
- recipients: [...body.recipients.map((x) => new Recipient({ id: x })), new Recipient({ id: req.user_id })]
- }).save();
-
- await emitEvent({ event: "CHANNEL_CREATE", data: channel, user_id: req.user_id } as ChannelCreateEvent);
-
- res.json(channel);
+router.post("/", route({ body: "DmChannelCreateSchema" }), async (req: Request, res: Response) => {
+ const body = req.body as DmChannelCreateSchema;
+ res.json(await Channel.createDMChannel(body.recipients, req.user_id, body.name));
});
export default router;
|
