diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 103547d7d2..be00aa7097 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ testCommit: variables: POSTGRES_PASSWORD: ci script: - - apt-get update && apt-get install -y git wget curl build-essential python3 + - apt-get update && apt-get install -y git wget curl build-essential python3 - cp .config/ci.yml .config/default.yml - corepack enable - corepack prepare pnpm@latest --activate @@ -55,6 +55,8 @@ getImageTag: only: - stable - develop + - tags + buildDocker: stage: deploy needs: @@ -78,6 +80,8 @@ buildDocker: only: - stable - develop + - tags + mergeManifests: stage: deploy needs: @@ -103,3 +107,4 @@ mergeManifests: only: - stable - develop + - tags diff --git a/package.json b/package.json index ce58a74f56..4d823d3123 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2024.3.1", + "version": "2024.3.2-devel", "codename": "shonk", "repository": { "type": "git", diff --git a/packages/backend/package.json b/packages/backend/package.json index c06a5ed1b7..19d9bab1e9 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -172,7 +172,7 @@ "stringz": "2.1.0", "systeminformation": "5.22.0", "tinycolor2": "1.6.0", - "tmp": "0.2.2", + "tmp": "0.2.3", "tsc-alias": "1.8.8", "tsconfig-paths": "4.2.0", "typeorm": "0.3.20", 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}` diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e83b909f5..f7bd9cc4c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -401,8 +401,8 @@ importers: specifier: 1.6.0 version: 1.6.0 tmp: - specifier: 0.2.2 - version: 0.2.2 + specifier: 0.2.3 + version: 0.2.3 tsc-alias: specifier: 1.8.8 version: 1.8.8 @@ -18824,6 +18824,12 @@ packages: engines: {node: '>=14'} dependencies: rimraf: 5.0.5 + dev: true + + /tmp@0.2.3: + resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==} + engines: {node: '>=14.14'} + dev: false /tmpl@1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}