From ba73bedda6ad72b0accd51e594b1b3e193d50e87 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 17 Jun 2022 15:48:03 +0200 Subject: Fix video selection buttons placement --- .../app/shared/shared-video-miniature/videos-selection.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/app/shared/shared-video-miniature/videos-selection.component.scss b/client/src/app/shared/shared-video-miniature/videos-selection.component.scss index 3bb375980..1827f25ef 100644 --- a/client/src/app/shared/shared-video-miniature/videos-selection.component.scss +++ b/client/src/app/shared/shared-video-miniature/videos-selection.component.scss @@ -9,6 +9,7 @@ .action-selection-mode-child { position: fixed; + display: flex; .action-button { @include margin-left(55px); -- cgit v1.2.3 From d3976db269a0e5a3256867a7fc614d3c54c58720 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 17 Jun 2022 16:06:58 +0200 Subject: Fix searching in blocklist --- server/models/account/account-blocklist.ts | 14 ++++++++++++ server/tests/api/moderation/blocklist.ts | 28 +++++++++++++++++++++++ shared/server-commands/users/blocklist-command.ts | 9 +++++--- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/server/models/account/account-blocklist.ts b/server/models/account/account-blocklist.ts index a7b8db076..377249b38 100644 --- a/server/models/account/account-blocklist.ts +++ b/server/models/account/account-blocklist.ts @@ -132,6 +132,20 @@ export class AccountBlocklistModel extends Model (options: ListBlocklistOptions, path: string) { - const { start, count, sort = '-createdAt' } = options + const { start, count, search, sort = '-createdAt' } = options return this.getRequestBody>({ ...options, path, - query: { start, count, sort }, + query: { start, count, sort, search }, implicitToken: true, defaultExpectedStatus: HttpStatusCode.OK_200 }) -- cgit v1.2.3 From 82eb78504ff6b8ed06aa28de48930fe0f21541fe Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 17 Jun 2022 16:07:45 +0200 Subject: Fix user name work wrapping --- .../app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss index cc5e36a32..923f0029b 100644 --- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss +++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss @@ -13,6 +13,8 @@ flex-direction: column; .actor-info-display-name { + @include peertube-word-wrap; + font-size: 20px; font-weight: $font-bold; -- cgit v1.2.3 From 5e0dbb3e52797cdea7a9069a9dd605c8f84034dd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 17 Jun 2022 16:16:28 +0200 Subject: Fix users stats --- server/models/user/user.ts | 4 ++-- server/models/video/video-comment.ts | 4 ++-- server/models/video/video-playlist.ts | 4 ++-- server/tests/api/server/stats.ts | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/server/models/user/user.ts b/server/models/user/user.ts index 326b2e789..68b2bf523 100644 --- a/server/models/user/user.ts +++ b/server/models/user/user.ts @@ -819,10 +819,10 @@ export class UserModel extends Model>> { } } - return UserModel.count(query) + return UserModel.unscoped().count(query) } - const totalUsers = await UserModel.count() + const totalUsers = await UserModel.unscoped().count() const totalDailyActiveUsers = await getActiveUsers(1) const totalWeeklyActiveUsers = await getActiveUsers(7) const totalMonthlyActiveUsers = await getActiveUsers(30) diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index 2d60c6a30..1d3178164 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -683,11 +683,11 @@ export class VideoCommentModel extends Model Date: Mon, 20 Jun 2022 09:57:46 +0200 Subject: Don't break player on ice error I don't really know why the ice error is not catched by simple-peer, where it should according to the code --- client/src/standalone/videos/embed.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html index f30dda96b..eab6f81a6 100644 --- a/client/src/standalone/videos/embed.html +++ b/client/src/standalone/videos/embed.html @@ -67,7 +67,12 @@ if (placeholderPreview) placeholderPreview.style.display = 'none' } - window.onerror = function () { + window.onerror = function (msg) { + if (typeof msg === 'string' && msg.toLowerCase().includes(' ice ')) { + console.warn(msg) + return + } + window.displayIncompatibleBrowser() } -- cgit v1.2.3 From f53e1fcd990e790a196ad39044a3520e605978c6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 20 Jun 2022 10:04:52 +0200 Subject: Relax views federation --- server/initializers/constants.ts | 2 +- server/lib/views/shared/video-viewer-counters.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index cd2cc33d3..9201f95b3 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -370,7 +370,7 @@ const CONSTRAINTS_FIELDS = { const VIEW_LIFETIME = { VIEW: CONFIG.VIEWS.VIDEOS.IP_VIEW_EXPIRATION, - VIEWER_COUNTER: 60000 * 1, // 1 minute + VIEWER_COUNTER: 60000 * 2, // 2 minutes VIEWER_STATS: 60000 * 60 // 1 hour } diff --git a/server/lib/views/shared/video-viewer-counters.ts b/server/lib/views/shared/video-viewer-counters.ts index 999ab7d8d..5158f8f93 100644 --- a/server/lib/views/shared/video-viewer-counters.ts +++ b/server/lib/views/shared/video-viewer-counters.ts @@ -165,7 +165,7 @@ export class VideoViewerCounters { private async federateViewerIfNeeded (video: MVideo, viewer: Viewer) { // Federate the viewer if it's been a "long" time we did not const now = new Date().getTime() - const federationLimit = now - (VIEW_LIFETIME.VIEWER_COUNTER / 2) + const federationLimit = now - (VIEW_LIFETIME.VIEWER_COUNTER * 0.75) if (viewer.lastFederation && viewer.lastFederation > federationLimit) return -- cgit v1.2.3 From d47b18079bfe4aed472ddcc0a89302ba85f03a48 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 20 Jun 2022 10:19:48 +0200 Subject: Update changelog --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c3e09f61..7fa9ee981 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## v4.2.1 + +### IMPORTANT NOTES + + * If you upgrade from PeerTube **< 4.2.0**, please follow 4.2.0 IMPORTANT NOTES + +### Bug fixes + + * Fix live ending job that breaks new live session + * Fix search filters counter + * Fix upload banner icon margin + * Fix button icon margin + * Fix my import expander icon that should only be displayed on import error + * Fix select components styling inconsistency + * Increase max watch section to avoid too much warnings in server + * Optimize broadcast job creation + * Optimize `View` activities delivery using a dedicated broadcast job queue that can be run in parallel + * Fix video selection buttons placement + * Fix searching into account blocklist + * Fix incorrect instance stats + * Fix broken player on ICE error + * Relax views federation + + ## v4.2.0 ### IMPORTANT NOTES -- cgit v1.2.3