From 532e6a4172154716d6c6ab2a7f715625d600987c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 22 Oct 2021 16:30:55 +0200 Subject: Remove aws bug workaround This has been fixed in https://github.com/aws/aws-sdk-js-v3/pull/2835 --- server/lib/activitypub/videos/shared/creator.ts | 1 - server/lib/object-storage/shared/client.ts | 14 -------------- 2 files changed, 15 deletions(-) (limited to 'server') diff --git a/server/lib/activitypub/videos/shared/creator.ts b/server/lib/activitypub/videos/shared/creator.ts index ad3b88936..688bcbb53 100644 --- a/server/lib/activitypub/videos/shared/creator.ts +++ b/server/lib/activitypub/videos/shared/creator.ts @@ -64,7 +64,6 @@ export class APVideoCreator extends APVideoAbstractBuilder { return { autoBlacklisted, videoCreated } } catch (err) { // FIXME: Use rollback hook when https://github.com/sequelize/sequelize/pull/13038 is released - // Remove thumbnail if (thumbnailModel) await thumbnailModel.removeThumbnail() throw err diff --git a/server/lib/object-storage/shared/client.ts b/server/lib/object-storage/shared/client.ts index 85682c492..c9a614593 100644 --- a/server/lib/object-storage/shared/client.ts +++ b/server/lib/object-storage/shared/client.ts @@ -29,20 +29,6 @@ function getClient () { : undefined }) - // FIXME: https://github.com/aws/aws-sdk-js-v3/issues/2445 workaround - s3Client.middlewareStack.add( - (next, _context) => (args: any) => { - if (typeof args.request?.body === 'string' && args.request.body.includes('CompletedMultipartUpload')) { - args.request.body = args.request.body.replace(/CompletedMultipartUpload/g, 'CompleteMultipartUpload') - } - return next(args) - }, - { - step: 'build', - priority: 'high' - } - ) - logger.info('Initialized S3 client %s with region %s.', getEndpoint(), OBJECT_STORAGE.REGION, lTags()) return s3Client -- cgit v1.2.3