Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-mattyatea/report' into develop

Browse source 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/models/Meta.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/admin/update-meta.ts
This commit is contained in:
mattyatea 2024-01-28 08:01:21 +09:00
commit 7a3eb26c4d
16 changed files with 276 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/migration/1702149469508-abusenoteselect.js Normal file
View file

@ -0,0 +1,11 @@
export class Abusenoteselect1702149469508 {
name = 'Abusenoteselect1702149469508'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "notes" jsonb NOT NULL DEFAULT '[]'`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "notes"`);
}
}

11
packages/backend/migration/1703704097603-GDPRMode.js Normal file
View file

@ -0,0 +1,11 @@
export class GDPRMode1703704097603 {
name = 'GDPRMode1703704097603'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" ADD "enableGDPRMode" boolean NOT NULL DEFAULT false`);
}
async down(queryRunner) {;
await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableGDPRMode"`);
}
}

11
packages/backend/migration/1704005554275-abusenoteIds.js Normal file
View file

@ -0,0 +1,11 @@
export class AbusenoteId1704005554275 {
name = 'AbusenoteId1704005554275'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "noteIds" jsonb NOT NULL DEFAULT '[]'`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "noteIds"`);
}
}

2
packages/backend/src/core/GlobalEventService.ts
View file

@ -158,6 +158,8 @@ export interface AdminEventTypes {
targetUserId: MiUser['id'],
reporterId: MiUser['id'],
comment: string;
notes: any[];
noteIds: string[];
};
}

24
packages/backend/src/core/entities/AbuseUserReportEntityService.ts
View file

@ -4,12 +4,14 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import { In } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { AbuseUserReportsRepository } from '@/models/_.js';
import type { AbuseUserReportsRepository, NotesRepository } from '@/models/_.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
import { bindThis } from '@/decorators.js';
import { IdService } from '@/core/IdService.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@ -18,7 +20,11 @@ export class AbuseUserReportEntityService {
@Inject(DI.abuseUserReportsRepository)
private abuseUserReportsRepository: AbuseUserReportsRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private userEntityService: UserEntityService,
private noteEntityService: NoteEntityService,
private idService: IdService,
) {
}
@ -28,11 +34,27 @@ export class AbuseUserReportEntityService {
src: MiAbuseUserReport['id'] | MiAbuseUserReport,
) {
const report = typeof src === 'object' ? src : await this.abuseUserReportsRepository.findOneByOrFail({ id: src });
const notes = [];
if (report.noteIds && report.noteIds.length > 0) {
for (const x of report.noteIds) {
const exists = await this.notesRepository.countBy({ id: x });
if (exists === 0) {
notes.push('deleted');
continue;
}
notes.push(await this.noteEntityService.pack(x));
}
} else if (report.notes.length > 0) {
notes.push(...(report.notes));
}
console.log(report.notes.length, null, notes);
return await awaitAll({
id: report.id,
createdAt: this.idService.parse(report.id).date.toISOString(),
comment: report.comment,
notes,
resolved: report.resolved,
reporterId: report.reporterId,
targetUserId: report.targetUserId,

10
packages/backend/src/models/AbuseUserReport.ts
View file

@ -60,6 +60,16 @@ export class MiAbuseUserReport {
})
public comment: string;
@Column('jsonb', {
default: [],
})
public notes: any[];
@Column('jsonb', {
default: [],
})
public noteIds: string[] | null;
//#region Denormalized fields
@Index()
@Column('varchar', {

5
packages/backend/src/models/Meta.ts
View file

@ -601,4 +601,9 @@ export class MiMeta {
default: false,
})
public requestEmojiAllOk: boolean;
@Column('boolean', {
default: false,
})
public enableGDPRMode: boolean;
}

7
packages/backend/src/server/api/endpoints/admin/meta.ts
View file

@ -444,6 +444,10 @@ export const meta = {
type: 'string',
optional: false, nullable: false,
},
enableGDPRMode: {
type: 'boolean',
optional: false, nullable: false,
},
DiscordWebhookUrl: {
type: 'string',
optional: false, nullable: true,
@ -576,7 +580,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
notesPerOneAd: instance.notesPerOneAd,
DiscordWebhookUrl: instance.DiscordWebhookUrl,
EmojiBotToken: instance.EmojiBotToken,
ApiBase: instance.ApiBase
ApiBase: instance.ApiBase,
enableGDPRMode: instance.enableGDPRMode,
};
});
}

