From b46dc8d3ae70e8eebc7bbe678e7401ffcf2bc541 Mon Sep 17 00:00:00 2001
From: moriese <moriese02@gmail.com>
Date: Wed, 1 Jan 2025 18:53:33 +0100
Subject: [PATCH] added "newYear"

---
 src/actions/greeting/greeting.service.ts | 28 ++++++++++++++++++++++++
 src/actions/greeting/greeting.task.ts    | 12 ++++++++++
 src/actions/waterMe/waterMe.task.ts      |  4 ++--
 src/config.ts                            |  4 ++--
 src/controllers/discord.controller.ts    | 14 +++++++-----
 5 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/src/actions/greeting/greeting.service.ts b/src/actions/greeting/greeting.service.ts
index e21bb1a..ee6ae62 100644
--- a/src/actions/greeting/greeting.service.ts
+++ b/src/actions/greeting/greeting.service.ts
@@ -4,6 +4,18 @@ import { getRandomInt } from "lib/utils";
 import { greetContent, sleepContent } from "./greeting.components.ts";
 
 export class GreetingService {
+	async customMessage() {
+		console.log("custom message");
+
+		const channels = client.channels;
+
+		const channel = channels.cache.get(config.discord.channelId);
+
+		if (channel?.isTextBased && channel?.isSendable()) {
+			await channel.send({ content: " " });
+		}
+	}
+
 	async greet() {
 		client.user?.setActivity("guten morgen! :3", { type: 4 });
 		console.log("set activity: awake");
@@ -36,6 +48,22 @@ export class GreetingService {
 		}
 	}
 
+	async newYear() {
+		client.user?.setActivity("frohes neues! :)", { type: 4 });
+		console.log("set activity: happy new Year");
+		client.user?.setPresence({
+			status: "online",
+		});
+
+		/*const channels = client.channels;
+
+		const channel = channels.cache.get(config.discord.channelId);
+
+		if (channel?.isTextBased && channel?.isSendable()) {
+			await channel.send({ content: "frohes neues! @everyone" });
+		}*/
+	}
+
 	getContent(asleep: boolean) {
 		if (asleep) {
 			return sleepContent[getRandomInt(0, sleepContent.length - 1)];
diff --git a/src/actions/greeting/greeting.task.ts b/src/actions/greeting/greeting.task.ts
index 38a42a0..d1059c6 100644
--- a/src/actions/greeting/greeting.task.ts
+++ b/src/actions/greeting/greeting.task.ts
@@ -13,6 +13,7 @@ new CronJob(
 	true, // start
 	"Europe/Berlin", // timeZone
 );
+// job.start() is optional here because of the fourth parameter set to true.
 
 new CronJob(
 	"0 30 22 * * *",
@@ -23,4 +24,15 @@ new CronJob(
 	null,
 	true,
 	"Europe/Berlin",
+);
+
+new CronJob(
+	"0 0 0 1 1 *",
+	async () => {
+		console.log("happy new year");
+		await greetingService.newYear();
+	},
+	null,
+	true,
+	"Europe/Berlin",
 );
\ No newline at end of file
diff --git a/src/actions/waterMe/waterMe.task.ts b/src/actions/waterMe/waterMe.task.ts
index db6a8a9..ec795b0 100644
--- a/src/actions/waterMe/waterMe.task.ts
+++ b/src/actions/waterMe/waterMe.task.ts
@@ -4,7 +4,7 @@ import { WaterMeService } from "actions/waterMe/waterMe.service";
 const waterMeService = new WaterMeService();
 
 new CronJob(
-	"0 * * * * *", // cronTime
+	"0 0 20 * * *", // cronTime
 	async () => {
 		console.log("isThirsty()");
 		await waterMeService.isThirsty();
@@ -13,4 +13,4 @@ new CronJob(
 	true, // start
 	"Europe/Berlin", // timeZone
 );
-// job.start() is optional here because of the fourth parameter set to true.
+// job.start() is optional here because of the fourth parameter set to true.
\ No newline at end of file
diff --git a/src/config.ts b/src/config.ts
index 0ecdb35..10accf8 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,11 +1,11 @@
-const test = true;
+const test = false;
 
 export default {
 	discord: {
 		channelId:
 			(test
 				? process.env.DISCORD_TEST_CHANNEL_ID
-				: process.env.DISCORD_CHANNEL_ID) || "",
+				: process.env.DISCORD_CHANNEL_ID_BOT) || "",
 		applicationId: process.env.DISCORD_APPLICATION_ID || "",
 		token: process.env.DISCORD_TOKEN || "",
 	},
diff --git a/src/controllers/discord.controller.ts b/src/controllers/discord.controller.ts
index 1969c10..a137276 100644
--- a/src/controllers/discord.controller.ts
+++ b/src/controllers/discord.controller.ts
@@ -29,11 +29,7 @@ export default class DiscordController extends EventEmitter {
 		this.helpService = new HelpService();
 		// log when running
 		client.once("ready", async () => {
-			client.user?.setActivity("HALLOOO HOERT IHR MICH?", { type: 4 });
-			console.log("set activity");
-			client.user?.setPresence({
-				status: "idle",
-			});
+			this.setActivity();
 
 			/*const channels = client.channels;
 			const channel = channels.cache.get(config.discord.channelId);
@@ -49,6 +45,14 @@ export default class DiscordController extends EventEmitter {
 		client.on("interactionCreate", this.handleInteraction.bind(this));
 	}
 
+	async setActivity() {
+		client.user?.setActivity("frohes neues :3", { type: 4 });
+		console.log("set activity");
+		client.user?.setPresence({
+			status: "online",
+		});
+	}
+
 	async init() {
 		await this.discordService.init();
 	}