diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 9bb878457..1a0985f3e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -73,7 +73,7 @@ Project maintainers may further define and clarify representation of a project. ## Enforcement -You should report any instances of abusive, harassing, or otherwise unacceptable behaviour to the project team at chocobozzz@framasoft.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain the anonymity of the reporter of an incident. We may post further details of specific enforcement policies separately. +You should report any instances of abusive, harassing, or otherwise unacceptable behaviour to the project team at peertube@framasoft.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain the anonymity of the reporter of an incident. We may post further details of specific enforcement policies separately. Project maintainers who do not follow or enforce this code of conduct in good faith may face temporary or permanent consequences. These will be determined by members of the project's leadership. diff --git a/README.md b/README.md index 8a8ee59c6..69b54f616 100644 --- a/README.md +++ b/README.md @@ -26,22 +26,20 @@ Be part of a network of multiple small federated, interoperable video hosting pr

---- -
- -### Client + + GitHub Test Status + -BrowserStack Status Weblate Status - -### Server - -GitHub Test Status JavaScript Style Guide + + BrowserStack Status + + + Weblate Status +
---- -

diff --git a/packages/ffmpeg/src/ffprobe.ts b/packages/ffmpeg/src/ffprobe.ts index d18401586..dfff2066c 100644 --- a/packages/ffmpeg/src/ffprobe.ts +++ b/packages/ffmpeg/src/ffprobe.ts @@ -44,9 +44,6 @@ async function hasAudioStream (path: string, existingProbe?: FfprobeData) { } async function getAudioStream (videoPath: string, existingProbe?: FfprobeData) { - // without position, ffprobe considers the last input only - // we make it consider the first input only - // if you pass a file path to pos, then ffprobe acts on that file directly const data = existingProbe || await ffprobePromise(videoPath) if (Array.isArray(data.streams)) { diff --git a/server/core/middlewares/validators/videos/videos.ts b/server/core/middlewares/validators/videos/videos.ts index 12e4bfd34..0a63dc234 100644 --- a/server/core/middlewares/validators/videos/videos.ts +++ b/server/core/middlewares/validators/videos/videos.ts @@ -83,7 +83,7 @@ export const videosAddLegacyValidator = getCommonVideoEditAttributes().concat([ if ( !await commonVideoChecksPass({ req, res, user, videoFileSize: videoFile.size, files: req.files }) || !isValidPasswordProtectedPrivacy(req, res) || - !await addDurationToVideoFileIfNeeded({ videoFile, res, middlewareName: 'videosAddvideosAddLegacyValidatorResumableValidator' }) || + !await addDurationToVideoFileIfNeeded({ videoFile, res, middlewareName: 'videosAddLegacyValidator' }) || !await isVideoFileAccepted({ req, res, videoFile, hook: 'filter:api.video.upload.accept.result' }) ) { return cleanUpReqFiles(req)