From 7646684136926265b568ff105d0c2b879600bd5d Mon Sep 17 00:00:00 2001
From: Jannover5000r <jannikrausch@gmail.com>
Date: Thu, 30 Oct 2025 20:00:58 +0100
Subject: [PATCH] changed message and added toggle for default message

---
 Botrun/BotStart.go | 23 +++++++++++++++++------
 main.go            | 11 ++++++++---
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Botrun/BotStart.go b/Botrun/BotStart.go
index 6fa619c..eec44f8 100644
--- a/Botrun/BotStart.go
+++ b/Botrun/BotStart.go
@@ -16,9 +16,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/joho/godotenv"
 	"untislogger/Untis"
 
+	"github.com/joho/godotenv"
+
 	"github.com/bwmarrin/discordgo"
 )
 
@@ -43,6 +44,8 @@ var (
 
 var encryptionKey []byte
 
+var WebHook = true
+
 func init() {
 	godotenv.Load(".env")
 	keyStr := os.Getenv("ENC_KEY")
@@ -135,7 +138,7 @@ func saveAccount(userID, username, password string) error {
 	if err != nil {
 		return err
 	}
-	if err := os.WriteFile(accountsFile, newData, 0644); err != nil {
+	if err := os.WriteFile(accountsFile, newData, 0o644); err != nil {
 		return err
 	}
 
@@ -143,10 +146,10 @@ func saveAccount(userID, username, password string) error {
 	timetableFile := getTimetableFile(userID)
 	timetableFilledFile := getTimetableFilledFile(userID)
 	if _, err := os.Stat(timetableFile); os.IsNotExist(err) {
-		os.WriteFile(timetableFile, []byte("[]"), 0644)
+		os.WriteFile(timetableFile, []byte("[]"), 0o644)
 	}
 	if _, err := os.Stat(timetableFilledFile); os.IsNotExist(err) {
-		os.WriteFile(timetableFilledFile, []byte("[]"), 0644)
+		os.WriteFile(timetableFilledFile, []byte("[]"), 0o644)
 	}
 
 	return nil
@@ -355,7 +358,7 @@ func deleteAccount(userID string) error {
 	if err != nil {
 		return err
 	}
-	if err := os.WriteFile(accountsFile, newData, 0644); err != nil {
+	if err := os.WriteFile(accountsFile, newData, 0o644); err != nil {
 		return err
 	}
 
@@ -371,7 +374,15 @@ func messageCreate(s *discordgo.Session, m *discordgo.MessageCreate) {
 	if m.Author.ID == s.State.User.ID {
 		return
 	}
-
+	if m.GuildID != "" && m.Content == "!WebHook" {
+		_ = s.ChannelMessageDelete(m.ChannelID, m.ID)
+		WebHook = !WebHook
+		if WebHook {
+			s.ChannelMessageSend(m.ChannelID, "Sending Webhook set to True")
+		} else {
+			s.ChannelMessageSend(m.ChannelID, "Sending Webhook set to False")
+		}
+	}
 	// Handle "!addaccount" only in guilds (not in DMs)
 	if m.GuildID != "" && m.Content == "!addaccount" {
 		// Delete the command for privacy
diff --git a/main.go b/main.go
index 2f81670..da759a3 100644
--- a/main.go
+++ b/main.go
@@ -33,6 +33,8 @@ type NamedTimetableEntry struct {
 	ActivityType string   `json:"activityType"`
 }
 
+var WebHook = true
+
 // init and main//
 func init() {
 	godotenv.Load(".env")
@@ -202,15 +204,18 @@ func Run(userID string) {
 	status, _ := NextCodeForTime(codeByStartTime, now)
 
 	var message string
-	if status != "" {
+	if status == "cancelled" {
+		message = fmt.Sprintf("Next lesson: **%s** at **%s**. is **%s**", subject, nextTime, status)
+	} else if status != "" && status != "cancelled" {
 		message = fmt.Sprintf("Next lesson: **%s** in room **%s** at **%s**. Status: **%s**", subject, room, nextTime, status)
 	} else {
 		message = fmt.Sprintf("Next lesson: **%s** in room **%s** at **%s**.", subject, room, nextTime)
 	}
 
 	if userID == "default" {
-		// The default user still sends to the webhook
-		sendDiscordWebhook(subject, room, nextTime, status)
+		if WebHook {
+			sendDiscordWebhook(subject, room, nextTime, status)
+		}
 	} else {
 		BotStart.SendDM(userID, message)
 	}