7
packages/backend/src/server/api/endpoints/admin/update-meta.ts
View file

@ -148,7 +148,8 @@ export const paramDef = {
},
},
EmojiBotToken:{ type: 'string', nullable: true},
ApiBase:{ type: 'string',nullable:true}
ApiBase:{ type: 'string',nullable:true},
enableGDPRMode: { type: 'boolean' },
},
required: [],
} as const;
@ -228,6 +229,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (ps.infoImageUrl !== undefined) {
set.infoImageUrl = ps.infoImageUrl;
}
console.log(ps.enableGDPRMode);
if (ps.enableGDPRMode !== undefined) {
set.enableGDPRMode = ps.enableGDPRMode;
}
if (ps.requestEmojiAllOk !== undefined) {
set.requestEmojiAllOk = ps.requestEmojiAllOk;

19
packages/backend/src/server/api/endpoints/users/report-abuse.ts
View file

@ -3,14 +3,17 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { setImmediate } from 'node:timers/promises';
import sanitizeHtml from 'sanitize-html';
import { Inject, Injectable } from '@nestjs/common';
import type { AbuseUserReportsRepository } from '@/models/_.js';
import { In } from 'typeorm';
import type { AbuseUserReportsRepository, NotesRepository } from '@/models/_.js';
import { IdService } from '@/core/IdService.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { MetaService } from '@/core/MetaService.js';
import { EmailService } from '@/core/EmailService.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { DI } from '@/di-symbols.js';
import { GetterService } from '@/server/api/GetterService.js';
import { RoleService } from '@/core/RoleService.js';
@ -50,6 +53,7 @@ export const paramDef = {
properties: {
userId: { type: 'string', format: 'misskey:id' },
comment: { type: 'string', minLength: 1, maxLength: 2048 },
noteIds: { type: 'array', items: { type: 'string', format: 'misskey:id', maxLength: 16 } },
},
required: ['userId', 'comment'],
} as const;
@ -60,11 +64,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
@Inject(DI.abuseUserReportsRepository)
private abuseUserReportsRepository: AbuseUserReportsRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private idService: IdService,
private metaService: MetaService,
private emailService: EmailService,
private getterService: GetterService,
private roleService: RoleService,
private noteEntityService: NoteEntityService,
private globalEventService: GlobalEventService,
) {
super(meta, paramDef, async (ps, me) => {
@ -82,6 +90,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
throw new ApiError(meta.errors.cannotReportAdmin);
}
const notes = ps.noteIds ? await this.notesRepository.find({
where: { id: In(ps.noteIds), userId: user.id },
}) : [];
const report = await this.abuseUserReportsRepository.insert({
id: this.idService.gen(),
targetUserId: user.id,
@ -89,6 +101,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
reporterId: me.id,
reporterHost: null,
comment: ps.comment,
notes: (ps.noteIds && !((await this.metaService.fetch()).enableGDPRMode)) ? await this.noteEntityService.packMany(notes) : [],
noteIds: (ps.noteIds && (await this.metaService.fetch()).enableGDPRMode) ? ps.noteIds : [],
}).then(x => this.abuseUserReportsRepository.findOneByOrFail(x.identifiers[0]));
// Publish event to moderators
@ -101,9 +115,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
targetUserId: report.targetUserId,
reporterId: report.reporterId,
comment: report.comment,
notes: report.notes,
noteIds: report.noteIds ?? [],
});
}
const meta = await this.metaService.fetch();
if (meta.email) {
this.emailService.sendEmail(meta.email, 'New abuse report',