Initialize services

cmd/geeksbot/main.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
+	"github.com/dustinpianalto/geeksbot"
 	"github.com/dustinpianalto/geeksbot/internal/database"
 	"github.com/dustinpianalto/geeksbot/internal/exts"
 )
@@ -27,11 +28,6 @@ func main() {
 	}
 
 	database.ConnectDatabase(os.Getenv("DATABASE_URL"))
-	//postgres.InitializeDatabase()
-	//utils.LoadTestData()
-
-	//us := &postgres.UserService{DB: postgres.DB}
-	//gs := &postgres.GuildService{DB: postgres.DB}
 
 	owners := []string{
 		"351794468870946827",
@@ -47,20 +43,22 @@ func main() {
 		CheckPermissions: false,
 	}
 
-	// Add Command Handlers
+	geeksbot := geeksbot.Geeksbot{
-	exts.AddCommandHandlers(&manager)
+		GuildService:   database.GuildService,
-	//services.InitalizeServices(us, gs)
+		UserService:    database.UserService,
+		ChannelService: database.ChannelService,
+		MessageService: database.MessageService,
+		PatreonService: database.PatreonService,
+		RequestService: database.RequestService,
+		ServerService:  database.ServerService,
+		CommandManager: manager,
+	}
 
-	//if _, ok := handler.Commands["help"]; !ok {
+	// Add Command Handlers
-	//	handler.AddDefaultHelpCommand()
+	exts.AddCommandHandlers(&geeksbot)
-	//}
 
-	dg.AddHandler(manager.OnMessage)
+	dg.AddHandler(geeksbot.OnMessage)
-	dg.AddHandler(manager.StatusManager.OnReady)
+	dg.AddHandler(geeksbot.StatusManager.OnReady)
-	//dg.AddHandler(guild_management.OnMessageUpdate)
-	//dg.AddHandler(guild_management.OnMessageDelete)
-	//dg.AddHandler(user_management.OnGuildMemberAddLogging)
-	//dg.AddHandler(user_management.OnGuildMemberRemoveLogging)
 
 	err = dg.Open()
 	if err != nil {
@@ -69,10 +67,7 @@ func main() {
 	}
 
 	// Start the Error handler in a goroutine
-	go ErrorHandler(manager.ErrorChannel)
+	go ErrorHandler(geeksbot.ErrorChannel)
-
-	// Start the Logging handler in a goroutine
-	//go logging.LoggingHandler(logging.LoggingChannel)
 
 	log.Println("The Bot is now running.")
 	sc := make(chan os.Signal, 1)

geeksbot.go

@@ -0,0 +1,14 @@
+package geeksbot
+
+import "github.com/dustinpianalto/disgoman"
+
+type Geeksbot struct {
+	GuildService   GuildService
+	UserService    UserService
+	ChannelService ChannelService
+	MessageService MessageService
+	RequestService RequestService
+	PatreonService PatreonService
+	ServerService  ServerService
+	disgoman.CommandManager
+}

internal/database/database.go

@@ -17,8 +17,8 @@ var (
 	UserService    userService
 	ChannelService channelService
 	MessageService messageService
-	PatreonService patreonService
 	RequestService requestService
+	PatreonService patreonService
 	ServerService  serverService
 )
 
@@ -52,4 +52,16 @@ func ConnectDatabase(dbConnString string) {
 		log.Fatal(err)
 	}
 	log.Println("Migrations Run")
+	initServices()
+	log.Println("Services Initialized")
+}
+
+func initServices() {
+	GuildService = guildService{db: db}
+	UserService = userService{db: db}
+	ChannelService = channelService{db: db}
+	MessageService = messageService{db: db}
+	PatreonService = patreonService{db: db}
+	RequestService = requestService{db: db}
+	ServerService = serverService{db: db}
 }

internal/exts/init.go

@@ -1,11 +1,11 @@
 package exts
 
 import (
-	"github.com/dustinpianalto/disgoman"
+	"github.com/dustinpianalto/geeksbot"
 	"github.com/dustinpianalto/geeksbot/internal/exts/utils"
 )
 
-func AddCommandHandlers(h *disgoman.CommandManager) {
+func AddCommandHandlers(g *geeksbot.Geeksbot) {
 	// Arguments:
 	// name - command name - string
 	// desc - command description - string
@@ -14,9 +14,9 @@ func AddCommandHandlers(h *disgoman.CommandManager) {
 	// perms - permissisions required - anpan.Permission (int)
 	// type - command type, sets where the command is available
 	// run - function to run - func(anpan.Context, []string) / CommandRunFunc
-	_ = h.AddCommand(utils.UserCommand)
+	_ = g.AddCommand(utils.UserCommand)
-	_ = h.AddCommand(utils.SayCommand)
+	_ = g.AddCommand(utils.SayCommand)
-	_ = h.AddCommand(utils.GitCommand)
+	_ = g.AddCommand(utils.GitCommand)
-	_ = h.AddCommand(utils.InviteCommand)
+	_ = g.AddCommand(utils.InviteCommand)
-	_ = h.AddCommand(utils.PingCommand)
+	_ = g.AddCommand(utils.PingCommand)
 }

patreon.go

@@ -18,7 +18,7 @@ type PatreonTier struct {
 
 type PatreonService interface {
 	PatreonCreatorByID(id int) (PatreonCreator, error)
-	PatreonCreatorByName(name string) (PatreonCreator, error)
+	PatreonCreatorByName(name string, guild Guild) (PatreonCreator, error)
 	CreatePatreonCreator(c PatreonCreator) (PatreonCreator, error)
 	UpdatePatreonCreator(c PatreonCreator) (PatreonCreator, error)
 	DeletePatreonCreator(c PatreonCreator) error

server.go

@@ -15,7 +15,7 @@ type Server struct {
 
 type ServerService interface {
 	ServerByID(id int) (Server, error)
-	ServerByName(name string) (Server, error)
+	ServerByName(name string, guild Guild) (Server, error)
 	CreateServer(s Server) (Server, error)
 	DeleteServer(s Server) error
 	UpdateServer(s Server) (Server, error)