diff --git a/api/src/routes/users/@me/channels.ts b/api/src/routes/users/@me/channels.ts
index db9f8832..880e09c1 100644
--- a/api/src/routes/users/@me/channels.ts
+++ b/api/src/routes/users/@me/channels.ts
@@ -1,27 +1,18 @@
import { Router, Request, Response } from "express";
-import {
- ChannelModel,
- ChannelCreateEvent,
- toObject,
- ChannelType,
- Snowflake,
- trimSpecial,
- Channel,
- DMChannel,
- UserModel,
- emitEvent
-} from "@fosscord/util";
+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";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
- var channels = await ChannelModel.find({ recipient_ids: req.user_id }).exec();
+ const recipients = await Recipient.find({ where: { id: req.user_id }, relations: ["channel"] });
- res.json(toObject(channels));
+ res.json(recipients.map((x) => x.channel));
});
router.post("/", check(DmChannelCreateSchema), async (req: Request, res: Response) => {
@@ -29,26 +20,27 @@ router.post("/", check(DmChannelCreateSchema), async (req: Request, res: Respons
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 recipients = await User.find({ id: In(body.recipients) });
+
+ 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 ChannelModel({
+ const channel = await new Channel({
name,
type,
owner_id: req.user_id,
- id: Snowflake.generate(),
created_at: new Date(),
last_message_id: null,
- recipient_ids: [...body.recipients, req.user_id]
+ recipients: [...body.recipients.map((x) => new Recipient({ id: x })), new Recipient({ id: req.user_id })]
}).save();
- await emitEvent({ event: "CHANNEL_CREATE", data: toObject(channel), user_id: req.user_id } as ChannelCreateEvent);
+ await emitEvent({ event: "CHANNEL_CREATE", data: channel, user_id: req.user_id } as ChannelCreateEvent);
- res.json(toObject(channel));
+ res.json(channel);
});
export default router;
diff --git a/api/src/routes/users/@me/delete.ts b/api/src/routes/users/@me/delete.ts
index f863237d..6bfe0b93 100644
--- a/api/src/routes/users/@me/delete.ts
+++ b/api/src/routes/users/@me/delete.ts
@@ -1,16 +1,23 @@
import { Router, Request, Response } from "express";
-import { GuildModel, MemberModel, UserModel } from "@fosscord/util";
+import { Guild, Member, User } from "@fosscord/util";
import bcrypt from "bcrypt";
const router = Router();
router.post("/", async (req: Request, res: Response) => {
- const user = await UserModel.findOne({ id: req.user_id }).exec(); //User object
+ const user = await User.findOneOrFail({ id: req.user_id }); //User object
+ let correctpass = true;
+
+ if (user.data.hash) {
+ // guest accounts can delete accounts without password
+ correctpass = await bcrypt.compare(req.body.password, user.data.hash); //Not sure if user typed right password :/
+ }
+
+ // TODO: decrement guild member count
- let correctpass = await bcrypt.compare(req.body.password, user!.user_data.hash); //Not sure if user typed right password :/
if (correctpass) {
await Promise.all([
- UserModel.deleteOne({ id: req.user_id }).exec(), //Yeetus user deletus
- MemberModel.deleteMany({ id: req.user_id }).exec()
+ User.delete({ id: req.user_id }), //Yeetus user deletus
+ Member.delete({ id: req.user_id })
]);
res.sendStatus(204);
diff --git a/api/src/routes/users/@me/disable.ts b/api/src/routes/users/@me/disable.ts
index 2d3a9850..7b8a130c 100644
--- a/api/src/routes/users/@me/disable.ts
+++ b/api/src/routes/users/@me/disable.ts
@@ -1,15 +1,20 @@
-import { UserModel } from "@fosscord/util";
+import { User } from "@fosscord/util";
import { Router, Response, Request } from "express";
import bcrypt from "bcrypt";
const router = Router();
router.post("/", async (req: Request, res: Response) => {
- const user = await UserModel.findOne({ id: req.user_id }).exec(); //User object
+ const user = await User.findOneOrFail({ id: req.user_id }); //User object
+ let correctpass = true;
+
+ if (user.data.hash) {
+ // guest accounts can delete accounts without password
+ correctpass = await bcrypt.compare(req.body.password, user.data.hash); //Not sure if user typed right password :/
+ }
- let correctpass = await bcrypt.compare(req.body.password, user!.user_data.hash); //Not sure if user typed right password :/
if (correctpass) {
- await UserModel.updateOne({ id: req.user_id }, { disabled: true }).exec();
+ await User.update({ id: req.user_id }, { disabled: true });
res.sendStatus(204);
} else {
diff --git a/api/src/routes/users/@me/guilds.ts b/api/src/routes/users/@me/guilds.ts
index a9b53b75..fb88281b 100644
--- a/api/src/routes/users/@me/guilds.ts
+++ b/api/src/routes/users/@me/guilds.ts
@@ -1,34 +1,26 @@
import { Router, Request, Response } from "express";
-import { GuildModel, MemberModel, UserModel, GuildDeleteEvent, GuildMemberRemoveEvent, toObject, emitEvent } from "@fosscord/util";
+import { Guild, Member, User, GuildDeleteEvent, GuildMemberRemoveEvent, emitEvent } from "@fosscord/util";
import { HTTPError } from "lambert-server";
-
-import { getPublicUser } from "../../../util/User";
+import { In } from "typeorm";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
- const user = await UserModel.findOne({ id: req.user_id }, { guilds: true }).exec();
- if (!user) throw new HTTPError("User not found", 404);
-
- var guildIDs = user.guilds || [];
- var guild = await GuildModel.find({ id: { $in: guildIDs } })
- .populate({ path: "joined_at", match: { id: req.user_id } })
- .exec();
+ const members = await Member.find({ relations: ["guild"], where: { id: req.user_id } });
- res.json(toObject(guild));
+ res.json(members.map((x) => x.guild));
});
// user send to leave a certain guild
router.delete("/:id", async (req: Request, res: Response) => {
const guild_id = req.params.id;
- const guild = await GuildModel.findOne({ id: guild_id }, { guild_id: true }).exec();
+ const guild = await Guild.findOneOrFail({ where: { id: guild_id }, select: ["owner_id"] });
if (!guild) throw new HTTPError("Guild doesn't exist", 404);
if (guild.owner_id === req.user_id) throw new HTTPError("You can't leave your own guild", 400);
await Promise.all([
- MemberModel.deleteOne({ id: req.user_id, guild_id: guild_id }).exec(),
- UserModel.updateOne({ id: req.user_id }, { $pull: { guilds: guild_id } }).exec(),
+ Member.delete({ id: req.user_id, guild_id: guild_id }),
emitEvent({
event: "GUILD_DELETE",
data: {
@@ -38,7 +30,7 @@ router.delete("/:id", async (req: Request, res: Response) => {
} as GuildDeleteEvent)
]);
- const user = await getPublicUser(req.user_id);
+ const user = await User.getPublicUser(req.user_id);
await emitEvent({
event: "GUILD_MEMBER_REMOVE",
diff --git a/api/src/routes/users/@me/index.ts b/api/src/routes/users/@me/index.ts
index 6ebc6634..d5a5723c 100644
--- a/api/src/routes/users/@me/index.ts
+++ b/api/src/routes/users/@me/index.ts
@@ -1,6 +1,5 @@
import { Router, Request, Response } from "express";
-import { UserModel, toObject, PublicUserProjection } from "@fosscord/util";
-import { getPublicUser } from "../../../util/User";
+import { User } from "@fosscord/util";
import { UserModifySchema } from "../../../schema/User";
import { check } from "../../../util/instanceOf";
import { handleFile } from "../../../util/cdn";
@@ -8,29 +7,29 @@ import { handleFile } from "../../../util/cdn";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
- res.json(await getPublicUser(req.user_id));
+ res.json(await User.getPublicUser(req.user_id));
});
-const UserUpdateProjection = {
- accent_color: true,
- avatar: true,
- banner: true,
- bio: true,
- bot: true,
- discriminator: true,
- email: true,
- flags: true,
- id: true,
- locale: true,
- mfa_enabled: true,
- nsfw_alllowed: true,
- phone: true,
- public_flags: true,
- purchased_flags: true,
- // token: true, // this isn't saved in the db and needs to be set manually
- username: true,
- verified: true
-};
+const UserUpdateProjection = [
+ "accent_color",
+ "avatar",
+ "banner",
+ "bio",
+ "bot",
+ "discriminator",
+ "email",
+ "flags",
+ "id",
+ "locale",
+ "mfa_enabled",
+ "nsfw_alllowed",
+ "phone",
+ "public_flags",
+ "purchased_flags",
+ // "token", // this isn't saved in the db and needs to be set manually
+ "username",
+ "verified"
+];
router.patch("/", check(UserModifySchema), async (req: Request, res: Response) => {
const body = req.body as UserModifySchema;
@@ -38,10 +37,10 @@ router.patch("/", check(UserModifySchema), async (req: Request, res: Response) =
if (body.avatar) body.avatar = await handleFile(`/avatars/${req.user_id}`, body.avatar as string);
if (body.banner) body.banner = await handleFile(`/banners/${req.user_id}`, body.banner as string);
- const user = await UserModel.findOneAndUpdate({ id: req.user_id }, body, { projection: UserUpdateProjection, new: true }).exec();
+ const user = await new User({ ...body, id: req.user_id }).save();
// TODO: dispatch user update event
- res.json(toObject(user));
+ res.json(user);
});
export default router;
diff --git a/api/src/routes/users/@me/profile.ts b/api/src/routes/users/@me/profile.ts
index b67d1964..5ba03c68 100644
--- a/api/src/routes/users/@me/profile.ts
+++ b/api/src/routes/users/@me/profile.ts
@@ -1,27 +1,27 @@
import { Router, Request, Response } from "express";
-import { getPublicUser } from "../../../util/User";
+import { User } from "../../../../../util/dist";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
- const user = await getPublicUser(req.user_id, { user_data: true })
+ const user = await User.getPublicUser(req.user_id, { relations: ["connected_accounts"] });
- res.json({
- connected_accounts: user.user_data.connected_accounts,
- premium_guild_since: null, // TODO
- premium_since: null, // TODO
- user: {
- username: user.username,
- discriminator: user.discriminator,
- id: user.id,
- public_flags: user.public_flags,
- avatar: user.avatar,
- accent_color: user.accent_color,
- banner: user.banner,
- bio: user.bio,
- bot: user.bot,
- }
- });
+ res.json({
+ connected_accounts: user.connected_accounts,
+ premium_guild_since: null, // TODO
+ premium_since: null, // TODO
+ user: {
+ username: user.username,
+ discriminator: user.discriminator,
+ id: user.id,
+ public_flags: user.public_flags,
+ avatar: user.avatar,
+ accent_color: user.accent_color,
+ banner: user.banner,
+ bio: user.bio,
+ bot: user.bot
+ }
+ });
});
export default router;
diff --git a/api/src/routes/users/@me/relationships.ts b/api/src/routes/users/@me/relationships.ts
index 642ee5f9..0b864d88 100644
--- a/api/src/routes/users/@me/relationships.ts
+++ b/api/src/routes/users/@me/relationships.ts
@@ -1,12 +1,11 @@
import {
RelationshipAddEvent,
- UserModel,
+ User,
PublicUserProjection,
- toObject,
RelationshipType,
RelationshipRemoveEvent,
- UserDocument,
- emitEvent
+ emitEvent,
+ Relationship
} from "@fosscord/util";
import { Router, Response, Request } from "express";
import { HTTPError } from "lambert-server";
@@ -15,40 +14,36 @@ import { check, Length } from "../../../util/instanceOf";
const router = Router();
-const userProjection = { "user_data.relationships": true, ...PublicUserProjection };
+const userProjection: (keyof User)[] = ["relationships", ...PublicUserProjection];
router.get("/", async (req: Request, res: Response) => {
- const user = await UserModel.findOne({ id: req.user_id }, { user_data: { relationships: true } })
- .populate({ path: "user_data.relationships.id", model: UserModel })
- .exec();
+ const user = await User.findOneOrFail({ where: { id: req.user_id }, select: ["relationships"] });
- return res.json(toObject(user.user_data.relationships));
+ return res.json(user.relationships);
});
-async function addRelationship(req: Request, res: Response, friend: UserDocument, type: RelationshipType) {
+async function updateRelationship(req: Request, res: Response, friend: User, type: RelationshipType) {
const id = friend.id;
if (id === req.user_id) throw new HTTPError("You can't add yourself as a friend");
- const user = await UserModel.findOne({ id: req.user_id }, userProjection).exec();
- const newUserRelationships = [...user.user_data.relationships];
- const newFriendRelationships = [...friend.user_data.relationships];
+ const user = await User.findOneOrFail({ id: req.user_id }, { relations: ["relationships"], select: userProjection });
- var relationship = newUserRelationships.find((x) => x.id === id);
- const friendRequest = newFriendRelationships.find((x) => x.id === req.user_id);
+ var relationship = user.relationships.find((x) => x.id === id);
+ const friendRequest = friend.relationships.find((x) => x.id === req.user_id);
if (type === RelationshipType.blocked) {
if (relationship) {
if (relationship.type === RelationshipType.blocked) throw new HTTPError("You already blocked the user");
relationship.type = RelationshipType.blocked;
} else {
- relationship = { id, type: RelationshipType.blocked };
- newUserRelationships.push(relationship);
+ relationship = new Relationship({ id, type: RelationshipType.blocked });
+ user.relationships.push(relationship);
}
if (friendRequest && friendRequest.type !== RelationshipType.blocked) {
- newFriendRelationships.remove(friendRequest);
+ friend.relationships.remove(friendRequest);
await Promise.all([
- UserModel.updateOne({ id: friend.id }, { "user_data.relationships": newFriendRelationships }).exec(),
+ user.save(),
emitEvent({
event: "RELATIONSHIP_REMOVE",
data: friendRequest,
@@ -58,12 +53,12 @@ async function addRelationship(req: Request, res: Response, friend: UserDocument
}
await Promise.all([
- UserModel.updateOne({ id: req.user_id }, { "user_data.relationships": newUserRelationships }).exec(),
+ user.save(),
emitEvent({
event: "RELATIONSHIP_ADD",
data: {
- ...toObject(relationship),
- user: { ...toObject(friend), user_data: undefined }
+ ...relationship,
+ user: { ...friend }
},
user_id: req.user_id
} as RelationshipAddEvent)
@@ -72,41 +67,40 @@ async function addRelationship(req: Request, res: Response, friend: UserDocument
return res.sendStatus(204);
}
- var incoming_relationship = { id: req.user_id, nickname: undefined, type: RelationshipType.incoming };
- var outgoing_relationship = { id, nickname: undefined, type: RelationshipType.outgoing };
+ var incoming_relationship = new Relationship({ nickname: undefined, type: RelationshipType.incoming, id: req.user_id });
+ var outgoing_relationship = new Relationship({ nickname: undefined, type: RelationshipType.outgoing, id });
if (friendRequest) {
if (friendRequest.type === RelationshipType.blocked) throw new HTTPError("The user blocked you");
// accept friend request
- // @ts-ignore
incoming_relationship = friendRequest;
incoming_relationship.type = RelationshipType.friends;
outgoing_relationship.type = RelationshipType.friends;
- } else newFriendRelationships.push(incoming_relationship);
+ } else friend.relationships.push(incoming_relationship);
if (relationship) {
if (relationship.type === RelationshipType.outgoing) throw new HTTPError("You already sent a friend request");
if (relationship.type === RelationshipType.blocked) throw new HTTPError("Unblock the user before sending a friend request");
if (relationship.type === RelationshipType.friends) throw new HTTPError("You are already friends with the user");
- } else newUserRelationships.push(outgoing_relationship);
+ } else user.relationships.push(outgoing_relationship);
await Promise.all([
- UserModel.updateOne({ id: req.user_id }, { "user_data.relationships": newUserRelationships }).exec(),
- UserModel.updateOne({ id: friend.id }, { "user_data.relationships": newFriendRelationships }).exec(),
+ user.save(),
+ friend.save(),
emitEvent({
event: "RELATIONSHIP_ADD",
data: {
...outgoing_relationship,
- user: { ...toObject(friend), user_data: undefined }
+ user: { ...friend }
},
user_id: req.user_id
} as RelationshipAddEvent),
emitEvent({
event: "RELATIONSHIP_ADD",
data: {
- ...toObject(incoming_relationship),
+ ...incoming_relationship,
should_notify: true,
- user: { ...toObject(user), user_data: undefined }
+ user: { ...user }
},
user_id: id
} as RelationshipAddEvent)
@@ -116,14 +110,23 @@ async function addRelationship(req: Request, res: Response, friend: UserDocument
}
router.put("/:id", check({ $type: new Length(Number, 1, 4) }), async (req: Request, res: Response) => {
- return await addRelationship(req, res, await UserModel.findOne({ id: req.params.id }), req.body.type);
+ return await updateRelationship(
+ req,
+ res,
+ await User.findOneOrFail({ id: req.params.id }, { relations: ["relationships"], select: userProjection }),
+ req.body.type
+ );
});
router.post("/", check({ discriminator: String, username: String }), async (req: Request, res: Response) => {
- return await addRelationship(
+ return await updateRelationship(
req,
res,
- await UserModel.findOne(req.body as { discriminator: string; username: string }).exec(),
+ await User.findOneOrFail({
+ relations: ["relationships"],
+ select: userProjection,
+ where: req.body as { discriminator: string; username: string }
+ }),
req.body.type
);
});
@@ -132,17 +135,15 @@ router.delete("/:id", async (req: Request, res: Response) => {
const { id } = req.params;
if (id === req.user_id) throw new HTTPError("You can't remove yourself as a friend");
- const user = await UserModel.findOne({ id: req.user_id }).exec();
- if (!user) throw new HTTPError("Invalid token", 400);
+ const user = await User.findOneOrFail({ id: req.user_id }, { select: userProjection, relations: ["relationships"] });
+ const friend = await User.findOneOrFail({ id: id }, { select: userProjection, relations: ["relationships"] });
- const friend = await UserModel.findOne({ id }, userProjection).exec();
- if (!friend) throw new HTTPError("User not found", 404);
+ const relationship = user.relationships.find((x) => x.id === id);
+ const friendRequest = friend.relationships.find((x) => x.id === req.user_id);
- const relationship = user.user_data.relationships.find((x) => x.id === id);
- const friendRequest = friend.user_data.relationships.find((x) => x.id === req.user_id);
if (relationship?.type === RelationshipType.blocked) {
// unblock user
- user.user_data.relationships.remove(relationship);
+ user.relationships.remove(relationship);
await Promise.all([
user.save(),
@@ -153,8 +154,8 @@ router.delete("/:id", async (req: Request, res: Response) => {
if (!relationship || !friendRequest) throw new HTTPError("You are not friends with the user", 404);
if (friendRequest.type === RelationshipType.blocked) throw new HTTPError("The user blocked you");
- user.user_data.relationships.remove(relationship);
- friend.user_data.relationships.remove(friendRequest);
+ user.relationships.remove(relationship);
+ friend.relationships.remove(friendRequest);
await Promise.all([
user.save(),
diff --git a/api/src/routes/users/@me/settings.ts b/api/src/routes/users/@me/settings.ts
index 5664fc2f..90ee6372 100644
--- a/api/src/routes/users/@me/settings.ts
+++ b/api/src/routes/users/@me/settings.ts
@@ -1,5 +1,5 @@
import { Router, Response, Request } from "express";
-import { UserModel, UserSettings } from "@fosscord/util";
+import { User, UserSettings } from "@fosscord/util";
import { check } from "../../../util/instanceOf";
import { UserSettingsSchema } from "../../../schema/User";
@@ -8,7 +8,8 @@ const router = Router();
router.patch("/", check(UserSettingsSchema), async (req: Request, res: Response) => {
const body = req.body as UserSettings;
- await UserModel.updateOne({ id: req.user_id }, body).exec();
+ // only users can update user settings
+ await User.update({ id: req.user_id, bot: false }, { settings: body });
res.sendStatus(204);
});
|
