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

add: mark instance as NSFW

Browse source 
Closes transfem-org/Sharkey#197
This commit is contained in:
Mar0xy 2023-12-05 22:19:53 +01:00
parent 6f9ba940b9
commit 93869a5f34
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
11 changed files with 85 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
packages/backend/src/core/activitypub/models/ApImageService.ts
View file

@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository } from '@/models/_.js';
import type { DriveFilesRepository, InstancesRepository } from '@/models/_.js';
import type { MiRemoteUser } from '@/models/User.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import { MetaService } from '@/core/MetaService.js';
@ -18,6 +18,7 @@ import { checkHttps } from '@/misc/check-https.js';
import { ApResolverService } from '../ApResolverService.js';
import { ApLoggerService } from '../ApLoggerService.js';
import type { IObject } from '../type.js';
import { UtilityService } from '@/core/UtilityService.js';
@Injectable()
export class ApImageService {
@ -27,10 +28,14 @@ export class ApImageService {
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
private metaService: MetaService,
private apResolverService: ApResolverService,
private driveService: DriveService,
private apLoggerService: ApLoggerService,
private utilityService: UtilityService,
) {
this.logger = this.apLoggerService.logger;
}
@ -68,6 +73,12 @@ export class ApImageService {
// 2. or the image is not sensitive
const shouldBeCached = instance.cacheRemoteFiles && (instance.cacheRemoteSensitiveFiles || !image.sensitive);
const shouldBeSensitive = await this.instancesRepository.findOneBy({ host: this.utilityService.toPuny(actor.host), isNSFW: true });
if (shouldBeSensitive) {
image.sensitive = true;
}
const file = await this.driveService.uploadFromUrl({
url: image.url,
user: actor,

1
packages/backend/src/core/entities/InstanceEntityService.ts
View file

@ -48,6 +48,7 @@ export class InstanceEntityService {
themeColor: instance.themeColor,
infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
isNSFW: instance.isNSFW,
};
}