From 1f730800421e578c6056ffbb5fe19857ca550fc2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 1 Jun 2021 09:28:45 +0200 Subject: [PATCH 1/5] Process redundancy stats in series --- server/lib/activitypub/videos.ts | 2 +- server/lib/stat-manager.ts | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 15726f90b..127a0dd8a 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -336,7 +336,7 @@ async function updateVideoFromAP (options: { } const to = overrideTo || videoObject.to - const videoData = await videoActivityObjectToDBAttributes(channel, videoObject, to) + const videoData = videoActivityObjectToDBAttributes(channel, videoObject, to) video.name = videoData.name video.uuid = videoData.uuid video.url = videoData.url diff --git a/server/lib/stat-manager.ts b/server/lib/stat-manager.ts index 09ba208bd..5d703f610 100644 --- a/server/lib/stat-manager.ts +++ b/server/lib/stat-manager.ts @@ -8,6 +8,7 @@ import { VideoCommentModel } from '@server/models/video/video-comment' import { VideoFileModel } from '@server/models/video/video-file' import { VideoPlaylistModel } from '@server/models/video/video-playlist' import { ActivityType, ServerStats, VideoRedundancyStrategyWithManual } from '@shared/models' +import * as Bluebird from 'bluebird' class StatsManager { @@ -106,12 +107,10 @@ class StatsManager { strategies.push({ strategy: 'manual', size: null }) - return Promise.all( - strategies.map(r => { - return VideoRedundancyModel.getStats(r.strategy) - .then(stats => Object.assign(stats, { strategy: r.strategy, totalSize: r.size })) - }) - ) + return Bluebird.mapSeries(strategies, r => { + return VideoRedundancyModel.getStats(r.strategy) + .then(stats => Object.assign(stats, { strategy: r.strategy, totalSize: r.size })) + }) } private buildAPPerType () { From 7a9e9417c17f8a45a639e7c3f49d82f14985786e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 1 Jun 2021 09:38:52 +0200 Subject: [PATCH 2/5] Fix live image aspect ratio in theatre mode --- .../src/app/+videos/+video-watch/video-watch.component.html | 2 +- .../src/app/+videos/+video-watch/video-watch.component.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html index 4779602d2..0f8c229c9 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.html +++ b/client/src/app/+videos/+video-watch/video-watch.component.html @@ -8,7 +8,7 @@
- Placeholder image + Placeholder image
Date: Tue, 1 Jun 2021 10:55:09 +0200 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c588e04ea..3ebd94d84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## v3.2.1 + +### IMPORTANT NOTES + + * **Important:** v3.2.0 introduced `pg_dump` export bug in the auto upgrade script. To upgrade from v3.2.0: + * You can upgrade manually https://docs.joinpeertube.org/install-any-os?id=manually + * Or you can apply the changes introduced in this commit: https://github.com/Chocobozzz/PeerTube/commit/86dc0b9cc9374cba7548bb613ff43d92f90570a8 and then use the auto + +### Bug fixes + + * Fix create account button style + * Fix auto upgrade script + * Fix live image aspect ratio in theatre mode + + ## v3.2.0 ### IMPORTANT NOTES From 711bf44d79fba2d3fddeb0ba1943a54ceb108fe7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 1 Jun 2021 10:56:02 +0200 Subject: [PATCH 4/5] Typo --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ebd94d84..a72dfe5a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ ### IMPORTANT NOTES - * **Important:** v3.2.0 introduced `pg_dump` export bug in the auto upgrade script. To upgrade from v3.2.0: + * **Important:** v3.2.0 introduced a `pg_dump` export bug in the auto upgrade script. To upgrade from v3.2.0: * You can upgrade manually https://docs.joinpeertube.org/install-any-os?id=manually - * Or you can apply the changes introduced in this commit: https://github.com/Chocobozzz/PeerTube/commit/86dc0b9cc9374cba7548bb613ff43d92f90570a8 and then use the auto + * Or you can apply the changes introduced in this commit: https://github.com/Chocobozzz/PeerTube/commit/86dc0b9cc9374cba7548bb613ff43d92f90570a8 and then use the auto upgrade script ### Bug fixes From d55c466e1caff9082e8ca1734fbf079ac92e12b4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 1 Jun 2021 10:56:46 +0200 Subject: [PATCH 5/5] Bumped to version v3.2.1 --- client/package.json | 2 +- package.json | 2 +- support/doc/api/openapi.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package.json b/client/package.json index f7d24b589..b56b0ff56 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "peertube-client", - "version": "3.2.0", + "version": "3.2.1", "private": true, "license": "AGPL-3.0", "author": { diff --git a/package.json b/package.json index c148cedb2..73830b605 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "peertube", "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.", - "version": "3.2.0", + "version": "3.2.1", "private": true, "licence": "AGPL-3.0", "engines": { diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 8b4c4c72d..7b619b59c 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: PeerTube - version: 3.2.0 + version: 3.2.1 contact: name: PeerTube Community url: 'https://joinpeertube.org'