etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-11-29 17:33:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

upd: prevent vanilla mastodon imports from importing DMs

Browse source 
Also adds the visibility function to mastodon imports
This commit is contained in:
Marie 2023-12-31 03:48:51 +01:00
parent 265bcf54b0
commit 667daebb79
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/backend/src/queue/processors/ImportNotesProcessorService.ts
View file

@ -72,7 +72,6 @@ export class ImportNotesProcessorService {
} }
} }
// Function was taken from Firefish and modified for our needs
@bindThis @bindThis
private async recreateChain(idFieldPath: string[], replyFieldPath: string[], arr: any[], includeOrphans: boolean): Promise<any[]> { private async recreateChain(idFieldPath: string[], replyFieldPath: string[], arr: any[], includeOrphans: boolean): Promise<any[]> {
type NotesMap = { type NotesMap = {
@ -378,7 +377,11 @@ export class ImportNotesProcessorService {
return; return;
} }
if (toot.directMessage) return; const followers = toot.to.some((str: string) => str.includes('/followers'));
if (toot.directMessage || (!toot.to.includes('https://www.w3.org/ns/activitystreams#Public') || !followers)) return;
const visibility = followers ? 'home' : 'public';
const date = new Date(toot.object.published); const date = new Date(toot.object.published);
let text = undefined; let text = undefined;
@ -417,7 +420,7 @@ export class ImportNotesProcessorService {
} }
} }
const createdNote = await this.noteCreateService.import(user, { createdAt: date, text: text, files: files, apMentions: new Array(0), cw: toot.object.sensitive ? toot.object.summary : null, reply: reply }); const createdNote = await this.noteCreateService.import(user, { createdAt: date, text: text, files: files, visibility: visibility, apMentions: new Array(0), cw: toot.object.sensitive ? toot.object.summary : null, reply: reply });
if (toot.childNotes) this.queueService.createImportMastoToDbJob(user, toot.childNotes, createdNote.id); if (toot.childNotes) this.queueService.createImportMastoToDbJob(user, toot.childNotes, createdNote.id);
} }