From 56e1fb39396b828b848cc0ed34dccc621560c3aa Mon Sep 17 00:00:00 2001 From: DJj123dj <80536295+DJj123dj@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:46:01 +0200 Subject: [PATCH] Fixed loopAll() async errors --- src/builders/embeds.ts | 2 +- src/core/api/modules/base.ts | 2 +- src/core/api/modules/checker.ts | 2 +- src/core/api/modules/client.ts | 4 ++-- src/core/api/modules/cooldown.ts | 4 ++-- src/core/api/modules/flag.ts | 2 +- src/core/startup/manageMigration.ts | 8 ++++---- src/data/framework/codeLoader.ts | 4 ++-- src/data/framework/cooldownLoader.ts | 2 +- src/data/framework/permissionLoader.ts | 2 +- src/data/openticket/optionLoader.ts | 8 ++++---- src/data/openticket/panelLoader.ts | 2 +- src/data/openticket/questionLoader.ts | 4 ++-- src/data/openticket/roleLoader.ts | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/builders/embeds.ts b/src/builders/embeds.ts index 5dc1fc8..0ce400d 100644 --- a/src/builders/embeds.ts +++ b/src/builders/embeds.ts @@ -882,7 +882,7 @@ const blacklistEmbeds = () => { const {user} = params const renderedUsers: string[] = [] - openticket.blacklist.forEach((blacklist,id) => {renderedUsers.push(discord.userMention(id.value)+" - "+(blacklist.reason ? blacklist.reason : "/"))}) + openticket.blacklist.loopAll((blacklist,id) => {renderedUsers.push(discord.userMention(id.value)+" - "+(blacklist.reason ? blacklist.reason : "/"))}) instance.setAuthor(user.displayName,user.displayAvatarURL()) instance.setColor(generalConfig.data.mainColor) diff --git a/src/core/api/modules/base.ts b/src/core/api/modules/base.ts index 1c0b372..ed76818 100644 --- a/src/core/api/modules/base.ts +++ b/src/core/api/modules/base.ts @@ -371,7 +371,7 @@ export class ODManager extends ODManagerChangeHe return this.#data.map((d) => d.id) } /**Run an iterator over all data in this manager. This method also supports async-await behaviour!*/ - async forEach(cb:(data:DataType,id:ODId) => ODPromiseVoid): Promise { + async loopAll(cb:(data:DataType,id:ODId) => ODPromiseVoid): Promise { for (const data of this.getAll()){ await cb(data,data.id) } diff --git a/src/core/api/modules/checker.ts b/src/core/api/modules/checker.ts index 4d7f152..795f7a7 100644 --- a/src/core/api/modules/checker.ts +++ b/src/core/api/modules/checker.ts @@ -65,7 +65,7 @@ export class ODCheckerManager extends ODManager { if (!res.valid) isValid = false }) - this.functions.forEach((func) => { + this.functions.loopAll((func) => { const res = func.func(this,this.functions) final.push(...res.messages) diff --git a/src/core/api/modules/client.ts b/src/core/api/modules/client.ts index 6c6eef0..b178514 100644 --- a/src/core/api/modules/client.ts +++ b/src/core/api/modules/client.ts @@ -496,7 +496,7 @@ export class ODSlashCommandManager extends ODManager { const existing: {cmd:ODSlashCommand, requiresUpdate:boolean}[] = [] const nonExisting: ODSlashCommand[] = [] - this.forEach((cmd) => { + this.loopAll((cmd) => { if (guildId && cmd.guildId != guildId) return const result = cmds.find((cmddata) => cmddata.name == cmd.name) if (result){ @@ -977,7 +977,7 @@ export class ODTextCommandManager extends ODManager { //filter commands for correct prefix const validPrefixCommands: {cmd:ODTextCommand,newContent:string}[] = [] - this.forEach((cmd) => { + this.loopAll((cmd) => { if (msg.content.startsWith(cmd.builder.prefix)) validPrefixCommands.push({ cmd:cmd, newContent:msg.content.substring(cmd.builder.prefix.length) diff --git a/src/core/api/modules/cooldown.ts b/src/core/api/modules/cooldown.ts index ab3db43..e74f568 100644 --- a/src/core/api/modules/cooldown.ts +++ b/src/core/api/modules/cooldown.ts @@ -139,7 +139,7 @@ export class ODCounterCooldown extends ODCooldown<{value:number}> { async init(){ if (this.ready) return setInterval(() => { - this.data.forEach((cooldown) => { + this.data.loopAll((cooldown) => { cooldown.data.value = cooldown.data.value - this.decrement if (cooldown.data.value <= this.cancelLimit){ cooldown.active = false @@ -217,7 +217,7 @@ export class ODIncrementalCounterCooldown extends ODCooldown<{value:number}> { async init(){ if (this.ready) return setInterval(() => { - this.data.forEach((cooldown) => { + this.data.loopAll((cooldown) => { cooldown.data.value = cooldown.data.value - this.decrement if (cooldown.data.value <= this.cancelLimit){ cooldown.active = false diff --git a/src/core/api/modules/flag.ts b/src/core/api/modules/flag.ts index d63c471..67f9e25 100644 --- a/src/core/api/modules/flag.ts +++ b/src/core/api/modules/flag.ts @@ -66,7 +66,7 @@ export class ODFlagManager extends ODManager { /**Set all flags to their `process.argv` value. */ init(){ - this.forEach((flag) => { + this.loopAll((flag) => { flag.detectProcessParams(false) }) } diff --git a/src/core/startup/manageMigration.ts b/src/core/startup/manageMigration.ts index 6373460..2dcdc06 100644 --- a/src/core/startup/manageMigration.ts +++ b/src/core/startup/manageMigration.ts @@ -42,9 +42,9 @@ const preloadMigrationContext = async () => { const unloadMigrationContext = async () => { openticket.debug.visible = false - openticket.databases.forEach((database,id) => {openticket.databases.remove(id)}) - openticket.configs.forEach((config,id) => {openticket.configs.remove(id)}) - openticket.flags.forEach((flag,id) => {openticket.flags.remove(id)}) + openticket.databases.loopAll((database,id) => {openticket.databases.remove(id)}) + openticket.configs.loopAll((config,id) => {openticket.configs.remove(id)}) + openticket.flags.loopAll((flag,id) => {openticket.flags.remove(id)}) openticket.debug.debug("-- MIGRATION CONTEXT END --") } @@ -78,7 +78,7 @@ const loadAllVersionMigrations = async (lastVersion:api.ODVersion) => { const saveAllVersionsToDatabase = async () => { const globalDatabase = openticket.databases.get("openticket:global") - openticket.versions.forEach((version,id) => { + openticket.versions.loopAll((version,id) => { globalDatabase.set("openticket:last-version",id.value,version.toString()) }) } \ No newline at end of file diff --git a/src/data/framework/codeLoader.ts b/src/data/framework/codeLoader.ts index c711d45..c7967ae 100644 --- a/src/data/framework/codeLoader.ts +++ b/src/data/framework/codeLoader.ts @@ -135,7 +135,7 @@ export const loadDatabaseCleanersCode = async () => { //OPTION DATABASE CLEANER openticket.code.add(new api.ODCode("openticket:option-database-cleaner",10,() => { //delete all unused options - openticket.options.forEach((option,id) => { + openticket.options.loopAll((option,id) => { if (optionDatabase.exists("openticket:used-option",id.value) && !openticket.tickets.getAll().some((ticket) => ticket.id.value == id.value)){ optionDatabase.delete("openticket:used-option",id.value) } @@ -331,7 +331,7 @@ export const loadDatabaseSaversCode = async () => { } //delete all unused options on ticket move - openticket.options.forEach((option,id) => { + openticket.options.loopAll((option,id) => { if (optionDatabase.exists("openticket:used-option",id.value) && !openticket.tickets.getAll().some((ticket) => ticket.id.value == id.value)){ optionDatabase.delete("openticket:used-option",id.value) } diff --git a/src/data/framework/cooldownLoader.ts b/src/data/framework/cooldownLoader.ts index bc9fde7..f63efa2 100644 --- a/src/data/framework/cooldownLoader.ts +++ b/src/data/framework/cooldownLoader.ts @@ -1,7 +1,7 @@ import {openticket, api, utilities} from "../../index" export const loadAllCooldowns = async () => { - openticket.options.forEach((option) => { + openticket.options.loopAll((option) => { if (!(option instanceof api.ODTicketOption)) return loadTicketOptionCooldown(option) }) diff --git a/src/data/framework/permissionLoader.ts b/src/data/framework/permissionLoader.ts index 4d2eb41..44217fb 100644 --- a/src/data/framework/permissionLoader.ts +++ b/src/data/framework/permissionLoader.ts @@ -30,7 +30,7 @@ export const loadAllPermissions = async () => { }) //TICKET ADMINS - openticket.tickets.forEach(async (ticket) => { + openticket.tickets.loopAll(async (ticket) => { try { const channel = await openticket.client.fetchGuildTextChannel(mainServer,ticket.id.value) if (!channel) return diff --git a/src/data/openticket/optionLoader.ts b/src/data/openticket/optionLoader.ts index 83de4cc..6e4bd3c 100644 --- a/src/data/openticket/optionLoader.ts +++ b/src/data/openticket/optionLoader.ts @@ -19,8 +19,8 @@ export const loadAllOptions = async () => { //update options on config reload optionConfig.onReload(async () => { //clear previous options & suffixes - openticket.options.forEach((data,id) => {openticket.options.remove(id)}) - openticket.options.suffix.forEach((data,id) => {openticket.options.suffix.remove(id)}) + await openticket.options.loopAll((data,id) => {openticket.options.remove(id)}) + await openticket.options.suffix.loopAll((data,id) => {openticket.options.suffix.remove(id)}) //add new options optionConfig.data.forEach((option) => { @@ -36,7 +36,7 @@ export const loadAllOptions = async () => { }) //update options in tickets - openticket.tickets.forEach((ticket) => { + await openticket.tickets.loopAll((ticket) => { const optionId = ticket.option.id const option = openticket.options.get(optionId) if (option && option instanceof api.ODTicketOption) ticket.option = option @@ -49,7 +49,7 @@ export const loadAllOptions = async () => { }) //update roles on config reload - openticket.roles.forEach((data,id) => {openticket.roles.remove(id)}) + await openticket.roles.loopAll((data,id) => {openticket.roles.remove(id)}) await (await import("./roleLoader.js")).loadAllRoles() }) } diff --git a/src/data/openticket/panelLoader.ts b/src/data/openticket/panelLoader.ts index 001d349..07d17cb 100644 --- a/src/data/openticket/panelLoader.ts +++ b/src/data/openticket/panelLoader.ts @@ -12,7 +12,7 @@ export const loadAllPanels = async () => { //update panels on config reload panelConfig.onReload(async () => { //clear previous panels - openticket.panels.forEach((data,id) => {openticket.panels.remove(id)}) + await openticket.panels.loopAll((data,id) => {openticket.panels.remove(id)}) //add new panels panelConfig.data.forEach((panel) => { diff --git a/src/data/openticket/questionLoader.ts b/src/data/openticket/questionLoader.ts index fdd69e6..4b66b8a 100644 --- a/src/data/openticket/questionLoader.ts +++ b/src/data/openticket/questionLoader.ts @@ -13,9 +13,9 @@ export const loadAllQuestions = async () => { }) //update questions on config reload - questionConfig.onReload(() => { + questionConfig.onReload(async () => { //clear previous questions - openticket.questions.forEach((data,id) => {openticket.questions.remove(id)}) + await openticket.questions.loopAll((data,id) => {openticket.questions.remove(id)}) //add new questions questionConfig.data.forEach((question) => { diff --git a/src/data/openticket/roleLoader.ts b/src/data/openticket/roleLoader.ts index cd53f18..d382f24 100644 --- a/src/data/openticket/roleLoader.ts +++ b/src/data/openticket/roleLoader.ts @@ -1,7 +1,7 @@ import {openticket, api, utilities} from "../../index" export const loadAllRoles = async () => { - openticket.options.forEach((opt) => { + openticket.options.loopAll((opt) => { if (opt instanceof api.ODRoleOption){ openticket.roles.add(loadRole(opt)) }