From db53cc20382e9f64db1fd9e98880fc4885edcb12 Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Thu, 27 Jan 2022 11:33:55 -0500 Subject: [PATCH 01/15] Create doAutoChangePresence.ts Changes the presence to randomly chosen text (L28 - L41) --- src/client/doAutoChangePresence.ts | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/client/doAutoChangePresence.ts diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts new file mode 100644 index 00000000..e965214d --- /dev/null +++ b/src/client/doAutoChangePresence.ts @@ -0,0 +1,47 @@ +/** + * Copyright (C) 2021-2022 PythonCoderAS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +import HealthScreeningBotClient from "./extraClient"; + +export default async function doAutoChangePresence( + client: HealthScreeningBotClient, +): Promise { + + const guildSize = client.guilds.cache.size; + const registeredPeople = timeCounts + .map((value) => value.count) + .reduce((a, b) => a + b, 0); + + const presences: string[] = +[ + "Generating Health Screenings", + "In ${guildSize} servers", + "Generating for ${registeredPeople} people!", + "/generate name:walkthrough for walkthrough of commands!", + "Report a bug with /report_bug !", + "Use /set to set optional configuration info!", + "can i put ma balls on ya jaws", + "Run /stats for cool stats about the bot!", + "Check out your profile with /profile !", + "Have an idea? Suggest it with /suggest !", + "Join the Discord server at: discord.gg/" +]; + + await client.user.setPresence(presences[Math.floor(Math.random() * presences.length)]); + + setTimeout( + () => doAutoChangePresence(client), 600000) +} From 7a72732941df377aca37ce097bee7dd584db4310 Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Thu, 27 Jan 2022 11:47:24 -0500 Subject: [PATCH 02/15] Update extraClient.ts Figured out how to make multiple commits to the same branch added doAutoChangePresence to the onReady function --- src/client/extraClient.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/extraClient.ts b/src/client/extraClient.ts index 49cc3985..21b45f45 100644 --- a/src/client/extraClient.ts +++ b/src/client/extraClient.ts @@ -203,6 +203,10 @@ export default class HealthScreeningBotClient extends Client { () => doAutoLoop(this, logChannel), "onReady::doAutoLoop" ), + runFunctionAndLogError( + () => doAutoChangePresence(this), + "onReady::doAutoChangePresence" + ), ]); } } From 82ab6f81d0a472cd244af351f39c763afce046fa Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:31:33 -0500 Subject: [PATCH 03/15] Update src/client/doAutoChangePresence.ts Co-authored-by: PythonCoderAS --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index e965214d..5678823c 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -31,7 +31,7 @@ export default async function doAutoChangePresence( "In ${guildSize} servers", "Generating for ${registeredPeople} people!", "/generate name:walkthrough for walkthrough of commands!", - "Report a bug with /report_bug !", + "Report a bug with /report_bug!", "Use /set to set optional configuration info!", "can i put ma balls on ya jaws", "Run /stats for cool stats about the bot!", From 4437f35bd2e77f80203a311413be9180ad2ded5d Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:32:00 -0500 Subject: [PATCH 04/15] Update src/client/doAutoChangePresence.ts Co-authored-by: PythonCoderAS --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index 5678823c..bd29e418 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -35,7 +35,7 @@ export default async function doAutoChangePresence( "Use /set to set optional configuration info!", "can i put ma balls on ya jaws", "Run /stats for cool stats about the bot!", - "Check out your profile with /profile !", + "Check out your profile with /profile!", "Have an idea? Suggest it with /suggest !", "Join the Discord server at: discord.gg/" ]; From 3ed96c556c15af6930cc867c45164ce956676e6e Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:32:46 -0500 Subject: [PATCH 05/15] Update src/client/doAutoChangePresence.ts Co-authored-by: PythonCoderAS --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index bd29e418..7fb2cf83 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -36,7 +36,7 @@ export default async function doAutoChangePresence( "can i put ma balls on ya jaws", "Run /stats for cool stats about the bot!", "Check out your profile with /profile!", - "Have an idea? Suggest it with /suggest !", + "Have an idea? Suggest it with /suggest!", "Join the Discord server at: discord.gg/" ]; From 1ec9bbf1e4faf9ae9c3f9c798b0da27dede2e26a Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:34:31 -0500 Subject: [PATCH 06/15] Update src/client/doAutoChangePresence.ts Co-authored-by: PythonCoderAS --- src/client/doAutoChangePresence.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index 7fb2cf83..ad4ff4d8 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -37,7 +37,6 @@ export default async function doAutoChangePresence( "Run /stats for cool stats about the bot!", "Check out your profile with /profile!", "Have an idea? Suggest it with /suggest!", - "Join the Discord server at: discord.gg/" ]; await client.user.setPresence(presences[Math.floor(Math.random() * presences.length)]); From 6c1ba876a4db7e9bb1385539fc385ee2b1288bc4 Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:35:01 -0500 Subject: [PATCH 07/15] Update src/client/doAutoChangePresence.ts Co-authored-by: PythonCoderAS --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index ad4ff4d8..9df32f3d 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -42,5 +42,5 @@ export default async function doAutoChangePresence( await client.user.setPresence(presences[Math.floor(Math.random() * presences.length)]); setTimeout( - () => doAutoChangePresence(client), 600000) + () => doAutoChangePresence(client), 60000) } From b9138f0d6841fe4e17f41b13445f258559d91881 Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Fri, 28 Jan 2022 12:19:42 -0500 Subject: [PATCH 08/15] Update src/client/doAutoChangePresence.ts Co-authored-by: PythonCoderAS --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index 9df32f3d..e10946a9 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -21,7 +21,7 @@ export default async function doAutoChangePresence( ): Promise { const guildSize = client.guilds.cache.size; - const registeredPeople = timeCounts + const registeredPeople = await AutoUser.count() .map((value) => value.count) .reduce((a, b) => a + b, 0); From 5f97e1eee5769841ff7173415db3aa7f1fdba58e Mon Sep 17 00:00:00 2001 From: dannynotsmart <75951607+dannynotsmart@users.noreply.github.com> Date: Fri, 28 Jan 2022 12:25:23 -0500 Subject: [PATCH 09/15] Update src/client/doAutoChangePresence.ts Co-authored-by: PythonCoderAS --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index e10946a9..251978e4 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -42,5 +42,5 @@ export default async function doAutoChangePresence( await client.user.setPresence(presences[Math.floor(Math.random() * presences.length)]); setTimeout( - () => doAutoChangePresence(client), 60000) + () => doAutoChangePresence(client), 300000) } From fb905b705d694c74c40a5baf0119b8f0f1581216 Mon Sep 17 00:00:00 2001 From: PythonCoderAS Date: Sat, 29 Jan 2022 07:13:03 -0500 Subject: [PATCH 10/15] Update src/client/doAutoChangePresence.ts --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index 251978e4..41ce772d 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -28,7 +28,7 @@ export default async function doAutoChangePresence( const presences: string[] = [ "Generating Health Screenings", - "In ${guildSize} servers", + `In ${guildSize} servers`, "Generating for ${registeredPeople} people!", "/generate name:walkthrough for walkthrough of commands!", "Report a bug with /report_bug!", From 25eeb9347ac03c4766e5b747fbd9705642c4b380 Mon Sep 17 00:00:00 2001 From: PythonCoderAS Date: Sat, 29 Jan 2022 07:13:08 -0500 Subject: [PATCH 11/15] Update src/client/doAutoChangePresence.ts --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index 41ce772d..6ae35999 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -29,7 +29,7 @@ export default async function doAutoChangePresence( [ "Generating Health Screenings", `In ${guildSize} servers`, - "Generating for ${registeredPeople} people!", + `Generating for ${registeredPeople} people!`, "/generate name:walkthrough for walkthrough of commands!", "Report a bug with /report_bug!", "Use /set to set optional configuration info!", From 5f085aa54ba562a8969d486f2184c1fffd66aeae Mon Sep 17 00:00:00 2001 From: PythonCoderAS <13932583+PythonCoderAS@users.noreply.github.com> Date: Sat, 29 Jan 2022 07:17:12 -0500 Subject: [PATCH 12/15] Add imports and use lodash --- src/client/doAutoChangePresence.ts | 18 +++++++++--------- src/client/extraClient.ts | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index 251978e4..f0037c1e 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +import { AutoUser } from "../orm/autoUser"; import HealthScreeningBotClient from "./extraClient"; +import {sample} from "lodash"; export default async function doAutoChangePresence( client: HealthScreeningBotClient, ): Promise { const guildSize = client.guilds.cache.size; - const registeredPeople = await AutoUser.count() - .map((value) => value.count) - .reduce((a, b) => a + b, 0); - - const presences: string[] = + const registeredPeople = await AutoUser.count(); + + const presences: string[] = [ "Generating Health Screenings", - "In ${guildSize} servers", - "Generating for ${registeredPeople} people!", + `In ${guildSize} servers`, + `Generating for ${registeredPeople} people!`, "/generate name:walkthrough for walkthrough of commands!", "Report a bug with /report_bug!", "Use /set to set optional configuration info!", @@ -39,8 +39,8 @@ export default async function doAutoChangePresence( "Have an idea? Suggest it with /suggest!", ]; - await client.user.setPresence(presences[Math.floor(Math.random() * presences.length)]); - + await client.user!.setPresence({ activities: [{ name: sample(presences) }] }); + setTimeout( () => doAutoChangePresence(client), 300000) } diff --git a/src/client/extraClient.ts b/src/client/extraClient.ts index 21b45f45..1fa1c6e7 100644 --- a/src/client/extraClient.ts +++ b/src/client/extraClient.ts @@ -56,6 +56,7 @@ import runFunctionAndLogError from "../utils/logError/runAndLog"; import { ItemType } from "../utils/multiMessage"; import postToGithub from "../utils/postToGithub"; import { Command } from "./command"; +import doAutoChangePresence from "./doAutoChangePresence"; import doAutoLoop from "./doAutoLoop"; import commandInteraction from "./interactions/commandInteraction"; import commandInteractionAutocomplete from "./interactions/commandInteractionAutocomplete"; From f5ff61d74b45257ac5250e511169c48c2d0ed421 Mon Sep 17 00:00:00 2001 From: PythonCoderAS <13932583+PythonCoderAS@users.noreply.github.com> Date: Sat, 29 Jan 2022 07:17:42 -0500 Subject: [PATCH 13/15] Run prettier --- src/client/doAutoChangePresence.ts | 34 ++++++++++++++---------------- src/client/extraClient.ts | 2 +- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index f0037c1e..f3a470cc 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -14,33 +14,31 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +import { sample } from "lodash"; + import { AutoUser } from "../orm/autoUser"; import HealthScreeningBotClient from "./extraClient"; -import {sample} from "lodash"; export default async function doAutoChangePresence( - client: HealthScreeningBotClient, + client: HealthScreeningBotClient ): Promise { - const guildSize = client.guilds.cache.size; const registeredPeople = await AutoUser.count(); - const presences: string[] = -[ - "Generating Health Screenings", - `In ${guildSize} servers`, - `Generating for ${registeredPeople} people!`, - "/generate name:walkthrough for walkthrough of commands!", - "Report a bug with /report_bug!", - "Use /set to set optional configuration info!", - "can i put ma balls on ya jaws", - "Run /stats for cool stats about the bot!", - "Check out your profile with /profile!", - "Have an idea? Suggest it with /suggest!", -]; + const presences: string[] = [ + "Generating Health Screenings", + `In ${guildSize} servers`, + `Generating for ${registeredPeople} people!`, + "/generate name:walkthrough for walkthrough of commands!", + "Report a bug with /report_bug!", + "Use /set to set optional configuration info!", + "can i put ma balls on ya jaws", + "Run /stats for cool stats about the bot!", + "Check out your profile with /profile!", + "Have an idea? Suggest it with /suggest!", + ]; await client.user!.setPresence({ activities: [{ name: sample(presences) }] }); - setTimeout( - () => doAutoChangePresence(client), 300000) + setTimeout(() => doAutoChangePresence(client), 300000); } diff --git a/src/client/extraClient.ts b/src/client/extraClient.ts index 1fa1c6e7..1e53f1ec 100644 --- a/src/client/extraClient.ts +++ b/src/client/extraClient.ts @@ -204,7 +204,7 @@ export default class HealthScreeningBotClient extends Client { () => doAutoLoop(this, logChannel), "onReady::doAutoLoop" ), - runFunctionAndLogError( + runFunctionAndLogError( () => doAutoChangePresence(this), "onReady::doAutoChangePresence" ), From ca0047c9e8eb42d082f223062a6034af33eae33a Mon Sep 17 00:00:00 2001 From: PythonCoderAS Date: Sat, 29 Jan 2022 12:37:06 -0500 Subject: [PATCH 14/15] Update doAutoChangePresence.ts --- src/client/doAutoChangePresence.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index f3a470cc..035d4b09 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -37,7 +37,8 @@ export default async function doAutoChangePresence( "Check out your profile with /profile!", "Have an idea? Suggest it with /suggest!", ]; - + + // We only need to set the name. await client.user!.setPresence({ activities: [{ name: sample(presences) }] }); setTimeout(() => doAutoChangePresence(client), 300000); From 94d965d2e04d220915c0887b276a7f31f3884afc Mon Sep 17 00:00:00 2001 From: PythonCoderAS Date: Sat, 29 Jan 2022 12:39:34 -0500 Subject: [PATCH 15/15] Update doAutoChangePresence.ts --- src/client/doAutoChangePresence.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/doAutoChangePresence.ts b/src/client/doAutoChangePresence.ts index 035d4b09..383ff587 100644 --- a/src/client/doAutoChangePresence.ts +++ b/src/client/doAutoChangePresence.ts @@ -37,7 +37,7 @@ export default async function doAutoChangePresence( "Check out your profile with /profile!", "Have an idea? Suggest it with /suggest!", ]; - + // We only need to set the name. await client.user!.setPresence({ activities: [{ name: sample(presences) }] });