diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-04-25 11:18:30 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-04-25 11:18:30 +0100 |
| commit | ea6629cebf1cca1f2935db231004cf247aeaa0c7 (patch) | |
| tree | a9540be5ed48d36a68e32789a0c7d8b18744a081 /packages/backend/src | |
| parent | fix backend tests (diff) | |
| parent | merge: hide images/videos in og cards, when under a CW - fixes #487 (!488) (diff) | |
| download | sharkey-ea6629cebf1cca1f2935db231004cf247aeaa0c7.tar.gz sharkey-ea6629cebf1cca1f2935db231004cf247aeaa0c7.tar.bz2 sharkey-ea6629cebf1cca1f2935db231004cf247aeaa0c7.zip | |
Merge branch 'develop' into future-2024-04-10-post
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/queue/processors/ImportNotesProcessorService.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/web/views/note.pug | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts index 67e2eb7407..7cef858c51 100644 --- a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts @@ -421,7 +421,7 @@ export class ImportNotesProcessorService { if (file.name) { this.driveService.updateFile(exists, { comment: file.name }, user); } - + files.push(exists); } } diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug index fb659ce171..a7cd0293cd 100644 --- a/packages/backend/src/server/web/views/note.pug +++ b/packages/backend/src/server/web/views/note.pug @@ -5,8 +5,8 @@ block vars - const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`; - const url = `${config.url}/notes/${note.id}`; - const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null; - - const images = (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive) - - const videos = (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive) + - const images = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive) + - const videos = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive) block title = `${title} | ${instanceName}` |