diff options
| author | Mar0xy <marie@kaifa.ch> | 2023-10-16 23:38:21 +0200 |
|---|---|---|
| committer | Mar0xy <marie@kaifa.ch> | 2023-10-16 23:38:21 +0200 |
| commit | 68886b9ab5fc1cf50033b382b85e0a068fdbb7d6 (patch) | |
| tree | 33dda5f8a6be49b148c49eafdcea8cdd9ded4b7a /packages/backend/src/core/NoteEditService.ts | |
| parent | up: dev version (diff) | |
| parent | update deps (diff) | |
| download | sharkey-68886b9ab5fc1cf50033b382b85e0a068fdbb7d6.tar.gz sharkey-68886b9ab5fc1cf50033b382b85e0a068fdbb7d6.tar.bz2 sharkey-68886b9ab5fc1cf50033b382b85e0a068fdbb7d6.zip | |
merge: upstream performance changes & instance silencing
Diffstat (limited to 'packages/backend/src/core/NoteEditService.ts')
| -rw-r--r-- | packages/backend/src/core/NoteEditService.ts | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index 1953863345..69c66d1000 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -53,6 +53,7 @@ import { RedisTimelineService } from '@/core/RedisTimelineService.js'; import { AntennaService } from './AntennaService.js'; import NotesChart from './chart/charts/notes.js'; import PerUserNotesChart from './chart/charts/per-user-notes.js'; +import { UtilityService } from '@/core/UtilityService.js'; type NotificationType = 'reply' | 'renote' | 'quote' | 'mention'; @@ -217,6 +218,7 @@ export class NoteEditService implements OnApplicationShutdown { private perUserNotesChart: PerUserNotesChart, private activeUsersChart: ActiveUsersChart, private instanceChart: InstanceChart, + private utilityService: UtilityService, ) { } @bindThis @@ -224,7 +226,6 @@ export class NoteEditService implements OnApplicationShutdown { id: MiUser['id']; username: MiUser['username']; host: MiUser['host']; - createdAt: MiUser['createdAt']; isBot: MiUser['isBot']; }, editid: MiNote['id'], data: Option, silent = false): Promise<MiNote> { if (!editid) { @@ -275,6 +276,12 @@ export class NoteEditService implements OnApplicationShutdown { } } + const inSilencedInstance = this.utilityService.isSilencedHost((await this.metaService.fetch()).silencedHosts, user.host); + + if (data.visibility === 'public' && inSilencedInstance && user.host !== null) { + data.visibility = 'home'; + } + if (data.renote) { switch (data.renote.visibility) { case 'public': @@ -381,7 +388,7 @@ export class NoteEditService implements OnApplicationShutdown { } await this.noteEditRepository.insert({ - id: this.idService.genId(), + id: this.idService.gen(), noteId: oldnote.id, text: data.text || undefined, cw: data.cw, @@ -391,7 +398,6 @@ export class NoteEditService implements OnApplicationShutdown { const note = new MiNote({ id: oldnote.id, - createdAt: new Date(oldnote.createdAt!), updatedAt: data.updatedAt ? data.updatedAt : new Date(), fileIds: data.files ? data.files.map(file => file.id) : [], replyId: data.reply ? data.reply.id : null, @@ -486,7 +492,6 @@ export class NoteEditService implements OnApplicationShutdown { id: MiUser['id']; username: MiUser['username']; host: MiUser['host']; - createdAt: MiUser['createdAt']; isBot: MiUser['isBot']; }, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) { // Register host |