Merge branch 'develop' into feature/2024.10

This commit is contained in:
dakkar 2024-11-22 10:42:58 +00:00
commit d069d78c21
33 changed files with 594 additions and 178 deletions

View file

@ -442,7 +442,7 @@ export class NoteEditService implements OnApplicationShutdown {
if (user.host && !data.cw) {
await this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
if (i.isNSFW) {
if (i.isNSFW && !this.noteCreateService.isPureRenote(data)) {
data.cw = 'Instance is marked as NSFW';
}
});