From 6f6bd127e8a5557e477397662c33767a00902e8c Mon Sep 17 00:00:00 2001 From: alexbcberio Date: Sun, 20 Jun 2021 00:41:13 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F=20Add=20return=20types?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/helpers/chatClient.ts | 16 ++++++----- src/backend/helpers/pubSubClient.ts | 8 +++--- src/backend/helpers/scheduledActions.ts | 35 +++++++++++++++---------- src/backend/helpers/tokenData.ts | 2 +- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/backend/helpers/chatClient.ts b/src/backend/helpers/chatClient.ts index 7b3df84..69391da 100644 --- a/src/backend/helpers/chatClient.ts +++ b/src/backend/helpers/chatClient.ts @@ -13,9 +13,11 @@ export { say }; +// TODO: clean/refactor code + const LOG_PREFIX = "[ChatClient] "; -async function connect(channels: Array) { +async function connect(channels: Array): Promise { const authProvider = await getAuthProvider(); if ( @@ -43,13 +45,13 @@ async function connect(channels: Array) { await chatClient.connect(); } -async function onConnect() { +async function onConnect(): Promise { console.log(`${LOG_PREFIX}Connected`); start(); } -async function handleClientAction(action: any) { +async function handleClientAction(action: any): Promise { if (action.channel && !isNaN(action.channel)) { action.channel = await getUsernameFromId(parseInt(action.channel)); } @@ -84,7 +86,7 @@ async function handleClientAction(action: any) { } // send a chat message -async function say(channel: string, message: string) { +async function say(channel: string, message: string): Promise { await chatClient.say(channel, message); } @@ -94,7 +96,7 @@ async function timeout( username: string, time?: number, reason?: string -) { +): Promise { if (!time) { time = 60; } @@ -111,7 +113,7 @@ async function timeout( } // adds a user to vips -async function addVip(channel: string, username: string, message?: string) { +async function addVip(channel: string, username: string, message?: string): Promise { if (!message) { message = `Otorgado VIP a @${username}.`; } @@ -121,7 +123,7 @@ async function addVip(channel: string, username: string, message?: string) { } // removes a user from vips -async function removeVip(channel: string, username: string, message?: string) { +async function removeVip(channel: string, username: string, message?: string): Promise { if (!message) { message = `VIP de @${username} eliminado.`; } diff --git a/src/backend/helpers/pubSubClient.ts b/src/backend/helpers/pubSubClient.ts index 2390b33..da8bf11 100644 --- a/src/backend/helpers/pubSubClient.ts +++ b/src/backend/helpers/pubSubClient.ts @@ -10,6 +10,8 @@ export { registerUserListener } +// TODO: clean/refactor code + const LOG_PREFIX = "[PubSub] "; async function registerUserListener(user: UserIdResolvable) { @@ -100,7 +102,7 @@ async function stealVip(msg: { } // adds a user to vips -async function addVip(channel: string, username: string, message?: string) { +async function addVip(channel: string, username: string, message?: string): Promise { if (!message) { message = `Otorgado VIP a @${username}.`; } @@ -109,7 +111,7 @@ async function addVip(channel: string, username: string, message?: string) { say(channel, message); } -async function hasVip(channel: string, username: string) { +async function hasVip(channel: string, username: string): Promise { if (!username) { return false; } @@ -119,7 +121,7 @@ async function hasVip(channel: string, username: string) { } // removes a user from vips -async function removeVip(channel: string, username: string, message?: string) { +async function removeVip(channel: string, username: string, message?: string): Promise { if (!message) { message = `Se ha acabado el chollo, VIP de @${username} eliminado.`; } diff --git a/src/backend/helpers/scheduledActions.ts b/src/backend/helpers/scheduledActions.ts index 24a967c..7f62d27 100644 --- a/src/backend/helpers/scheduledActions.ts +++ b/src/backend/helpers/scheduledActions.ts @@ -17,25 +17,32 @@ let checkingScheduled = false; let scheduledActionsInterval: NodeJS.Timeout; let saveScheduledActionsTimeout: NodeJS.Timeout | null; -async function start() { - // *Check this, not working - if (!scheduledActionsInterval) { - let savedActions = []; - try { - savedActions = JSON.parse((await fs.readFile(SCHEDULED_FILE)).toString()); - } catch (e) { - // probably file does not exist - } - scheduledActions.push.apply(scheduledActions, savedActions); - scheduledActions.sort((a, b) => a.scheduledAt - b.scheduledAt); +// *Check this, not working +async function start(): Promise { + if (scheduledActionsInterval) { + return; + } + + let savedActions = []; + try { + savedActions = JSON.parse((await fs.readFile(SCHEDULED_FILE)).toString()); + } catch (e) { + // probably file does not exist + } + + scheduledActions.push.apply(scheduledActions, savedActions); + scheduledActions.sort((a, b) => a.scheduledAt - b.scheduledAt); setTimeout(checkScheduledActions, 1000 * 5); scheduledActionsInterval = setInterval(checkScheduledActions, 1000 * 60); } } -async function checkScheduledActions() { - if (checkingScheduled) return; +async function checkScheduledActions(): Promise { + if (checkingScheduled) { + return; + }; + checkingScheduled = true; let hasToSave = false; @@ -60,7 +67,7 @@ async function checkScheduledActions() { checkingScheduled = false; } -function saveScheduledActions() { +function saveScheduledActions(): void { if (saveScheduledActionsTimeout) { clearTimeout(saveScheduledActionsTimeout); saveScheduledActionsTimeout = null; diff --git a/src/backend/helpers/tokenData.ts b/src/backend/helpers/tokenData.ts index 2f6d006..c95648f 100644 --- a/src/backend/helpers/tokenData.ts +++ b/src/backend/helpers/tokenData.ts @@ -40,7 +40,7 @@ async function saveTokenData(tokenData: TokenData): Promise { console.log(`${LOG_PREFIX}Token data saved`); } -function checkTokenData(tokenData: TokenData) { +function checkTokenData(tokenData: TokenData): void { if ( !tokenData.access_token || !tokenData.refresh_token