diff --git a/packages/backend/src/models/AbuseUserReport.ts b/packages/backend/src/models/AbuseUserReport.ts index c1a44c3d40..8f8d759004 100644 --- a/packages/backend/src/models/AbuseUserReport.ts +++ b/packages/backend/src/models/AbuseUserReport.ts @@ -5,7 +5,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { MiInstance } from '@/models/Instance.js'; -import { MiUserProfile } from '@/models/UserProfile.js'; import { id } from './util/id.js'; import { MiUser } from './User.js'; @@ -26,13 +25,6 @@ export class MiAbuseUserReport { @JoinColumn() public targetUser: MiUser | null; - @ManyToOne(() => MiUserProfile, { - onDelete: 'CASCADE', - createForeignKeyConstraints: false, - }) - @JoinColumn({ name: 'targetUserId', referencedColumnName: 'userId' }) - public targetUserProfile: MiUserProfile | null; - @Index() @Column(id()) public reporterId: MiUser['id']; @@ -43,13 +35,6 @@ export class MiAbuseUserReport { @JoinColumn() public reporter: MiUser | null; - @ManyToOne(() => MiUserProfile, { - onDelete: 'CASCADE', - createForeignKeyConstraints: false, - }) - @JoinColumn({ name: 'reporterId', referencedColumnName: 'userId' }) - public reporterProfile: MiUserProfile | null; - @Column({ ...id(), nullable: true, @@ -62,13 +47,6 @@ export class MiAbuseUserReport { @JoinColumn() public assignee: MiUser | null; - @ManyToOne(() => MiUserProfile, { - onDelete: 'CASCADE', - createForeignKeyConstraints: false, - }) - @JoinColumn({ name: 'assigneeId', referencedColumnName: 'userId' }) - public assigneeProfile: MiUserProfile | null; - @Index() @Column('boolean', { default: false, diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts index bf71cb82c4..b8200c09aa 100644 --- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -122,12 +122,12 @@ export default class extends Endpoint { // eslint- super(meta, paramDef, async (ps, me) => { const query = this.queryService.makePaginationQuery(this.abuseUserReportsRepository.createQueryBuilder('report'), ps.sinceId, ps.untilId) .leftJoinAndSelect('report.targetUser', 'targetUser') - .leftJoinAndSelect('report.targetUserProfile', 'targetUserProfile') + .leftJoinAndSelect('targetUser.userProfile', 'targetUserProfile') .leftJoinAndSelect('report.targetUserInstance', 'targetUserInstance') .leftJoinAndSelect('report.reporter', 'reporter') - .leftJoinAndSelect('report.reporterProfile', 'reporterProfile') + .leftJoinAndSelect('reporter.userProfile', 'reporterProfile') .leftJoinAndSelect('report.assignee', 'assignee') - .leftJoinAndSelect('report.assigneeProfile', 'assigneeProfile') + .leftJoinAndSelect('assignee.userProfile', 'assigneeProfile') ; switch (ps.state) {