added !unraid and restructure

main.go

@@ -3,45 +3,22 @@ package main
 import (
 	"context"
 	"fmt"
-	"log"
-	"os"
 	"strings"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/joho/godotenv"
 	openai "github.com/sashabaranov/go-openai"
+	"gitlab.com/DeveloperDurp/durpot/handlers"
 	"gitlab.com/DeveloperDurp/durpot/model"
 )
 
 var (
-	Token     string
-	BotPrefix string
-	ChannelID string
+	Token     = model.Token
+	BotPrefix = model.BotPrefix
+	ChannelID = model.ChannelID
 	BotId     string
-	apiKey    string
-	goBot     *discordgo.Session
-
-	config *model.ConfigStruct
+	ApiKey    = model.ApiKey
 )
 
-func ReadConfig() error {
-
-	err := godotenv.Load(".env")
-
-	if err != nil {
-		fmt.Println(err.Error())
-		//return err
-	}
-
-	Token = os.Getenv("TOKEN")
-	BotPrefix = os.Getenv("BOTPREFIX")
-	ChannelID = os.Getenv("ChannelID")
-	apiKey = os.Getenv("OPENAI_API_KEY")
-
-	return nil
-
-}
-
 func Start() {
 	goBot, err := discordgo.New("Bot " + Token)
 
@@ -60,8 +37,8 @@ func Start() {
 	BotId = u.ID
 
 	goBot.AddHandler(messageHandler)
-	goBot.AddHandler(handleGuildMemberAdd)
-	goBot.AddHandler(handleGuildMemberRemove)
+	goBot.AddHandler(handlers.GuildMemberAdd)
+	goBot.AddHandler(handlers.GuildMemberRemove)
 	goBot.AddHandler(handleTag)
 
 	err = goBot.Open()
@@ -85,146 +62,18 @@ func messageHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
 		if err != nil {
 			fmt.Println("Failed to send Message")
 		}
-		//case BotPrefix + "meme":
-		//	response = getJson(baseurl+"random-meme", "url")
-		//	s.ChannelMessageSend(m.ChannelID, response)
-		//case BotPrefix + "catfact":
-		//	response = getJson(baseurl+"cat-facts/fact", "fact")
-		//	s.ChannelMessageSend(m.ChannelID, response)
-		//case BotPrefix + "cat":
-		//	response = getJson(baseurl+"random-cats", "file")
-		//	s.ChannelMessageSend(m.ChannelID, response)
-		//case BotPrefix + "yomama":
-		//	sendAPIRequest(s, m, baseurl, "yomama")
-		//case BotPrefix + "dadjoke":
-		//	sendAPIRequest(s, m, baseurl, "dadjoke")
-		//case BotPrefix + "dog":
-		//	response = getJson(baseurl+"random-dogs", "message")
-		//	s.ChannelMessageSend(m.ChannelID, response)
-		//case BotPrefix + "jinglebells":
-		//	sendAPIRequest(s, m, baseurl, "jinglebells")
-		//case BotPrefix + "swanson":
-		//	sendAPIRequest(s, m, baseurl, "swanson")
+	case BotPrefix + "unraid":
+		handlers.GetUnraidUsage(s, m)
 
 	}
 
 }
 
 func main() {
-	err := ReadConfig()
-
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
 
 	Start()
 
 	<-make(chan struct{})
-	return
-}
-
-//func getSwansonQuote(s *discordgo.Session, m *discordgo.MessageCreate, url string) {
-//	resp, err := http.Get(url + "/ronswanson")
-//	if err != nil {
-//		errStr := err.Error()
-//		s.ChannelMessageSend(m.ChannelID, errStr)
-//		return
-//	}
-//	defer resp.Body.Close()
-//
-//	var data []string
-//	err = json.NewDecoder(resp.Body).Decode(&data)
-//	if err != nil {
-//		errStr := err.Error()
-//		s.ChannelMessageSend(m.ChannelID, errStr)
-//		return
-//	}
-//
-//	if len(data) == 0 {
-//		errStr := "No quotes found."
-//		s.ChannelMessageSend(m.ChannelID, errStr)
-//		return
-//	}
-//
-//	s.ChannelMessageSend(m.ChannelID, data[0])
-//}
-
-//func sendAPIRequest(s *discordgo.Session, m *discordgo.MessageCreate, url string, endpoint string) {
-//	var response interface{}
-//	switch endpoint {
-//	case "dadjoke":
-//		url = url + "/dadjoke"
-//		var data model.DadJokeResponse
-//		response = &data
-//	case "jinglebells":
-//		url = url + "/foaas/jinglebells/durp"
-//		var data model.JingleBellsResponse
-//		response = &data
-//	case "yomama":
-//		url = url + "/yomama"
-//		var data model.YomamaJokeResponse
-//		response = &data
-//	case "swanson":
-//		getSwansonQuote(s, m, url)
-//		return
-//	default:
-//		s.ChannelMessageSend(m.ChannelID, "Invalid endpoint.")
-//		return
-//	}
-//
-//	req, err := http.NewRequest("GET", url, nil)
-//	if err != nil {
-//		errStr := err.Error()
-//		s.ChannelMessageSend(m.ChannelID, errStr)
-//		return
-//	}
-//	req.Header.Set("Accept", "application/json")
-//
-//	client := http.Client{}
-//	resp, err := client.Do(req)
-//	if err != nil {
-//		errStr := err.Error()
-//		s.ChannelMessageSend(m.ChannelID, errStr)
-//		return
-//	}
-//	defer resp.Body.Close()
-//
-//	err = json.NewDecoder(resp.Body).Decode(response)
-//	if err != nil {
-//		errStr := err.Error()
-//		s.ChannelMessageSend(m.ChannelID, errStr)
-//		return
-//	}
-//
-//	switch endpoint {
-//	case "dadjoke":
-//		data := response.(*model.DadJokeResponse)
-//		s.ChannelMessageSend(m.ChannelID, data.Joke)
-//	case "jinglebells":
-//		data := response.(*model.JingleBellsResponse)
-//		s.ChannelMessageSend(m.ChannelID, data.Message)
-//	case "yomama":
-//		data := response.(*model.YomamaJokeResponse)
-//		s.ChannelMessageSend(m.ChannelID, data.Joke)
-//	}
-//}
-
-func handleGuildMemberAdd(s *discordgo.Session, m *discordgo.GuildMemberAdd) {
-	message := fmt.Sprintf("Welcome <@%s> to our server!", m.Member.User.ID)
-	_, err := s.ChannelMessageSend(ChannelID, message)
-	if err != nil {
-		log.Printf("Error sending welcome message: %v\n", err)
-	}
-}
-
-func handleGuildMemberRemove(s *discordgo.Session, m *discordgo.GuildMemberRemove) {
-
-	message := fmt.Sprintf("Goodbye %s", m.Member.User.Username)
-	_, err := s.ChannelMessageSend(ChannelID, message)
-	if err != nil {
-		log.Printf("Error sending goodbye message: %v\n", err)
-	}
 }
 
 func handleTag(s *discordgo.Session, m *discordgo.MessageCreate) {
@@ -233,7 +82,7 @@ func handleTag(s *discordgo.Session, m *discordgo.MessageCreate) {
 		return
 	}
 
-	client := openai.NewClient(apiKey)
+	client := openai.NewClient(ApiKey)
 
 	// Check if bot is mentioned in message
 	for _, mention := range m.Mentions {