Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix listing videos history

Chocobozzzb935225b6ec7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a0331563..2088e101ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
### SECURITY
- * This release addresses vulnerabilities ranging from medium to critical severity affecting PeerTube. In a few weeks, this changelog will be updated to disclose the vulnerabilities.
+ * This release addresses vulnerabilities ranging from medium to critical severity affecting PeerTube. In a week, this changelog will be updated to disclose the vulnerabilities.
### Bug fixes
diff --git a/server/core/models/user/user-video-history.ts b/server/core/models/user/user-video-history.ts
index a5e88dbc30..776676cf54 100644
--- a/server/core/models/user/user-video-history.ts
+++ b/server/core/models/user/user-video-history.ts
@@ -65,7 +65,7 @@ export class UserVideoHistoryModel extends SequelizeModel<UserVideoHistoryModel>
start,
count,
search,
- sort: '-"userVideoHistory"."updatedAt"',
+ sort: '-userVideoHistory.updatedAt',
nsfw: null, // All
displayOnlyForFollower: null,
user,
diff --git a/server/core/models/video/sql/video/videos-id-list-query-builder.ts b/server/core/models/video/sql/video/videos-id-list-query-builder.ts
index d3880ced53..0d7021a762 100644
--- a/server/core/models/video/sql/video/videos-id-list-query-builder.ts
+++ b/server/core/models/video/sql/video/videos-id-list-query-builder.ts
@@ -1088,7 +1088,7 @@ export class VideosIdListQueryBuilder extends AbstractRunQuery {
} else if (column === 'playlistElementPosition') {
firstSort = '"VideoPlaylistElement"."position"'
} else if (column.includes('.')) {
- firstSort = column
+ firstSort = column.split('.').map(c => `"${c}"`).join('.')
} else {
firstSort = `"video"."${column}"`
}