From abcac8107c72e78e727f70fdc9e6d8acb29b4043 Mon Sep 17 00:00:00 2001 From: Marks Polakovs Date: Sun, 19 Apr 2020 18:49:59 +0200 Subject: [PATCH] Use @ury1350/prettier-config --- package.json | 4 +++- src/broadcast/rtc_streamer.ts | 39 ++++++++++++++++++++++++++--------- src/mixer/state.ts | 14 +++++++++---- src/optionsMenu/MicTab.tsx | 2 +- src/session/index.tsx | 2 +- src/showplanner/index.tsx | 6 ++---- yarn.lock | 5 +++++ 7 files changed, 51 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index f645710..74ecfbb 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,7 @@ ] }, "devDependencies": { + "@ury1350/prettier-config": "^1.0.0", "node-sass": "^4.13.1", "prettier": "^1.19.1" }, @@ -179,5 +180,6 @@ "presets": [ "react-app" ] - } + }, + "prettier": "@ury1350/prettier-config" } diff --git a/src/broadcast/rtc_streamer.ts b/src/broadcast/rtc_streamer.ts index 6b5677e..89404e9 100644 --- a/src/broadcast/rtc_streamer.ts +++ b/src/broadcast/rtc_streamer.ts @@ -64,7 +64,10 @@ export class WebRTCStreamer extends Streamer { if (state === "CONNECTED") { this.newsInterval = later.setInterval( this.doTheNews, - later.parse.recur().on(59).minute() + later.parse + .recur() + .on(59) + .minute() ); } else if (state === "CONNECTION_LOST" || state === "NOT_CONNECTED") { this.newsInterval?.clear(); @@ -107,14 +110,30 @@ export class WebRTCStreamer extends Streamer { // Sanity check const now = new Date(); if (now.getSeconds() < 45) { - later.setTimeout(async () => { - await MixerState.playNewsIntro(); - }, later.parse.recur().on(59).minute().on(45).second()); + later.setTimeout( + async () => { + await MixerState.playNewsIntro(); + }, + later.parse + .recur() + .on(59) + .minute() + .on(45) + .second() + ); } if (now.getMinutes() <= 1 && now.getSeconds() < 55) { - later.setTimeout(async () => { - await MixerState.playNewsEnd(); - }, later.parse.recur().on(1).minute().on(55).second()); + later.setTimeout( + async () => { + await MixerState.playNewsEnd(); + }, + later.parse + .recur() + .on(1) + .minute() + .on(55) + .second() + ); } } } @@ -146,9 +165,9 @@ export class WebRTCStreamer extends Streamer { } // TODO: maybe delete non-Opus candidates? } - track.fmtp[opusIndex].config += `; maxaveragebitrate=${ - 192 * 2 * 1024 - }; stereo=1; sprop-stereo=1 ; cbr=1`; + track.fmtp[opusIndex].config += `; maxaveragebitrate=${192 * + 2 * + 1024}; stereo=1; sprop-stereo=1 ; cbr=1`; }); offer.sdp = SdpTransform.write(parsed); diff --git a/src/mixer/state.ts b/src/mixer/state.ts index 7280bbe..ea1c33f 100644 --- a/src/mixer/state.ts +++ b/src/mixer/state.ts @@ -526,9 +526,15 @@ export const load = ( export const updateTimeEnding = (): AppThunk => async (dispatch) => { if (!timerInterval) { - timerInterval = later.setInterval(() => { - dispatch(mixerState.actions.updateTimeEndingAt()); - }, later.parse.recur().every(1).second()); + timerInterval = later.setInterval( + () => { + dispatch(mixerState.actions.updateTimeEndingAt()); + }, + later.parse + .recur() + .every(1) + .second() + ); } }; @@ -604,7 +610,7 @@ export const { } = mixerState.actions; export const redrawWavesurfers = (): AppThunk => () => { - wavesurfers.forEach(function (item) { + wavesurfers.forEach(function(item) { item.drawBuffer(); }); }; diff --git a/src/optionsMenu/MicTab.tsx b/src/optionsMenu/MicTab.tsx index c4f0403..4399597 100644 --- a/src/optionsMenu/MicTab.tsx +++ b/src/optionsMenu/MicTab.tsx @@ -95,7 +95,7 @@ export function MicTab() { disabled={micList === null} >