From 718fc079530b82705dafb60d62f49cf62840a1a2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Sep 2022 09:54:57 +0200 Subject: [PATCH 1/2] Reword instance following title --- .../+admin/follows/following-list/following-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html index eb4f84d11..f7abb7ede 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.html +++ b/client/src/app/+admin/follows/following-list/following-list.component.html @@ -1,6 +1,6 @@

- Your instance subscriptions + Subscriptions of your instance

Date: Wed, 28 Sep 2022 10:03:06 +0200 Subject: [PATCH 2/2] Prevent "Cannot use same state" error --- server/lib/video-state.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/lib/video-state.ts b/server/lib/video-state.ts index 9ebbd7679..893725d85 100644 --- a/server/lib/video-state.ts +++ b/server/lib/video-state.ts @@ -82,7 +82,10 @@ async function moveToExternalStorageState (options: { if (pendingTranscode !== 0) return false const previousVideoState = video.state - await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction) + + if (video.state !== VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { + await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction) + } logger.info('Creating external storage move job for video %s.', video.uuid, { tags: [ video.uuid ] })