dandri/server
1
0 Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-10-22 17:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecation: Use object-based relations for typeorm

Browse Source
This commit is contained in:
Rory& committed 2025-12-19 21:06:12 +01:00
1 parent 7c247aedb9
commit 6162fbd520
55 files changed
+151 -137
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/util/entities/Channel.ts
+4 -4
View File
@@ -273,7 +273,7 @@ export class Channel extends BaseClass {
const userRecipients = await Recipient.find({
where: { user_id: creator_user_id },
relations: ["channel", "channel.recipients"],
relations: { channel: { recipients: true } },
});
for (const ur of userRecipients) {
@@ -451,8 +451,8 @@ export class Channel extends BaseClass {
let member = opts.member;
if (!member) {
if (opts.user) member = await Member.findOneOrFail({ where: { guild_id: guild.id, id: opts.user.id }, relations: ["roles"] });
else if (opts.user_id) member = await Member.findOneOrFail({ where: { guild_id: guild.id, id: opts.user_id }, relations: ["roles"] });
if (opts.user) member = await Member.findOneOrFail({ where: { guild_id: guild.id, id: opts.user.id }, relations: { roles: true } });
else if (opts.user_id) member = await Member.findOneOrFail({ where: { guild_id: guild.id, id: opts.user_id }, relations: { roles: true } });
else {
console.error("Channel.getUserPermissions: called without user or member for non-DM channel.");
return Permissions.NONE;
@@ -464,7 +464,7 @@ export class Channel extends BaseClass {
(
await Member.findOneOrFail({
where: { guild_id: guild.id, index: member.index },
relations: ["roles"],
relations: { roles: true },
select: {
roles: {
id: true,
src/util/entities/Member.ts
+5 -5
View File
@@ -175,7 +175,7 @@ export class Member extends BaseClassWithoutId {
if (guild.owner_id === user_id) throw new Error("The owner cannot be removed of the guild");
const member = await Member.findOneOrFail({
where: { id: user_id, guild_id },
relations: ["user"],
relations: { user: true },
});
// use promise all to execute all promises at the same time -> save time
@@ -205,7 +205,7 @@ export class Member extends BaseClassWithoutId {
const [member] = await Promise.all([
Member.findOneOrFail({
where: { id: user_id, guild_id },
relations: ["user", "roles"], // we don't want to load the role objects just the ids
relations: { user: true, roles: true }, // we don't want to load the role objects just the ids
select: {
index: true,
roles: {
@@ -238,7 +238,7 @@ export class Member extends BaseClassWithoutId {
const [member] = await Promise.all([
Member.findOneOrFail({
where: { id: user_id, guild_id },
relations: ["user", "roles"], // we don't want to load the role objects just the ids
relations: { user: true, roles: true }, // we don't want to load the role objects just the ids
select: {
index: true,
roles: {
@@ -270,7 +270,7 @@ export class Member extends BaseClassWithoutId {
id: user_id,
guild_id,
},
relations: ["user"],
relations: { user: true },
});
// @ts-expect-error Member nickname is nullable
@@ -327,7 +327,7 @@ export class Member extends BaseClassWithoutId {
},
},
},
relations: ["user", "roles"],
relations: { user: true, roles: true },
take: 10,
})
).map((member) => member.toPublicMember());