diff --git a/api/src/routes/auth/register.ts b/api/src/routes/auth/register.ts
index e0af1d6d..e70e01ed 100644
--- a/api/src/routes/auth/register.ts
+++ b/api/src/routes/auth/register.ts
@@ -137,7 +137,7 @@ router.post("/", route({ body: "RegisterSchema" }), async (req: Request, res: Re
if (!register.allowMultipleAccounts) {
// TODO: check if fingerprint was eligible generated
- const exists = await User.findOne({ where: { fingerprints: In(fingerprint) } });
+ const exists = await User.findOne({ where: { fingerprints: fingerprint } });
if (exists) {
throw FieldErrors({
diff --git a/api/src/routes/guilds/#guild_id/roles.ts b/api/src/routes/guilds/#guild_id/roles.ts
index 6b2902d9..5c549262 100644
--- a/api/src/routes/guilds/#guild_id/roles.ts
+++ b/api/src/routes/guilds/#guild_id/roles.ts
@@ -132,7 +132,7 @@ router.patch("/", route({ body: "RolePositionUpdateSchema" }), async (req: Reque
await Promise.all(body.map(async (x) => Role.update({ guild_id, id: x.id }, { position: x.position })));
- const roles = await Role.find({ guild_id, id: In(body.map((x) => x.id)) });
+ const roles = await Role.find({ where: body.map((x) => ({ id: x.id, guild_id })) });
await Promise.all(
roles.map((x) =>
diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 9394f9e8..736704f8 100644
--- a/util/src/entities/User.ts
+++ b/util/src/entities/User.ts
@@ -106,7 +106,7 @@ export class User extends BaseClass {
mfa_enabled: boolean; // if multi factor authentication is enabled
@Column()
- created_at: Date = new Date(); // registration date
+ created_at: Date; // registration date
@Column()
verified: boolean; // if the user is offically verified
@@ -127,7 +127,7 @@ export class User extends BaseClass {
public_flags: string;
@JoinColumn({ name: "relationship_ids" })
- @OneToMany(() => Relationship, (relationship: Relationship) => relationship.user, { cascade: true })
+ @OneToMany(() => Relationship, (relationship: Relationship) => relationship.from)
relationships: Relationship[];
@JoinColumn({ name: "connected_account_ids" })
@@ -146,6 +146,14 @@ export class User extends BaseClass {
@Column({ type: "simple-json" })
settings: UserSettings;
+ toPublicUser() {
+ const user: any = {};
+ PublicUserProjection.forEach((x) => {
+ user[x] = this[x];
+ });
+ return user as PublicUser;
+ }
+
static async getPublicUser(user_id: string, opts?: FindOneOptions<User>) {
const user = await User.findOne(
{ id: user_id },
@@ -261,7 +269,7 @@ export class UserFlags extends BitField {
SYSTEM: BigInt(1) << BigInt(12),
HAS_UNREAD_URGENT_MESSAGES: BigInt(1) << BigInt(13),
BUGHUNTER_LEVEL_2: BigInt(1) << BigInt(14),
- UNDERAGE_DELETED: BigInt(1) << BigInt(15),
+ UNDERAGE_DELETED: BigInt(1) << BigInt(15),
VERIFIED_BOT: BigInt(1) << BigInt(16),
EARLY_VERIFIED_BOT_DEVELOPER: BigInt(1) << BigInt(17),
};
|
