From 331fea2c10ba99bf2fd5977ec66c9b4bb7b4a366 Mon Sep 17 00:00:00 2001
From: mo <moriese@proton.me>
Date: Fri, 27 Feb 2026 09:30:47 +0100
Subject: [PATCH] fix greeting functionality

---
 adapters/discord/src/config/index.ts               |  2 +-
 adapters/fluxer/src/config/index.ts                |  4 ++--
 .../guild-members/guild-members.listener.ts        | 13 ++++++-------
 core/src/entities/channels/channels.schema.ts      |  2 +-
 core/src/lib/i18n/i18n.service.ts                  | 14 ++++++++++++--
 core/src/locales/de/greeting.ts                    |  2 --
 core/src/locales/en/greeting.ts                    |  2 --
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/adapters/discord/src/config/index.ts b/adapters/discord/src/config/index.ts
index 325a3f8..c80395d 100644
--- a/adapters/discord/src/config/index.ts
+++ b/adapters/discord/src/config/index.ts
@@ -12,7 +12,7 @@ export const config: z.output<typeof ConfigSchema> = {
 			help: "1321860125127872605",
 			introduction: "1321473655523246171",
 			news: "1321953521435934741",
-			"off-topic": "1316153372507639855",
+			general: "1316153372507639855",
 			rules: "1316153372507639849",
 			testing: "1451310086864507112",
 			welcome: "1316153372507639852",
diff --git a/adapters/fluxer/src/config/index.ts b/adapters/fluxer/src/config/index.ts
index 8b2c185..b41f9d0 100644
--- a/adapters/fluxer/src/config/index.ts
+++ b/adapters/fluxer/src/config/index.ts
@@ -7,12 +7,12 @@ const configInput: z.input<typeof ConfigSchema> = {
 		text: {
 			bot: "1473270893617315899",
 			bump: "",
-			feedback: "",
+			feedback: "1475069278198489089",
 			help: "",
 			introduction: "1473060169972367394",
 			news: "",
 			log: "1473380467480031548",
-			"off-topic": "1473029758951358491",
+			general: "1473029758951358491",
 			rules: "1473070476174811195",
 			testing: "",
 			welcome: "1473270114214928440",
diff --git a/adapters/fluxer/src/listeners/guild-members/guild-members.listener.ts b/adapters/fluxer/src/listeners/guild-members/guild-members.listener.ts
index dbd3c17..390d79b 100644
--- a/adapters/fluxer/src/listeners/guild-members/guild-members.listener.ts
+++ b/adapters/fluxer/src/listeners/guild-members/guild-members.listener.ts
@@ -12,14 +12,13 @@ client.on(Events.GuildMemberAdd, async (member: GuildMember) => {
 		return;
 	}
 
-	const channel = await client.channels.fetch(config.channelMapping.text.log);
+	const channel = await client.channels.fetch(
+		config.channelMapping.text.welcome,
+	);
 
+	await logChannelService.sendLogMessage(
+		`new member: <@${member.user.id}> (${member.user.username}) joined the server.`,
+	);
 	await greetingService.sendGreeting(member.user.username, channel);
-	await logChannelService.sendLogMessage(
-		`new member: <@${member.user.id}> (${member.user.username}) joined the server.`,
-	);
 	await greetingService.sendDmGreeting(member.user, member.user.username);
-	await logChannelService.sendLogMessage(
-		`new member: <@${member.user.id}> (${member.user.username}) joined the server.`,
-	);
 });
diff --git a/core/src/entities/channels/channels.schema.ts b/core/src/entities/channels/channels.schema.ts
index 7734430..c6680de 100644
--- a/core/src/entities/channels/channels.schema.ts
+++ b/core/src/entities/channels/channels.schema.ts
@@ -10,7 +10,7 @@ export const TextChannelOptions = [
 	"feedback",
 	"welcome",
 	"introduction",
-	"off-topic",
+	"general",
 	"help",
 	"pomodoro",
 ] as const;
diff --git a/core/src/lib/i18n/i18n.service.ts b/core/src/lib/i18n/i18n.service.ts
index 2735b29..e5806d2 100644
--- a/core/src/lib/i18n/i18n.service.ts
+++ b/core/src/lib/i18n/i18n.service.ts
@@ -1,7 +1,9 @@
 import i18next, { type ParseKeys } from "i18next";
+import acceptUserDe from "locales/de/accept-user";
 import greetingDe from "locales/de/greeting";
 // import { createLogger } from "lib/logger";
 import waterMeDe from "locales/de/water-me";
+import acceptUserEn from "locales/en/accept-user";
 import greetingEn from "locales/en/greeting";
 import waterMeEn from "locales/en/water-me";
 
@@ -27,8 +29,16 @@ export class I18nService {
 			lng: "en",
 			fallbackLng: "en",
 			resources: {
-				en: { greeting: greetingEn, waterMe: waterMeEn },
-				de: { greeting: greetingDe, waterMe: waterMeDe },
+				en: {
+					acceptUser: acceptUserEn,
+					greeting: greetingEn,
+					waterMe: waterMeEn,
+				},
+				de: {
+					acceptUser: acceptUserDe,
+					greeting: greetingDe,
+					waterMe: waterMeDe,
+				},
 			},
 		});
 	}
diff --git a/core/src/locales/de/greeting.ts b/core/src/locales/de/greeting.ts
index 50505ee..c1e7170 100644
--- a/core/src/locales/de/greeting.ts
+++ b/core/src/locales/de/greeting.ts
@@ -20,8 +20,6 @@ export default {
 	],
 	greeting4: [". ", "! "],
 	emoji: ["😊", "💕", "✨", "💖", ":3", ":)", "c:", "<3", "<333"],
-	dmAcceptedContent: `huhu! du wurdest als lernende:r>≤ akzeptiert :3
-		sag gerne hallo!`,
 	dm: `hey! ich bin avocadi von avocadi study!!
 	um auf den rest des servers zugreifen zu koennen, musst du dich noch vorstellen!
 	---
diff --git a/core/src/locales/en/greeting.ts b/core/src/locales/en/greeting.ts
index 4200247..d2a735b 100644
--- a/core/src/locales/en/greeting.ts
+++ b/core/src/locales/en/greeting.ts
@@ -21,8 +21,6 @@ export default {
 	],
 	greeting4: [". ", "! "],
 	emoji: ["😊", "💕", "✨", "💖", ":3", ":)", "c:", "<3", "<333"],
-	dmAcceptedContent: `hey there! you've been accepted :3
-		feel free to say hello!`,
 	dmGreeting: `hey! i'm avocadi from avocadi study!!
 		in order to access the rest of the server, you still need to introduce yourself!
 		---