name fix docker-compose

.gitea/workflows/deploy.yml

@@ -1,17 +1,16 @@
 name: release-tag
 
-on:
+on: push
-  push
 
 jobs:
   release-image:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
-#    env:
+    #    env:
-#      DOCKER_ORG: teacup
+    #      DOCKER_ORG: teacup
-#      DOCKER_LATEST: nightly
+    #      DOCKER_LATEST: nightly
-#      RUNNER_TOOL_CACHE: /toolcache
+    #      RUNNER_TOOL_CACHE: /toolcache
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -28,12 +27,12 @@ jobs:
           registry: git.unom.io # replace it with your local IP
           username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
-          
+
       - name: Get Meta
         id: meta
         run: |
           echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
-          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
 
       - name: Build and push
         uses: docker/build-push-action@v4
@@ -42,8 +41,8 @@ jobs:
           file: ./Dockerfile
           platforms: |
             linux/amd64
-            linux/arm64                        
+            linux/arm64
           push: true
           tags: | # replace it with your local IP and tags
-            git.unom.io/moriese/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            git.unom.io/mo/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
-            git.unom.io/moriese/${{ steps.meta.outputs.REPO_NAME }}:latest
+            git.unom.io/mo/${{ steps.meta.outputs.REPO_NAME }}:latest

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 moriese
+Copyright (c) 2024 mo (mo@unom.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   avocadi-bot:
     container_name: avocadi-bot
-    image: git.unom.io/moriese/avocadi-bot:latest
+    image: git.unom.io/mo/avocadi-bot:latest
     restart: unless-stopped
     volumes:
       - ./.env:/usr/src/app/.env

src/actions/debug/debug.service.ts

@@ -0,0 +1,48 @@
+import { type CommandsType, Commands } from "commands";
+import config from "config";
+import type { CacheType, ChatInputCommandInteraction, Interaction } from "discord.js";
+import { checkPermission } from "permissions";
+
+export class DebugService {
+
+    async handleInteraction(
+        interaction: Interaction<CacheType>
+    ) {
+        if (interaction.isChatInputCommand()) {
+            await this.handleChatInputCommand(interaction);
+            return;
+        }
+
+    }
+    async handleChatInputCommand(interaction: ChatInputCommandInteraction<CacheType>) {
+        const commandName = interaction.commandName as CommandsType;
+        switch (commandName) {
+            case Commands.Enum.version:
+                await this.version(interaction);
+                return;
+            default:
+                break;
+        }
+    }
+
+    async version(interaction: ChatInputCommandInteraction<CacheType>) {
+        try {
+            console.log("version command");
+            if (await checkPermission(interaction.member) !== true) {
+                await interaction.reply({
+                    content: "du hast keine rechte fuer diesen befehl",
+                    ephemeral: true,
+                });
+                return;
+            }
+            await interaction.reply({
+                content: "version: " + config.discord.version,
+            });
+
+        }
+        catch (error) {
+            console.error("error while sending version msg:", error);
+        }
+    }
+
+}

src/actions/dynamicVChannel/dynamicVChannel.service.ts

@@ -1,7 +1,7 @@
 import config from "config";
 import client from "lib/client";
 import { getRandomInt } from "lib/utils";
-import { } from "./dynamicChannel.components.ts";
+import { } from "./dynamicVChannel.components.ts";
 import {
     Client,
     EmbedBuilder,
@@ -17,35 +17,33 @@ import {
     type VoiceBasedChannel,
 } from "discord.js";
 
-export class DynamicChannelService {
+export class DynamicVChannelService {
     async handleInteraction(interaction: Interaction<CacheType>) {
         // todo
     }
 
-    async createChannel(
+    async createVChannel(
-        oldState: VoiceState,
         newState: VoiceState,
-        channel: VoiceBasedChannel,
+        channel: VoiceBasedChannel
     ): Promise<StageChannel | VoiceChannel> {
         //console.log("createChannel()");
-        const newChannel = await channel.clone({
+        const newVChannel = await channel.clone({
             name: `${channel.name.substring(2)}; ${newState.member?.displayName}`,
             position: 100,
         });
 
-        return newChannel;
+        return newVChannel;
     }
 
-    async deleteChannel(
+    async deleteVChannel(
         oldState: VoiceState,
         newState: VoiceState,
         newChannel: StageChannel | VoiceChannel,
         // biome-ignore lint/suspicious/noExplicitAny: <explanation>
         channelListeners: Map<any, any>,
-        channelListener: (oldState: VoiceState, newState: VoiceState) => void,
+        channelListener: (oldState: VoiceState, newState: VoiceState) => void
     ) {
         //console.log("deleteChannel()");
-
         if (
             oldState.channelId === newChannel.id ||
             newState.channelId === newChannel.id

src/actions/greeting/greeting.service.ts

@@ -18,6 +18,7 @@ import {
 } from "discord.js";
 import { DmService } from "actions/dm/dm.service.ts";
 import { Commands, type CommandsType } from "commands/index.ts";
+import { checkPermission } from "permissions/index.ts";
 
 export class GreetingService {
 	dmService: DmService;
@@ -82,7 +83,7 @@ export class GreetingService {
 		//console.log(input);
 
 		// permission check
-		if (await this.checkPermission(interaction.member) !== true) {
+		if (await checkPermission(interaction.member) !== true) {
 			await interaction.reply({
 				content: "du hast keine rechte fuer diesen befehl",
 				ephemeral: true,
@@ -133,6 +134,7 @@ export class GreetingService {
 		}
 	}
 
+	// unused
 	async greet() {
 		client.user?.setActivity("guten morgen! :3", { type: 4 });
 		console.log("set activity: awake");
@@ -142,13 +144,14 @@ export class GreetingService {
 
 		const channels = client.channels;
 
-		const channel = channels.cache.get(config.discord.testChannel);
+		const channel = channels.cache.get(config.discord.channelIdOffTopic);
 
 		if (channel?.isTextBased && channel?.isSendable()) {
 			await channel.send({ content: this.getContent(false) });
 		}
 	}
 
+	// unused
 	async sleep() {
 		client.user?.setActivity("zzzzZZ..", { type: 4 });
 		console.log("set activity: asleep");
@@ -158,7 +161,7 @@ export class GreetingService {
 
 		const channels = client.channels;
 
-		const channel = channels.cache.get(config.discord.testChannel);
+		const channel = channels.cache.get(config.discord.channelIdOffTopic);
 
 		if (channel?.isTextBased && channel?.isSendable()) {
 			await channel.send({ content: this.getContent(true) });
@@ -167,14 +170,15 @@ export class GreetingService {
 
 	async newYear() {
 		client.user?.setActivity("frohes neues! :)", { type: 4 });
-		console.log("set activity: happy new Year");
+		console.log("set activity: happy new year");
 		client.user?.setPresence({
 			status: "online",
 		});
 
+		// unused
 		/*const channels = client.channels;
 
-		const channel = channels.cache.get(config.discord.channelId);
+		const channel = channels.cache.get(config.discord.channelIdOffTopic);
 
 		if (channel?.isTextBased && channel?.isSendable()) {
 			await channel.send({ content: "frohes neues! @everyone" });
@@ -199,7 +203,7 @@ export class GreetingService {
 
 		try {
 			// permission check
-			if (await this.checkPermission(interaction.member) !== true) {
+			if (await checkPermission(interaction.member) !== true) {
 				await interaction.reply({
 					content: "du hast keine rechte fuer diesen befehl",
 					ephemeral: true,
@@ -271,7 +275,7 @@ export class GreetingService {
 				return;
 			}
 
-			if (await this.checkPermission(interaction.member) !== true) {
+			if (await checkPermission(interaction.member) !== true) {
 				await interaction.reply({
 					content: "du hast keine rechte fuer diesen befehl",
 					ephemeral: true,
@@ -322,17 +326,6 @@ export class GreetingService {
 		}
 	}
 
-	async checkPermission(member: GuildMember | APIInteractionGuildMember | null) {
-		let permission = false;
-		if (member?.roles instanceof GuildMemberRoleManager) {
-			if (member.roles.cache.has(config.discord.roleAdmin) || member.roles.cache.has(config.discord.roleMod)) {
-				console.log("user has permission");
-				permission = true;
-			}
-		}
-		return permission;
-	}
-
 	async checkRole(member: GuildMember) {
 		let hasRole = false;
 		if (member?.roles instanceof GuildMemberRoleManager) {

src/actions/help/help.components.ts

@@ -8,7 +8,7 @@ export default function createEmbed() { // ({ embeds: [exampleEmbed] })
         .setColor(0x004400)
         //.setTitle("/hilfe")
         //.setURL("")
-        .setAuthor({ name: "avocadi - befehle", iconURL: "https://media.discordapp.net/attachments/1321933410188656693/1323447010380222474/mo_Avocadi_Avatar_Closeup_2.png?ex=67748b93&is=67733a13&hm=f48efb3523bca5f50e79144c7b41a127c94670e693e3da3dc2e6ffe62ad8a769&=&format=webp&quality=lossless&width=1524&height=1524", url: 'https://git.unom.io/moriese/avocadi-bot' })
+        .setAuthor({ name: "avocadi - befehle", iconURL: "https://media.discordapp.net/attachments/1321933410188656693/1323447010380222474/mo_Avocadi_Avatar_Closeup_2.png?ex=67748b93&is=67733a13&hm=f48efb3523bca5f50e79144c7b41a127c94670e693e3da3dc2e6ffe62ad8a769&=&format=webp&quality=lossless&width=1524&height=1524", url: 'https://git.unom.io/mo/avocadi-bot' })
         .setDescription(" ")
         .addFields(
             { name: `/${Commands.Enum.giessen}`, value: CommandsMeta.giessen.description },

src/actions/medication/medication.service.ts

@@ -115,6 +115,7 @@ export class MedicationService {
 			await interaction.reply({
 				content:
 					"es gab einen fehler beim verarbeiten deiner anfrage :( versuch es bitte spaeter nochmal, oki? c:",
+				ephemeral: true,
 			});
 			return;
 		}

src/actions/pomodoro/pomodoro.controller.ts

@@ -0,0 +1,42 @@
+import config from "config";
+import { Events, NewsChannel, type VoiceState } from "discord.js";
+import client from "lib/client";
+import EventEmitter from "node:events";
+import { PomodoroService } from "actions/pomodoro/pomodoro.service";
+
+export default class PomodoroController extends EventEmitter {
+    private pomodoroService: PomodoroService;
+    private activePomodoros = new Set<string>();
+    private pomodoroChannels = [config.discord.vchannelIdPomodoro25, config.discord.vchannelIdPomodoro50];
+
+    constructor() {
+        super();
+        this.pomodoroService = new PomodoroService();
+
+        client.on(Events.VoiceStateUpdate, async (oldState, newState) => {
+            const userId = newState.id;
+
+            const joinedPomodoroVC = newState.channelId != null && this.pomodoroChannels.includes(newState.channelId) &&
+                oldState.channelId !== newState.channelId;
+
+            const leftPomodoroVC = oldState.channelId != null && this.pomodoroChannels.includes(oldState.channelId) &&
+                newState.channelId !== oldState.channelId;
+
+            if (leftPomodoroVC && this.activePomodoros.has(userId)) {
+                console.log("pomodoro left");
+                this.pomodoroService.stopPomodoro(userId);
+                this.activePomodoros.delete(userId);
+            }
+
+            if (joinedPomodoroVC && !this.activePomodoros.has(userId)) {
+                console.log("pomodoro join");
+                const member = newState.member;
+                const vchannel = newState.channel;
+                if (!member || !vchannel) return;
+
+                this.activePomodoros.add(userId);
+                this.pomodoroService.startPomodoroLoop(member, vchannel);
+            }
+        });
+    }
+}

src/actions/pomodoro/pomodoro.service.ts

@@ -0,0 +1,67 @@
+import type { GuildMember, VoiceBasedChannel } from "discord.js";
+import client from "lib/client";
+import config from "config";
+import { CustomMessageService } from "actions/customMessage/customMessage.service";
+
+export class PomodoroService {
+    customMessageService: CustomMessageService;
+    private activeControllers = new Map<string, AbortController>();
+
+    constructor() {
+        this.customMessageService = new CustomMessageService();
+    }
+
+    public async startPomodoroLoop(member: GuildMember, vchannel: VoiceBasedChannel) {
+        const userId = member.id;
+        const controller = new AbortController();
+        this.activeControllers.set(userId, controller);
+
+        const minutesWork = vchannel.id === config.discord.vchannelIdPomodoro25 ? 25 : 50;
+        const minutesBreak = minutesWork / 5;//vchannel.id === config.discord.vchannelIdPomodoro25 ? 5 : 10;
+
+        const signal = controller.signal;
+
+        try {
+            while (!signal.aborted) {
+                await this.sendMessage(`<@${userId}> 🍅 **pomodoro gestartet!** ${minutesWork} minuten produktivitaet`);
+                const finishedWork = await this.sleep(minutesWork * 60 * 1000, signal);
+                if (!finishedWork) break;
+
+                await this.sendMessage(`<@${userId}> ☕ **pause!** ${minutesBreak} minuten chillen`);
+                const finishedBreak = await this.sleep(minutesBreak * 60 * 1000, signal);
+                if (!finishedBreak) break;
+            }
+        } catch (err) {
+            if ((err as Error).name !== "AbortError") {
+                console.error("pomodoro fehler:", err);
+            }
+        } finally {
+            this.activeControllers.delete(userId);
+        }
+    }
+
+    public stopPomodoro(userId: string) {
+        const controller = this.activeControllers.get(userId);
+        if (controller) {
+            controller.abort();
+            this.activeControllers.delete(userId);
+        }
+    }
+
+    private async sendMessage(text: string) {
+        const channel = client.channels.cache.get(config.discord.channelIdPomodoro);
+        if (channel?.isTextBased() && channel?.isSendable()) {
+            await channel.send(text);
+        }
+    }
+
+    private sleep(ms: number, signal: AbortSignal): Promise<boolean> {
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => resolve(true), ms);
+            signal.addEventListener("abort", () => {
+                clearTimeout(timeout);
+                resolve(false);
+            });
+        });
+    }
+}

src/commands/index.ts

@@ -1,7 +1,7 @@
 import { SlashCommandBuilder, userMention } from "discord.js";
 import { z } from "zod";
 
-export const Commands = z.enum(["giessen", "medikamente", "hilfe", "support", "kofi", "disboard", "discadia", "accept", "welcome", "embed", "message", "reminder"]);
+export const Commands = z.enum(["giessen", "medikamente", "hilfe", "support", "kofi", "disboard", "discadia", "accept", "welcome", "embed", "message", "reminder", "version"]);
 
 export const CommandsMeta: Record<z.output<typeof Commands>, { description: string }> = {
 	giessen: {
@@ -39,6 +39,9 @@ export const CommandsMeta: Record<z.output<typeof Commands>, { description: stri
 	},
 	reminder: {
 		description: "admin use only"
+	},
+	version: {
+		description: "admin use only"
 	}
 }
 
@@ -110,6 +113,9 @@ export default function getCommands() {
 				option.setName('input')
 					.setDescription('input for bot')
 					.setRequired(true)),
+		new SlashCommandBuilder()
+			.setName(Commands.Enum.version)
+			.setDescription(CommandsMeta.version.description),
 
 	].map((command) => command.toJSON());
 

src/config.ts

@@ -1,8 +1,6 @@
 export default {
 	discord: {
-		// test
+		version: 250602.10,
-		testChannel: process.env.DISCORD_TEST_CHANNEL_ID || "",
-
 		// avocadi
 		serverID: process.env.DISCORD_SERVER_ID || "",
 		// texxt channel
@@ -15,11 +13,14 @@ export default {
 		channelIdIntroduction: process.env.DISCORD_CHANNEL_ID_INTRODUCTION || "",
 		channelIdOffTopic: process.env.DISCORD_CHANNEL_ID_OFF_TOPIC || "",
 		channelIdHelp: process.env.DISCORD_CHANNEL_ID_HELP || "",
-		// voice channel#
+		channelIdPomodoro: process.env.DISCORD_CHANNEL_ID_POMODORO || "",
+		// voice channel
 		vchannelIdForTwo: process.env.DISCORD_VCHANNEL_ID_FOR_TWO || "",
 		vchannelIdForThree: process.env.DISCORD_VCHANNEL_ID_FOR_THREE || "",
 		vchannelIdForFour: process.env.DISCORD_VCHANNEL_ID_FOR_FOUR || "",
 		vchannelIdForGroup: process.env.DISCORD_VCHANNEL_ID_FOR_GROUP || "",
+		vchannelIdPomodoro25: process.env.DISCORD_VCHANNEL_ID_POMODORO_25_5 || "",
+		vchannelIdPomodoro50: process.env.DISCORD_VCHANNEL_ID_POMODORO_50_10 || "",
 		// roles
 		roleStudy: process.env.PEOPLE || "",
 		roleMod: process.env.MOD || "",

src/discord.controller.ts

@@ -13,7 +13,7 @@ import {
 } from "discord.js";
 import client from "lib/client";
 import EventEmitter from "node:events";
-import DiscordService from "services/discord.service";
+import DiscordService from "discord.service";
 import { WaterMeService } from "actions/waterMe/waterMe.service";
 import { MedicationService } from "actions/medication/medication.service";
 import { HelpService } from "actions/help/help.service";
@@ -22,24 +22,27 @@ import { GreetingService } from "actions/greeting/greeting.service";
 import { ActivityService } from "actions/activity/activity.service";
 import { DmService } from "actions/dm/dm.service";
 import { CustomMessageService } from "actions/customMessage/customMessage.service";
-import { DynamicChannelService } from "actions/dynamicChannel/dynamicChannel.service";
+import { DynamicVChannelService } from "actions/dynamicVChannel/dynamicVChannel.service";
+import { DebugService } from "actions/debug/debug.service";
 import { ReactRolesService } from "actions/reactRole/reactRoles.service";
 import config from "config";
 
 export default class DiscordController extends EventEmitter {
-	private discordService!: DiscordService;
+	private discordService: DiscordService;
-	waterMeService: WaterMeService;
+	private waterMeService: WaterMeService;
-	greetingService: GreetingService;
+	private greetingService: GreetingService;
-	medicationService: MedicationService;
+	private medicationService: MedicationService;
-	helpService: HelpService;
+	private helpService: HelpService;
-	supportService: SupportService;
+	private supportService: SupportService;
-	activityService: ActivityService;
+	private activityService: ActivityService;
-	dmService: DmService;
+	private dmService: DmService;
-	customMessageService: CustomMessageService;
+	private customMessageService: CustomMessageService;
-	channelListeners = new Map();
+	private dynamicVChannelService: DynamicVChannelService;
-	dynamicChannelService: DynamicChannelService;
+	private debugService: DebugService;
-	reactRolesService: ReactRolesService;
+
-	version = 250222.2319;
+	private channelListeners = new Map();
+	private reactRolesService: ReactRolesService;
+
 
 	constructor() {
 		super();
@@ -53,7 +56,8 @@ export default class DiscordController extends EventEmitter {
 		this.activityService = new ActivityService();
 		this.dmService = new DmService();
 		this.customMessageService = new CustomMessageService();
-		this.dynamicChannelService = new DynamicChannelService();
+		this.dynamicVChannelService = new DynamicVChannelService();
+		this.debugService = new DebugService();
 		this.reactRolesService = new ReactRolesService();
 
 		client.on("messageReactionAdd", async (reaction, user) => {
@@ -106,38 +110,19 @@ export default class DiscordController extends EventEmitter {
 							return;
 						}
 						try {
-							// create new channel with same settings
+							const newChannel = await this.dynamicVChannelService.createVChannel(
-							/*const newChannel = await channel.clone({
-							name: channel.name + "; " + newState.member?.displayName,
-							position: channel.position
-						});*/
-
-							const newChannel = await this.dynamicChannelService.createChannel(
-								oldState,
 								newState,
 								channel,
 							);
-
 							// move user in new channel
 							await newState.setChannel(newChannel);
-
 							// create specific listener for channel
 							const channelListener = async (
 								oldState: VoiceState,
 								newState: VoiceState,
 							) => {
-								/*if (oldState.channelId === newChannel.id || newState.channelId === newChannel.id) {
-								// check if channel empty
-								if (newChannel.members.size === 0) {
-									newChannel.delete()
-										.catch(console.error);
-									// delete listener for this channel
-									client.removeListener(Events.VoiceStateUpdate, channelListener);
-									channelListeners.delete(newChannel.id);
-								}
-							}*/
 								channelListeners =
-									await this.dynamicChannelService.deleteChannel(
+									await this.dynamicVChannelService.deleteVChannel(
 										oldState,
 										newState,
 										newChannel,
@@ -147,7 +132,6 @@ export default class DiscordController extends EventEmitter {
 							};
 							// save listener in map
 							channelListeners.set(newChannel.id, channelListener);
-
 							// add listener
 							client.on(Events.VoiceStateUpdate, channelListener);
 						} catch (error) {
@@ -157,7 +141,7 @@ export default class DiscordController extends EventEmitter {
 				}
 			},
 		);
-		console.log(`----------------\nversion ${this.version}\n----------------`);
+		console.log(`----------------\nversion ${config.discord.version}\n----------------`);
 	}
 
 	async setActivity() {
@@ -235,6 +219,9 @@ export default class DiscordController extends EventEmitter {
 			case Commands.Enum.reminder:
 				await this.greetingService.handleChatInputCommand(interaction);
 				return;
+			case Commands.Enum.version:
+				await this.debugService.handleChatInputCommand(interaction);
+				return;
 			default:
 				break;
 		}

src/index.ts

@@ -2,10 +2,13 @@ import "actions/waterMe/waterMe.task";
 import "actions/greeting/greeting.task";
 import "actions/medication/medication.task";
 import "actions/drink/drink.task";
-import DiscordController from "controllers/discord.controller";
+import DiscordController from "discord.controller";
+import PomodoroController from "actions/pomodoro/pomodoro.controller";
 
 import "dotenv/config";
 
 // bootstrap application
 const discordController = new DiscordController();
-discordController.init();
+const pomodoroController = new PomodoroController();
+
+discordController.init();

src/permissions/index.ts

@@ -0,0 +1,13 @@
+import config from "config";
+import { GuildMember, GuildMemberRoleManager, type APIInteractionGuildMember } from "discord.js";
+
+export async function checkPermission(member: GuildMember | APIInteractionGuildMember | null) {
+    let permission = false;
+    if (member?.roles instanceof GuildMemberRoleManager) {
+        if (member.roles.cache.has(config.discord.roleAdmin) || member.roles.cache.has(config.discord.roleMod)) {
+            permission = true;
+        }
+    }
+    console.log("user permission == " + permission);
+    return permission;
+}