From c1ca37283c1d4a29f21472c05d631a4601926c25 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Mon, 6 May 2024 17:09:59 +0100 Subject: [PATCH] Add give currency timer --- src/bot.ts | 10 +--------- src/client/client.ts | 11 ++++++++++- src/contracts/AppBaseEntity.ts | 6 ++++++ src/database/entities/app/User.ts | 4 ++-- src/helpers/TimerHelper.ts | 19 ++++++++++++++++--- src/registry.ts | 4 ++++ src/timers/GiveCurrency.ts | 17 ++++++++++++----- 7 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/bot.ts b/src/bot.ts index f75bbff..41ec193 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -58,12 +58,4 @@ if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO }); } -client.start(); - -const timerHelper = new TimerHelper(); - -const id = timerHelper.AddTimer('* * * * * *', 'Europe/London', GiveCurrency); - -console.log(`Timer Created: ${id}`); - -timerHelper.StartAllTimers(); \ No newline at end of file +client.start(); \ No newline at end of file diff --git a/src/client/client.ts b/src/client/client.ts index c694950..2dd9a29 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -14,6 +14,8 @@ import Webhooks from "../webhooks"; import CardMetadataFunction from "../Functions/CardMetadataFunction"; import { SeriesMetadata } from "../contracts/SeriesMetadata"; import AppLogger from "./appLogger"; +import TimerHelper from "../helpers/TimerHelper"; +import GiveCurrency from "../timers/GiveCurrency"; export class CoreClient extends Client { private static _commandItems: ICommandItem[]; @@ -23,6 +25,7 @@ export class CoreClient extends Client { private _events: Events; private _util: Util; private _webhooks: Webhooks; + private _timerHelper: TimerHelper; public static ClaimId: string; public static Environment: Environment; @@ -59,6 +62,7 @@ export class CoreClient extends Client { this._events = new Events(); this._util = new Util(); this._webhooks = new Webhooks(); + this._timerHelper = new TimerHelper(); AppLogger.LogInfo("Client", `Environment: ${CoreClient.Environment}`); @@ -72,7 +76,12 @@ export class CoreClient extends Client { } await AppDataSource.initialize() - .then(() => AppLogger.LogInfo("Client", "App Data Source Initialised")) + .then(() => { + AppLogger.LogInfo("Client", "App Data Source Initialised"); + + const timerId = this._timerHelper.AddTimer("*/30 * * * * *", "Europe/London", GiveCurrency, false); + this._timerHelper.StartTimer(timerId); + }) .catch(err => { AppLogger.LogError("Client", "App Data Source Initialisation Failed"); AppLogger.LogError("Client", err); diff --git a/src/contracts/AppBaseEntity.ts b/src/contracts/AppBaseEntity.ts index b9ca565..3eb9684 100644 --- a/src/contracts/AppBaseEntity.ts +++ b/src/contracts/AppBaseEntity.ts @@ -27,6 +27,12 @@ export default class AppBaseEntity { await repository.save(entity); } + public static async SaveAll(target: EntityTarget, entities: DeepPartial[]): Promise { + const repository = AppDataSource.getRepository(target); + + await repository.save(entities); + } + public static async Remove(target: EntityTarget, entity: T): Promise { const repository = AppDataSource.getRepository(target); diff --git a/src/database/entities/app/User.ts b/src/database/entities/app/User.ts index 649c1c1..a909552 100644 --- a/src/database/entities/app/User.ts +++ b/src/database/entities/app/User.ts @@ -13,8 +13,8 @@ export default class User extends AppBaseEntity { @Column() Currency: number; - public UpdateCurrency(currency: number) { - this.Currency = currency; + public AddCurrency(amount: number) { + this.Currency += amount; } public RemoveCurrency(amount: number): boolean { diff --git a/src/helpers/TimerHelper.ts b/src/helpers/TimerHelper.ts index 3d3f7e9..c5b1071 100644 --- a/src/helpers/TimerHelper.ts +++ b/src/helpers/TimerHelper.ts @@ -5,6 +5,8 @@ interface Timer { id: string; job: CronJob; context: Map; + onTick: ((context: Map) => void) | ((context: Map) => Promise); + runOnStart: boolean; } export default class TimerHelper { @@ -17,7 +19,8 @@ export default class TimerHelper { public AddTimer( cronTime: string, timeZone: string, - onTick: ((context: Map) => void) | ((context: Map) => Promise)): string { + onTick: ((context: Map) => void) | ((context: Map) => Promise), + runOnStart: boolean = false): string { const context = new Map(); const job = new CronJob( @@ -36,13 +39,15 @@ export default class TimerHelper { id, job, context, + onTick, + runOnStart, }); return id; } public StartAllTimers() { - this._timers.forEach(timer => timer.job.start()); + this._timers.forEach(timer => this.StartJob(timer)); } public StopAllTimers() { @@ -54,7 +59,7 @@ export default class TimerHelper { if (!timer) return; - timer.job.start(); + this.StartJob(timer); } public StopTimer(id: string) { @@ -64,4 +69,12 @@ export default class TimerHelper { timer.job.stop(); } + + private StartJob(timer: Timer) { + timer.job.start(); + + if (timer.runOnStart) { + timer.onTick(timer.context); + } + } } \ No newline at end of file diff --git a/src/registry.ts b/src/registry.ts index bb68685..eee78f4 100644 --- a/src/registry.ts +++ b/src/registry.ts @@ -52,4 +52,8 @@ export default class Registry { CoreClient.RegisterButtonEvent("series", new SeriesEvent()); CoreClient.RegisterButtonEvent("trade", new TradeButtonEvent()); } + + public static RegisterTimers() { + + } } \ No newline at end of file diff --git a/src/timers/GiveCurrency.ts b/src/timers/GiveCurrency.ts index d9e40fa..9a0d28a 100644 --- a/src/timers/GiveCurrency.ts +++ b/src/timers/GiveCurrency.ts @@ -1,9 +1,16 @@ -export default function GiveCurrency(context: Map) { - let calledTimes = context.get('times') as number; +import AppLogger from "../client/appLogger"; +import User from "../database/entities/app/User"; - if (!calledTimes) calledTimes = 1; +export default async function GiveCurrency(context: Map) { + AppLogger.LogInfo("Timers/GiveCurrency", "Giving currency to every known user"); - console.log(`This has been called ${calledTimes} times!`); + const users = await User.FetchAll(User); - context.set('times', calledTimes + 1); + for (const user of users) { + user.AddCurrency(5); + } + + User.SaveAll(User, users); + + AppLogger.LogInfo("Timers/GiveCurrency", `Successfully gave +5 currency to ${users.length} users`); } \ No newline at end of file