From 73b1d82f4395012cdd944f4332dc6a522d107fbf Mon Sep 17 00:00:00 2001
From: mo <moriese@proton.me>
Date: Fri, 6 Mar 2026 22:31:32 +0100
Subject: [PATCH] discord greting service update

---
 .../discord/src/features/greeting/greeting.service.ts |  3 ++-
 core/src/features/greeting/greeting.service.ts        | 11 ++++++++---
 core/src/locales/de/greeting.ts                       |  5 ++++-
 core/src/locales/en/greeting.ts                       |  3 +++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/adapters/discord/src/features/greeting/greeting.service.ts b/adapters/discord/src/features/greeting/greeting.service.ts
index a1af87c..f976625 100644
--- a/adapters/discord/src/features/greeting/greeting.service.ts
+++ b/adapters/discord/src/features/greeting/greeting.service.ts
@@ -1,8 +1,9 @@
 import { GreetingService } from "@avocadi/bot-core/features/greeting/greeting.service";
 import { i18nService } from "@avocadi/bot-core/lib/i18n";
+import type { Channel, Message, User } from "discord.js";
 import { messagesService } from "entities/messages/messages.service";
 
-export const greetingService = new GreetingService(
+export const greetingService = new GreetingService<User, Message, Channel>(
 	messagesService,
 	i18nService,
 	"de",
diff --git a/core/src/features/greeting/greeting.service.ts b/core/src/features/greeting/greeting.service.ts
index 21b7092..e4a802a 100644
--- a/core/src/features/greeting/greeting.service.ts
+++ b/core/src/features/greeting/greeting.service.ts
@@ -1,6 +1,7 @@
 import type { MessagesServiceInterface } from "entities/messages/messages.service";
 import type { BaseChannel, BaseMessage, BaseUser } from "lib/common";
 import type { I18nService } from "lib/i18n/i18n.service";
+import { createLogger } from "lib/logger";
 
 export class GreetingService<
 	U extends BaseUser = BaseUser,
@@ -11,6 +12,7 @@ export class GreetingService<
 	i18nService: I18nService;
 	lang: "en" | "de";
 	ns = "greeting";
+	private logger = createLogger("GreetingService");
 
 	constructor(
 		messagesService: MessagesServiceInterface<U, M, C>,
@@ -22,7 +24,8 @@ export class GreetingService<
 		this.lang = lang;
 	}
 
-	async sendDmGreeting(user: U, _userName: string) {
+	async sendDmGreeting(user: U) {
+		this.logger.debug("send dm");
 		const greetingMessage: string = await this.i18nService.t(
 			"dmGreeting",
 			this.lang,
@@ -32,11 +35,13 @@ export class GreetingService<
 		await this.messagesService.sendToUser(user, greetingMessage);
 	}
 
-	async sendGreeting(userName: string, channel: C) {
+	async sendGreeting(userId: string, channel: C) {
+		this.logger.debug("send greeting");
+
 		const greetingMessage: string =
 			(await this.i18nService.t("greeting1", this.lang, this.ns)) +
 			(await this.i18nService.t("greeting2", this.lang, this.ns, {
-				member: userName,
+				memberId: userId,
 			})) +
 			(await this.i18nService.t("greeting3", this.lang, this.ns)) +
 			(await this.i18nService.t("greeting4", this.lang, this.ns)) +
diff --git a/core/src/locales/de/greeting.ts b/core/src/locales/de/greeting.ts
index 87706e1..21cc06f 100644
--- a/core/src/locales/de/greeting.ts
+++ b/core/src/locales/de/greeting.ts
@@ -20,11 +20,14 @@ export default {
 	],
 	greeting4: [". ", "! "],
 	emoji: ["😊", "💕", "✨", "💖", ":3", ":)", "c:", "<3", "<333"],
-	dm: `hey! ich bin avocadi von avocadi study!!
+	dmGreeting: `hey! ich bin avocadi von avocadi study!!
+
 um auf den rest des servers zugreifen zu koennen, musst du dich noch vorstellen!
+
 ---
 z.b.: name, alter, pronomen, klasse/studiengang/beruf, hobby, ueber mich:
 ---
+
 sobald wir deine nachricht ueberprueft haben, bekommst du die rolle **lernende:r** :)`,
 	log: `neues mitglied: <@{{memberId}}> ({{memberUserName}}) ist dem server beigetreten.`,
 } as const;
diff --git a/core/src/locales/en/greeting.ts b/core/src/locales/en/greeting.ts
index 7702478..b53327d 100644
--- a/core/src/locales/en/greeting.ts
+++ b/core/src/locales/en/greeting.ts
@@ -22,10 +22,13 @@ export default {
 	greeting4: [". ", "! "],
 	emoji: ["😊", "💕", "✨", "💖", ":3", ":)", "c:", "<3", "<333"],
 	dmGreeting: `hey! i'm avocadi from avocadi study!!
+
 in order to access the rest of the server, you still need to introduce yourself!
+
 ---
 e.g.: name, age, pronouns, class/degree/profession, hobbies, about me
 ---
+
 once we have reviewed your message, you will be assigned the role **member** :)`,
 	log: `new member: <@{{memberId}}> ({{memberUserName}}) joined the server.`,
 } as const;