From 0832c5ad6bfc36a6ed55ef8260deee7a58ee632a Mon Sep 17 00:00:00 2001 From: alexbcberio Date: Thu, 6 Jan 2022 01:27:39 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Remove=20calls=20to=20broadcast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Broadcasting is handled in "onRedemption" listener --- src/backend/pubSubClient/actions/russianRoulette.ts | 13 +++++++++---- src/backend/pubSubClient/actions/timeoutFriend.ts | 3 --- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/backend/pubSubClient/actions/russianRoulette.ts b/src/backend/pubSubClient/actions/russianRoulette.ts index b95fe84..b7f7774 100644 --- a/src/backend/pubSubClient/actions/russianRoulette.ts +++ b/src/backend/pubSubClient/actions/russianRoulette.ts @@ -2,7 +2,6 @@ import { say, timeout } from "../../chatClient/clientActions"; import { LOG_PREFIX } from ".."; import { RedemptionMessage } from "../../../interfaces/RedemptionMessage"; -import { broadcast } from "../../helpers/webServer"; import { getUsernameFromId } from "../../helpers/twitch"; import { randomInt } from "crypto"; @@ -38,8 +37,6 @@ async function russianRoulette( msg.message = win ? "" : "got shot"; - broadcast(JSON.stringify(msg)); - const promises: Array> = []; if (!win) { @@ -56,7 +53,15 @@ async function russianRoulette( promises.push(say(channel, `rdCool Clap ${userDisplayName}`)); } - await Promise.all(promises); + try { + await Promise.allSettled(promises); + } catch (e) { + if (e instanceof Error) { + console.log(`${LOG_PREFIX}${e.message}`); + } + } + + return msg; } export { russianRoulette }; diff --git a/src/backend/pubSubClient/actions/timeoutFriend.ts b/src/backend/pubSubClient/actions/timeoutFriend.ts index 9e5c702..77d01ea 100644 --- a/src/backend/pubSubClient/actions/timeoutFriend.ts +++ b/src/backend/pubSubClient/actions/timeoutFriend.ts @@ -1,6 +1,5 @@ import { LOG_PREFIX } from ".."; import { RedemptionMessage } from "../../../interfaces/RedemptionMessage"; -import { broadcast } from "../../helpers/webServer"; import { getUsernameFromId } from "../../helpers/twitch"; import { timeout } from "../../chatClient/clientActions"; @@ -29,8 +28,6 @@ async function timeoutFriend( await timeout(channel, msg.message, time, reason); msg.message = `@${userDisplayName} ha expulsado a @${message} por ${time} segundos`; - - broadcast(JSON.stringify(msg)); } catch (e) { // user can not be timed out if (e instanceof Error) {