From 536900d255ff4306b00903dac1988ca08ce731ee Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Mon, 31 May 2021 20:32:23 +0200 Subject: [PATCH] :construction: dm channels --- package-lock.json | Bin 780626 -> 780836 bytes package.json | 4 ++-- src/routes/users/@me/channels.ts | 32 ++++++++++++++++--------------- src/routes/users/@me/delete.ts | 7 +++++-- src/schema/Channel.ts | 12 ++++++------ src/util/Channel.ts | 2 +- 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e557f54caf9f25f015bee4d779253d7ded20191..847eb91f4edffe2d56d292ce25c8caec1604023e 100644 GIT binary patch delta 1395 zcmciAJ&4byjBFmC2t5Z(0{3ZLOJ6V>ksj?+(oh^UJ zvSi(Mv|#85O;O-a=@QzbN1+fx1`S<8r*5G~r*4G=0$DECLdcT#)(%-RczEIAot_7N z$H&;=AK1;m0d@BuAqL2MH{yQ^P=0a&3(MjM;nROnMdD000cH>U;`fi08mApj{BH25mThfOvaR@)GJdRXR#fp zHN^YoHrL@LO7tXJW&JuS==njAo{8Hno69zJLZix)q0*JpLZ@48&F}$D&eK{m{QYYj zUh%*i@eIzu#1XOqGO*@>%{ZMQ;LZ`kz?&bhZouC>;KCoT#je7WJF)YL(bybzMuUOb zaV^h;FYd&yzVrXz_0Gt~+Rn(In$C1!O2Yyu+GJ+w{* ztU(P`j+Ik;s!;Eg#Qml}qUQUZJ<^nTEZB4VTA(y=wyxL?t8X#2-6EGVX?s4LH03QO z&Dq>mu1c6fRhN~%n`RjJw7&W#RBwUxS1St)N!so`aK)BpYI{LQ7*gL(kj$xrwds`kWthv9?|C&sN&1 z!0ZINZE;$I^O`orl`stI&sRQNJfLII13JF;D0HS6M3O7-!(VU2QH3`0O;U3OO3StL zjge5^rUQ)brN}PPRw+fPx20OcsuV@5*5e7LovQ_|#0GV3%JZpR6O%Q)X!E?!_Dr5B z71KL=1{H({5xTgaTsgbd=zj9tx1TM;yq-X=-AhPEU~zJIE;>0xUIR;05AiAT5xney zjhC_qc=W{)^7Ex7TD=^OzgdgWUy%21EfHICk(JIzS!wO`_A;=+brgAPaq)C5x_Ek_ G@a#WldfYw$ delta 1297 zcmciAO=#160LO9u?M&N&Q^Y-k!L+_2&W9vz+9Y1IU79xOTe>#wx(8utvo=lE*QH6C zlS84NM5*vUC^%8k!9c`A4tfzUo<)%7xi}sao{I=o@M_P`!J9k$;CK68K9Am`@7|%e zz5(L-_oNF1UtD(olZ4l+2nPRph@6Ah?<0Oupu0J$QpNDRsw}gtYT_j}m?L@}vqI!s zRE;ss?4r8fmLs+jXBk{jm8cdESdlC)Rw7hNW2wa|Pi5*UHY&#L%nDyvSU$+N%4DHYOC$`Vhnpd#z-;t0$+T9)Le)*e7*IKK6Lw2(49*&0 z-i=c@+?&(@4$}rW;|>!v>>GfFYhPXS@T~!KI7fmx=amWmI|?xPnsT9#e(5l2#(t1F;)&Mrz8v4a9UlfyUDc54d zra-2fg;t%>noSB#3bxcJtYp}1q#ja9CNG6~QWM&JvRR0BmngL(W-Y0oE18MqV5ddM z>1DY{aWUMIb-1;QEQ}8Sc@W;Z=<*JCD3`NCxxr`n?7Rnse=kg(hJRc_`~^K)wTg*Q zLJjMisG{NcdMFaD;tj=0&=S{M;dKS28-`X}@0QfnSj>+1EF;#`TY{J}kfi^KJi7ZrwmG{2C>|oGVW~yGQob;iz-l=Zs%^PTtushC^@8>v(g% b@%I1piN8Z%5^l@W$A)`jpR+ffW`6tx2}`?u diff --git a/package.json b/package.json index c1c3d8c8..06ff7fc5 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/fosscord/fosscord-api#readme", "dependencies": { - "@fosscord/server-util": "^1.3.14", + "@fosscord/server-util": "^1.3.15", "@types/jest": "^26.0.22", "@types/json-schema": "^7.0.7", "ajv": "^8.4.0", @@ -49,7 +49,7 @@ "i18next-http-middleware": "^3.1.3", "i18next-node-fs-backend": "^2.1.3", "jsonwebtoken": "^8.5.1", - "lambert-server": "^1.2.3", + "lambert-server": "^1.2.4", "missing-native-js-functions": "^1.2.6", "mongoose": "^5.12.3", "mongoose-autopopulate": "^0.12.3", diff --git a/src/routes/users/@me/channels.ts b/src/routes/users/@me/channels.ts index 3b2b6781..4cab869b 100644 --- a/src/routes/users/@me/channels.ts +++ b/src/routes/users/@me/channels.ts @@ -2,50 +2,52 @@ import { Router, Request, Response } from "express"; import { ChannelModel, ChannelCreateEvent, - DMChannel, - UserModel, toObject, ChannelType, Snowflake, trimSpecial, + Channel, + DMChannel, + UserModel } from "@fosscord/server-util"; import { HTTPError } from "lambert-server"; import { emitEvent } from "../../../util/Event"; -import { getPublicUser } from "../../../util/User"; import { DmChannelCreateSchema } from "../../../schema/Channel"; import { check } from "../../../util/instanceOf"; const router: Router = Router(); router.get("/", async (req: Request, res: Response) => { - var channels = await ChannelModel.find({ - $or: [ - { recipients: req.user_id, type: ChannelType.DM }, - { recipients: req.user_id, type: ChannelType.GROUP_DM }, - ], - }).exec(); + var channels = await ChannelModel.find({ recipient_ids: req.user_id }).exec(); res.json(toObject(channels)); }); router.post("/", check(DmChannelCreateSchema), async (req, res) => { const body = req.body as DmChannelCreateSchema; - if (body.recipients.length === 0) throw new HTTPError("You need to specify at least one recipient"); + + body.recipients = body.recipients.filter((x) => x !== req.user_id).unique(); + + if (!(await Promise.all(body.recipients.map((x) => UserModel.exists({ id: x })))).every((x) => x)) { + throw new HTTPError("Recipient not found"); + } + const type = body.recipients.length === 1 ? ChannelType.DM : ChannelType.GROUP_DM; const name = trimSpecial(body.name); - const channel = { + const channel = await new ChannelModel({ name, type, owner_id: req.user_id, id: Snowflake.generate(), created_at: new Date(), - }; - await new ChannelModel(channel).save(); + last_message_id: null, + recipient_ids: [...body.recipients, req.user_id] + }).save(); - /*Event({ event: "CHANNEL_CREATE", data: channel } as ChannelCreateEvent);*/ + await emitEvent({ event: "CHANNEL_CREATE", data: toObject(channel), user_id: req.user_id } as ChannelCreateEvent); - res.json(channel); + res.json(toObject(channel)); }); export default router; diff --git a/src/routes/users/@me/delete.ts b/src/routes/users/@me/delete.ts index aef4006c..edda8e2d 100644 --- a/src/routes/users/@me/delete.ts +++ b/src/routes/users/@me/delete.ts @@ -1,5 +1,5 @@ import { Router, Request, Response } from "express"; -import { UserModel } from "@fosscord/server-util"; +import { GuildModel, MemberModel, UserModel } from "@fosscord/server-util"; import bcrypt from "bcrypt"; const router = Router(); @@ -8,7 +8,10 @@ router.post("/", async (req: Request, res: Response) => { let correctpass = await bcrypt.compare(req.body.password, user!.user_data.hash); //Not sure if user typed right password :/ if (correctpass) { - await UserModel.deleteOne({ id: req.user_id }).exec(); //Yeetus user deletus + await Promise.all([ + UserModel.deleteOne({ id: req.user_id }).exec(), //Yeetus user deletus + MemberModel.deleteMany({ id: req.user_id }).exec() + ]); res.sendStatus(204); } else { diff --git a/src/schema/Channel.ts b/src/schema/Channel.ts index a89d5fb3..2cb7f7f4 100644 --- a/src/schema/Channel.ts +++ b/src/schema/Channel.ts @@ -14,16 +14,16 @@ export const ChannelModifySchema = { id: String, type: new Length(Number, 0, 1), // either 0 (role) or 1 (member) allow: BigInt, - deny: BigInt, - }, + deny: BigInt + } ], $parent_id: String, - $nsfw: Boolean, + $nsfw: Boolean }; export const DmChannelCreateSchema = { $name: String, - recipients: [String], + recipients: new Length([String], 1, 10) }; export interface DmChannelCreateSchema { @@ -52,8 +52,8 @@ export interface ChannelModifySchema { export const ChannelGuildPositionUpdateSchema = [ { id: String, - $position: Number, - }, + $position: Number + } ]; export type ChannelGuildPositionUpdateSchema = { diff --git a/src/util/Channel.ts b/src/util/Channel.ts index c8df85bc..8dfc03bc 100644 --- a/src/util/Channel.ts +++ b/src/util/Channel.ts @@ -45,7 +45,7 @@ export async function createChannel(channel: Partial id: Snowflake.generate(), created_at: new Date(), // @ts-ignore - recipients: null + recipient_ids: null }).save(); await emitEvent({ event: "CHANNEL_CREATE", data: channel, guild_id: channel.guild_id } as ChannelCreateEvent);