.github/workflows/main.yml

@@ -20,45 +20,39 @@ jobs:
       - name: Get Version
         id: get_version
         uses: battila7/get-version-action@v2.0.0
-      
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
 
-      - name: Docker Login
-        # You may pin to the exact commit or the version.
-        # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        uses: docker/login-action@v1.10.0
-        with:
-          registry: ${{ secrets.DR_URL }}
-          # Username used to log against the Docker registry
-          username: ${{ secrets.DH_USERNAME }}
-          # Password or personal access token used to log against the Docker registry
-          password: ${{ secrets.DH_PASSWORD }}
-          # Log out from the Docker registry at the end of a job
-          logout: true
+      - name: Install go-bindata and build migrations
+        env:
+          GOPATH: /home/runner/work/Geeksbot/
+        run: |
+            go get -u github.com/go-bindata/go-bindata/...
+            /home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -prefix $GITHUB_WORKSPACE/internal/database/migrations/ -o $GITHUB_WORKSPACE/internal/database/migrations/bindata.go $GITHUB_WORKSPACE/internal/database/migrations/
+            head $GITHUB_WORKSPACE/internal/database/migrations/bindata.go
 
-      - name: Docker Build & Push
+      - name: Build container image
         env:
           IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
-        run: |
-          docker buildx build --push \
-          --tag ${{ secrets.DR_URL }}/geeksbot:$IMAGE_TAG \
-          --platform linux/amd64,linux/arm/v7,linux/arm64 . 
+        run: docker build -t registry.digitalocean.com/djpianalto/geeksbot:$IMAGE_TAG .
+
+      - name: Install doctl
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+
+      - name: Login to DigitalOcean Container Registry with short-lived credentials
+        run: doctl registry login --expiry-seconds 600
+
+      - name: Push image to DigitalOcean Container Registry
+        run: docker push registry.digitalocean.com/djpianalto/geeksbot
 
       - name: Update deployment file
-        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|${{ secrets.DR_URL }}/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
 
-      - uses: azure/k8s-set-context@v1
-        with:
-          method: kubeconfig
-          kubeconfig: ${{ secrets.KUBE_CONFIG }}
-        id: setcontext
+      - name: Save DigitalOcean kubeconfig with short-lived credentials
+        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 discord-bots
 
-      - name: Deploy to Kubernetes
+      - name: Deploy to DigitalOcean Kubernetes
         run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml
 
       - name: Verify deployment
-        run: kubectl rollout status -n discord-bots deployment/geeksbot
+        run: kubectl rollout status deployment/geeksbot

cmd/geeksbot/main.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
+	"github.com/dustinpianalto/geeksbot/internal/database"
 	"github.com/dustinpianalto/geeksbot/internal/exts"
-	"github.com/dustinpianalto/geeksbot/pkg/database"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
+	"github.com/dustinpianalto/geeksbot/internal/services"
 )
 
 func main() {
@@ -28,7 +28,6 @@ func main() {
 	}
 
 	database.ConnectDatabase(os.Getenv("DATABASE_URL"))
-	//database.RunMigrations()
 	services.InitializeServices()
 
 	owners := []string{

deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: geeksbot
-  namespace: discord-bots
+  namespace: default
   labels:
     app: geeksbot
 spec:
@@ -21,42 +21,8 @@ spec:
         app: geeksbot
     spec:
       containers:
-        - name: pgbouncer
-          image: timoha/pgbouncer:1.15.0
-          resources:
-            requests:
-              memory: "256Mi"
-              cpu: "0.5"
-            limits:
-              memory: "512Mi"
-              cpu: "1"
-          env:
-            - name: DATABASE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: geeksbot
-                  key: pgbouncer_url
-            - name: SERVER_TLS_SSLMODE
-              valueFrom:
-                secretKeyRef:
-                  name: geeksbot
-                  key: pgbouncer_ssl
-            - name: AUTH_TYPE
-              valueFrom:
-                secretKeyRef:
-                  name: geeksbot
-                  key: pgbouncer_auth
-          ports:
-            - containerPort: 5432
         - name: geeksbot
           image: <IMAGE>
-          resources:
-            requests:
-              memory: "512Mi"
-              cpu: "1"
-            limits:
-              memory: "1Gi"
-              cpu: "2"
           env:
             - name: DATABASE_URL
               valueFrom:
@@ -68,5 +34,3 @@ spec:
                 secretKeyRef:
                   name: geeksbot
                   key: discord_token
-      imagePullSecrets:
-        - name: registry-1

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
 	github.com/golang-migrate/migrate v3.5.4+incompatible // indirect
 	github.com/golang-migrate/migrate/v4 v4.14.1
-	github.com/gorcon/rcon v1.3.1
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/lib/pq v1.8.0
 )

go.sum

@@ -152,8 +152,6 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gorcon/rcon v1.3.1 h1:z6a5iOlojfdkvA1qaKEng7QfCJuCzYlC9BUDs6/M+74=
-github.com/gorcon/rcon v1.3.1/go.mod h1:2gztBPSV2WxkPkqV4jiJkdHs+NT46mNSGb8JxbPesx4=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=

internal/database/database.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/dustinpianalto/geeksbot/pkg/database/migrations"
+	"github.com/dustinpianalto/geeksbot/internal/database/migrations"
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database/postgres"
 	bindata "github.com/golang-migrate/migrate/v4/source/go_bindata"
@@ -23,6 +23,10 @@ var (
 )
 
 func ConnectDatabase(dbConnString string) {
+	s := bindata.Resource(migrations.AssetNames(),
+		func(name string) ([]byte, error) {
+			return migrations.Asset(name)
+		})
 	var err error
 	db, err = sql.Open("postgres", dbConnString)
 	if err != nil {
@@ -32,15 +36,6 @@ func ConnectDatabase(dbConnString string) {
 	db.SetMaxOpenConns(75)
 	db.SetMaxIdleConns(5)
 	db.SetConnMaxLifetime(300)
-	initServices()
-	log.Println("Services Initialized")
-}
-
-func RunMigrations() {
-	s := bindata.Resource(migrations.AssetNames(),
-		func(name string) ([]byte, error) {
-			return migrations.Asset(name)
-		})
 	d, err := bindata.WithInstance(s)
 	if err != nil {
 		log.Fatal(fmt.Errorf("cannot load migrations: %w", err))
@@ -62,7 +57,8 @@ func RunMigrations() {
 		}
 	}
 	log.Println("Migrations Run")
-
+	initServices()
+	log.Println("Services Initialized")
 }
 
 func initServices() {

internal/database/message.go

@@ -5,7 +5,6 @@ import (
 	"log"
 
 	"github.com/dustinpianalto/geeksbot"
-	"github.com/lib/pq"
 )
 
 type messageService struct {
@@ -22,7 +21,7 @@ func (s messageService) Message(id string) (geeksbot.Message, error) {
 						WHERE m.id = $1`
 	row := s.db.QueryRow(queryString, id)
 	err := row.Scan(&m.ID, &m.CreatedAt, &m.ModifiedAt, &m.Content,
-		pq.Array(&m.PreviousContent), &channel_id, &author_id)
+		&m.PreviousContent, &channel_id, &author_id)
 	if err != nil {
 		return geeksbot.Message{}, err
 	}

internal/database/request.go

@@ -19,7 +19,7 @@ func (s requestService) Request(id int64) (geeksbot.Request, error) {
 	var uID sql.NullString
 	var mID string
 	queryString := `SELECT id, author_id, channel_id, guild_id, content, requested_at, completed,
-						completed_at, completed_by, message_id, completed_message FROM requests
+						completed_at, completed_by, message_id, completed_message
 						WHERE id = $1`
 	row := s.db.QueryRow(queryString, id)
 	err := row.Scan(&r.ID, &aID, &cID, &gID, &r.Content, &r.RequestedAt, &r.Completed,
@@ -154,7 +154,7 @@ func (s requestService) UpdateRequest(r geeksbot.Request) (geeksbot.Request, err
 	queryString := `UPDATE requests SET 
 						completed = $2, completed_at = $3, completed_by = $4, completed_message = $5
 						WHERE id = $1`
-	_, err := s.db.Exec(queryString, r.ID, r.Completed, r.CompletedAt, r.CompletedBy.ID, r.CompletedMessage)
+	_, err := s.db.Exec(queryString, r.ID, r.Completed, r.CompletedAt, r.CompletedBy, r.CompletedMessage)
 	return r, err
 }
 
@@ -168,7 +168,7 @@ func (s requestService) Comment(id int64) (geeksbot.Comment, error) {
 	var c geeksbot.Comment
 	var aID string
 	var rID int64
-	queryString := "SELECT id, author_id, request_id, comment_at, content FROM comments WHERE id = $1"
+	queryString := "SELECT id, author_id, request_id, comment_at, content WHERE id = $1"
 	row := s.db.QueryRow(queryString, id)
 	err := row.Scan(&c.ID, &aID, &rID, &c.CommentAt, &c.Content)
 	if err != nil {

internal/database/server.go

@@ -19,12 +19,11 @@ func (s serverService) ServerByID(id int) (geeksbot.Server, error) {
 	var iMsgID sql.NullString
 	var sMsgID sql.NullString
 	queryString := `SELECT id, name, ip_address, port, password, alerts_channel_id, 
-						guild_id, info_channel_id, info_message_id, settings_message_id,
-						ftp_port, ftp_username, ftp_password
+						guild_id, info_channel_id, info_message_id, settings_message_id
 						FROM servers WHERE id = $1`
 	row := s.db.QueryRow(queryString, id)
 	err := row.Scan(&server.ID, &server.Name, &server.IPAddr, &server.Port, &server.Password,
-		&aChanID, &guildID, &iChanID, &iMsgID, &sMsgID, &server.FTPPort, &server.FTPUser, &server.FTPPass)
+		&aChanID, &guildID, &iChanID, &iMsgID, &sMsgID)
 	if err != nil {
 		return geeksbot.Server{}, err
 	}
@@ -74,7 +73,7 @@ func (s serverService) ServerByID(id int) (geeksbot.Server, error) {
 
 func (s serverService) ServerByName(name string, guild geeksbot.Guild) (geeksbot.Server, error) {
 	var id int
-	queryString := "SELECT id FROM servers WHERE LOWER(name) = LOWER($1) AND guild_id = $2"
+	queryString := "SELECT id FROM servers WHERE name = $1 AND guild_id = $2"
 	row := s.db.QueryRow(queryString, name, guild.ID)
 	err := row.Scan(&id)
 	if err != nil {
@@ -116,8 +115,7 @@ func (s serverService) DeleteServer(server geeksbot.Server) error {
 func (s serverService) UpdateServer(server geeksbot.Server) (geeksbot.Server, error) {
 	queryString := `UPDATE servers SET name = $2, ip_address = $3, port = $4, password = $5,
 						alerts_channel_id = $6, info_channel_id = $7, info_message_id = $8,
-						settings_message_id = $9, ftp_port = $10, ftp_username = $11,
-						ftp_password = $12 WHERE id = $1`
+						settings_message_id = $9 WHERE id = $1`
 	_, err := s.db.Exec(queryString,
 		server.Name,
 		server.IPAddr,
@@ -127,9 +125,6 @@ func (s serverService) UpdateServer(server geeksbot.Server) (geeksbot.Server, er
 		server.InfoChannel.ID,
 		server.InfoMessage.ID,
 		server.SettingsMessage.ID,
-		server.FTPPort,
-		server.FTPUser,
-		server.FTPPass,
 	)
 	return server, err
 }

internal/database/user.go

@@ -49,14 +49,3 @@ func (s userService) GetOrCreateUser(id string) (geeksbot.User, error) {
 	}
 	return user, err
 }
-
-func (s userService) GetBySteamID(steamID string) (geeksbot.User, error) {
-	var id string
-	queryString := "SELECT id FROM users WHERE steam_id = $1"
-	err := s.db.QueryRow(queryString, steamID).Scan(&id)
-	if err != nil {
-		return geeksbot.User{}, err
-	}
-	user, err := s.User(id)
-	return user, err
-}

internal/discord_utils/channel_utils.go

@@ -1,11 +0,0 @@
-package discord_utils
-
-import "github.com/dustinpianalto/disgoman"
-
-func GetChannelName(ctx disgoman.Context, id string) string {
-	channel, err := ctx.Session.Channel(id)
-	if err != nil {
-		return ""
-	}
-	return channel.Name
-}

internal/discord_utils/checks.go

@@ -1,49 +0,0 @@
-package discord_utils
-
-import (
-	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
-)
-
-func IsGuildMod(ctx disgoman.Context, user geeksbot.User) bool {
-	discordCloser, err := ctx.Session.GuildMember(ctx.Guild.ID, user.ID)
-	if err != nil {
-		return false
-	}
-	guildRoles, err := services.GuildService.GuildRoles(geeksbot.Guild{ID: ctx.Guild.ID})
-	if err != nil {
-		return false
-	}
-	for _, role := range guildRoles {
-		if role.RoleType == "moderator" {
-			for _, rID := range discordCloser.Roles {
-				if rID == role.ID {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
-
-func IsGuildAdmin(ctx disgoman.Context, user geeksbot.User) bool {
-	discordCloser, err := ctx.Session.GuildMember(ctx.Guild.ID, user.ID)
-	if err != nil {
-		return false
-	}
-	guildRoles, err := services.GuildService.GuildRoles(geeksbot.Guild{ID: ctx.Guild.ID})
-	if err != nil {
-		return false
-	}
-	for _, role := range guildRoles {
-		if role.RoleType == "admin" {
-			for _, rID := range discordCloser.Roles {
-				if rID == role.ID {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}

internal/discord_utils/user_utils.go

@@ -1,14 +0,0 @@
-package discord_utils
-
-import "github.com/dustinpianalto/disgoman"
-
-func GetDisplayName(ctx disgoman.Context, id string) string {
-	member, err := ctx.Session.GuildMember(ctx.Guild.ID, id)
-	if err != nil {
-		return ""
-	}
-	if member.Nick != "" {
-		return member.Nick
-	}
-	return member.User.Username
-}

internal/exts/arcon/arcon.go

@@ -1,184 +0,0 @@
-package arcon
-
-import (
-	"fmt"
-	"log"
-	"strings"
-
-	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
-	"github.com/gorcon/rcon"
-)
-
-var ListplayersCommand = &disgoman.Command{
-	Name:                "listplayers",
-	Aliases:             nil,
-	Description:         "List the players currently connected to a ARK server.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              listplayersCommandFunc,
-}
-
-func listplayersCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was a problem getting your user.", err)
-		return
-	}
-	if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) {
-		return
-	}
-	if len(args) == 0 {
-		servers, err := services.ServerService.GuildServers(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Could not find any servers for this guild", err)
-			return
-		}
-		for _, server := range servers {
-			go listplayers(ctx, server)
-		}
-		return
-	}
-	serverName := strings.Join(args, " ")
-	server, err := services.ServerService.ServerByName(serverName, guild)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx,
-			fmt.Sprintf("Could not find **%s** in this guild.", serverName),
-			err,
-		)
-		return
-	}
-	listplayers(ctx, server)
-}
-
-func listplayers(ctx disgoman.Context, server geeksbot.Server) {
-	msg, err := ctx.Send(fmt.Sprintf("**Getting data for %s**", server.Name))
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was an error getting the player list", err)
-		return
-	}
-	conn, err := rcon.Dial(fmt.Sprintf("%s:%d", server.IPAddr, server.Port), server.Password)
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**Could not open connection to %s**", server.Name),
-		)
-		return
-	}
-	defer conn.Close()
-	response, err := conn.Execute("listplayers")
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**There was a problem getting a response from %s**", server.Name),
-		)
-		return
-	}
-	if strings.HasPrefix(response, "No Players") {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**%s: %s**", server.Name, response),
-		)
-		return
-	}
-	players := strings.Split(response, "\n")
-	for i, player := range players {
-		parts := strings.Split(player, ", ")
-		steamID := parts[len(parts)-1]
-		user, err := services.UserService.GetBySteamID(steamID)
-		if err == nil {
-			duser, err := ctx.Session.GuildMember(ctx.Guild.ID, user.ID)
-			if err == nil {
-				players[i] = fmt.Sprintf("%s (%s)", player, duser.Mention())
-			}
-		}
-	}
-	_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-		fmt.Sprintf("**%s:**%s", server.Name, strings.Join(players, "\n")),
-	)
-}
-
-var BroadcastCommand = &disgoman.Command{
-	Name:                "broadcast",
-	Aliases:             nil,
-	Description:         "Broadcast a message to ARK servers.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              broadcastCommandFunc,
-}
-
-func broadcastCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was a problem getting your user.", err)
-		return
-	}
-	if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) {
-		return
-	}
-	message := strings.Join(args[1:len(args)], " ")
-	if strings.ToLower(args[0]) == "all" {
-		servers, err := services.ServerService.GuildServers(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Could not find any servers for this guild", err)
-			return
-		}
-		for _, server := range servers {
-			go broadcast(ctx, server, message)
-		}
-		return
-	} else {
-		serverName := strings.Title(strings.ReplaceAll(args[0], "_", " "))
-		server, err := services.ServerService.ServerByName(serverName, guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("Could not find %s", serverName), err)
-			return
-		}
-		broadcast(ctx, server, message)
-	}
-}
-
-func broadcast(ctx disgoman.Context, server geeksbot.Server, message string) {
-	msg, err := ctx.Send(fmt.Sprintf("**Broadcasting to: %s**", server.Name))
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was an error getting the player list", err)
-		return
-	}
-	conn, err := rcon.Dial(fmt.Sprintf("%s:%d", server.IPAddr, server.Port), server.Password)
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**Could not open connection to %s**", server.Name),
-		)
-		return
-	}
-	defer conn.Close()
-	userName := discord_utils.GetDisplayName(ctx, ctx.Message.Author.ID)
-	response, err := conn.Execute(fmt.Sprintf("broadcast %s: %s", userName, message))
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**There was a problem getting a response from %s**", server.Name),
-		)
-		return
-	}
-	log.Printf("%T - %#v", response, response)
-	if strings.Contains(response, "Server received, But no response!!") {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**%s Broadcast Successful**", server.Name),
-		)
-		return
-	}
-	_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-		fmt.Sprintf("**Broadcasting to %s Failed!**", server.Name),
-	)
-}

internal/exts/guild/guild.go

@@ -6,8 +6,8 @@ import (
 	"github.com/dustinpianalto/disgoman"
 	"github.com/dustinpianalto/geeksbot"
 	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
+	"github.com/dustinpianalto/geeksbot/internal/services"
 	"github.com/dustinpianalto/geeksbot/internal/utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
 )
 
 var AddPrefixCommand = &disgoman.Command{

internal/exts/guild/roles.go

@@ -9,8 +9,8 @@ import (
 	"github.com/dustinpianalto/disgoman"
 	"github.com/dustinpianalto/geeksbot"
 	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
+	"github.com/dustinpianalto/geeksbot/internal/services"
 	"github.com/dustinpianalto/geeksbot/internal/utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
 )
 
 var AddModeratorRoleCommand = &disgoman.Command{

internal/exts/init.go

@@ -2,7 +2,6 @@ package exts
 
 import (
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot/internal/exts/arcon"
 	"github.com/dustinpianalto/geeksbot/internal/exts/guild"
 	"github.com/dustinpianalto/geeksbot/internal/exts/requests"
 	"github.com/dustinpianalto/geeksbot/internal/exts/utils"
@@ -33,10 +32,4 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
 	_ = g.AddCommand(guild.SelfAssignRoleCommand)
 	_ = g.AddCommand(guild.UnAssignRoleCommand)
 	_ = g.AddCommand(requests.RequestCommand)
-	_ = g.AddCommand(requests.CloseCommand)
-	_ = g.AddCommand(requests.ListCommand)
-	_ = g.AddCommand(requests.ViewCommand)
-	_ = g.AddCommand(requests.CommentCommand)
-	_ = g.AddCommand(arcon.ListplayersCommand)
-	_ = g.AddCommand(arcon.BroadcastCommand)
 }

internal/exts/requests/requests.go

@@ -2,7 +2,6 @@ package requests
 
 import (
 	"fmt"
-	"log"
 	"strconv"
 	"strings"
 	"time"
@@ -10,8 +9,7 @@ import (
 	"github.com/dustinpianalto/disgoman"
 	"github.com/dustinpianalto/geeksbot"
 	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/internal/utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
+	"github.com/dustinpianalto/geeksbot/internal/services"
 )
 
 var RequestCommand = &disgoman.Command{
@@ -79,7 +77,7 @@ func requestCommandFunc(ctx disgoman.Context, args []string) {
 			if c.Admin {
 				_, _ = ctx.Session.ChannelMessageSend(c.ID,
 					fmt.Sprintf("%s\n"+
-						"New Request ID %d\n"+
+						"New Request ID %d "+
 						"%s has requested assistance: \n"+
 						"```\n%s\n```\n"+
 						"Requested At: %s\n"+
@@ -103,347 +101,3 @@ func requestCommandFunc(ctx disgoman.Context, args []string) {
 		discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was created.", err)
 	}
 }
-
-var CloseCommand = &disgoman.Command{
-	Name:                "close",
-	Aliases:             nil,
-	Description:         "Close a request and mark it as completed.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              closeCommandFunc,
-}
-
-func closeCommandFunc(ctx disgoman.Context, args []string) {
-	var ids []int64
-	var reason string
-	_, err := strconv.ParseInt(args[len(args)-1], 10, 64)
-	if err != nil {
-		reason = args[len(args)-1]
-		args = args[0 : len(args)-1]
-	}
-	for _, a := range args {
-		a = strings.Trim(a, ",")
-		id, err := strconv.ParseInt(a, 10, 64)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s is not a valid request id", a), err)
-			continue
-		}
-		ids = append(ids, id)
-	}
-	if len(ids) == 0 {
-		discord_utils.SendErrorMessage(ctx, "No requests to close", nil)
-		return
-	}
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	closer, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error closing the request. Could not get user.", err)
-		return
-	}
-	int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64)
-	s := discord_utils.ParseSnowflake(int64ID)
-	for _, id := range ids {
-		request, err := services.RequestService.Request(id)
-		if err != nil || request.Guild.ID != guild.ID {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a request in this guild.", id), err)
-			continue
-		}
-		if request.Author != closer && !closer.IsStaff && !closer.IsAdmin {
-			if !discord_utils.IsGuildMod(ctx, closer) && !discord_utils.IsGuildAdmin(ctx, closer) {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("You are not authorized to close %d", id), nil)
-				continue
-			}
-		}
-		if request.Completed {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is already closed", id), err)
-			continue
-		}
-		request.Completed = true
-		request.CompletedAt.Valid = true
-		request.CompletedAt.Time = s.CreationTime
-		request.CompletedBy = &closer
-		if reason != "" {
-			request.CompletedMessage.Valid = true
-			request.CompletedMessage.String = reason
-		}
-		request, err = services.RequestService.UpdateRequest(request)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("Error closing %d", id), err)
-			continue
-		}
-		_, err = ctx.Send(fmt.Sprintf("%d has been closed", request.ID))
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was closed.", err)
-		}
-		dmChannel, err := ctx.Session.UserChannelCreate(request.Author.ID)
-		if err != nil {
-			return
-		}
-		_, _ = ctx.Session.ChannelMessageSend(dmChannel.ID,
-			fmt.Sprintf("%s has closed request %d which you opened in the %s channel.\n```%s```\n",
-				discord_utils.GetDisplayName(ctx, request.CompletedBy.ID),
-				request.ID,
-				discord_utils.GetChannelName(ctx, request.Channel.ID),
-				request.Content,
-			))
-	}
-}
-
-var ListCommand = &disgoman.Command{
-	Name:                "list",
-	Aliases:             []string{"request_list", "requests_list"},
-	Description:         "List your open requests or all open requests if the caller is a moderator",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              listCommandFunc,
-}
-
-func listCommandFunc(ctx disgoman.Context, args []string) {
-	user, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error closing the request. Could not get user.", err)
-		return
-	}
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-
-	var requests []geeksbot.Request
-	if discord_utils.IsGuildMod(ctx, user) || discord_utils.IsGuildAdmin(ctx, user) {
-		requests, err = services.RequestService.GuildRequests(guild, false)
-	} else {
-		requests, err = services.RequestService.UserRequests(user, false)
-	}
-
-	for _, request := range requests {
-		var authorName string
-		author, err := ctx.Session.GuildMember(guild.ID, request.Author.ID)
-		if err != nil {
-			authorName = "Unknown"
-		} else {
-			if author.Nick == "" {
-				authorName = author.User.Username
-			} else {
-				authorName = author.Nick
-			}
-		}
-
-		var channelName string
-		channel, err := ctx.Session.Channel(request.Channel.ID)
-		if err != nil {
-			channelName = "Unknown"
-		} else {
-			channelName = channel.Name
-		}
-		commentCount, err := services.RequestService.RequestCommentCount(request)
-		if err != nil {
-			commentCount = 0
-		}
-		_, _ = ctx.Send(fmt.Sprintf("```md\n"+
-			"< Request ID             Requested By >\n"+
-			"< %-11d %23s >\n"+
-			"%s\n\n"+
-			"Comments: %d\n"+
-			"Requested At: %s\n"+
-			"In: %s\n"+
-			"```",
-			request.ID,
-			authorName,
-			request.Content,
-			commentCount,
-			request.RequestedAt.Format("2006-01-02 15:04:05 MST"),
-			channelName,
-		))
-	}
-
-	_, _ = ctx.Send(fmt.Sprintf("```There %s currently %d open %s```", utils.PluralizeString("is", len(requests)), len(requests), utils.PluralizeString("request", len(requests))))
-}
-
-var CommentCommand = &disgoman.Command{
-	Name:                "comment",
-	Aliases:             []string{"update", "add_comment"},
-	Description:         "Add a comment to an existing request.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              commentCommandFunc,
-}
-
-func commentCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	id, err := strconv.ParseInt(args[0], 10, 64)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Please include the ID of the request to update.", err)
-		return
-	}
-	message := strings.Join(args[1:len(args)], " ")
-	author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was an issue finding your user account", err)
-		return
-	}
-	request, err := services.RequestService.Request(id)
-	if err != nil || request.Guild.ID != guild.ID {
-		discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a valid request for this guild", id), err)
-		return
-	}
-	int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64)
-	s := discord_utils.ParseSnowflake(int64ID)
-	comment := geeksbot.Comment{
-		Author:    author,
-		Request:   request,
-		CommentAt: s.CreationTime,
-		Content:   message,
-	}
-	comment, err = services.RequestService.CreateComment(comment)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was a problem adding your comment", err)
-		return
-	}
-	channels, err := services.ChannelService.GuildChannels(guild)
-	if err == nil {
-		comments, _ := services.RequestService.RequestComments(request)
-		var commentString string
-		var commentStrings []string
-		commentString = fmt.Sprintf("Comment added:\n```md\n"+
-			"< Request ID             Requested By >\n"+
-			"< %-11d %23s >\n"+
-			"%s\n\n"+
-			"Comments: Not Implemented Yet\n"+
-			"Requested At: %s\n"+
-			"In: %s\n"+
-			"```",
-			request.ID,
-			discord_utils.GetDisplayName(ctx, request.Author.ID),
-			request.Content,
-			request.RequestedAt.Format("2006-01-02 15:04:05"),
-			discord_utils.GetChannelName(ctx, request.Channel.ID),
-		)
-		for _, c := range comments {
-			if err != nil {
-				log.Println(err)
-				continue
-			}
-			cs := fmt.Sprintf("```md\n%s\n- %s At %s\n```\n",
-				c.Content,
-				discord_utils.GetDisplayName(ctx, c.Author.ID),
-				c.CommentAt.Format("2006-01-02 15:04:05"),
-			)
-			if len(commentString+cs) >= 2000 {
-				commentStrings = append(commentStrings, commentString)
-				commentString = ""
-			}
-			commentString += cs
-		}
-		commentStrings = append(commentStrings, commentString)
-		for _, c := range channels {
-			if c.Admin {
-				for _, s := range commentStrings {
-					_, _ = ctx.Session.ChannelMessageSend(c.ID, s)
-				}
-			}
-		}
-	} else {
-		log.Println(err)
-	}
-	_, err = ctx.Send(fmt.Sprintf("%s your comment has been added.", ctx.Message.Author.Mention()))
-	dmChannel, err := ctx.Session.UserChannelCreate(request.Author.ID)
-	if err != nil {
-		return
-	}
-	_, _ = ctx.Session.ChannelMessageSend(dmChannel.ID,
-		fmt.Sprintf("%s has add a comment to request %d which you opened in the %s channel.\n```%s```\n```%s```",
-			discord_utils.GetDisplayName(ctx, author.ID),
-			request.ID,
-			discord_utils.GetChannelName(ctx, ctx.Channel.ID),
-			request.Content,
-			message,
-		))
-
-}
-
-var ViewCommand = &disgoman.Command{
-	Name:                "view",
-	Aliases:             nil,
-	Description:         "View the details about a request.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              viewCommandFunc,
-}
-
-func viewCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	id, err := strconv.ParseInt(args[0], 10, 64)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Please include the ID of the request to view.", err)
-		return
-	}
-	request, err := services.RequestService.Request(id)
-	if err != nil || request.Guild.ID != guild.ID {
-		discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a valid request in this guild", id), err)
-		return
-	}
-	requestor, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was an issue finding your user account", err)
-		return
-	}
-	if request.Author.ID != ctx.Message.Author.ID &&
-		!discord_utils.IsGuildMod(ctx, requestor) &&
-		!discord_utils.IsGuildAdmin(ctx, requestor) {
-		discord_utils.SendErrorMessage(ctx, "You are not authorized to view that request", nil)
-		return
-	}
-	comments, err := services.RequestService.RequestComments(request)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was an error getting the comments.", err)
-	}
-	var commentString string
-	var commentStrings []string
-	commentString = fmt.Sprintf("```md\n"+
-		"< Request ID             Requested By >\n"+
-		"< %-11d %23s >\n"+
-		"%s\n\n"+
-		"Requested At: %s\n"+
-		"In: %s\n"+
-		"```",
-		request.ID,
-		discord_utils.GetDisplayName(ctx, request.Author.ID),
-		request.Content,
-		request.RequestedAt.Format("2006-01-02 15:04:05"),
-		discord_utils.GetChannelName(ctx, request.Channel.ID),
-	)
-	for _, c := range comments {
-		cs := fmt.Sprintf("```md\n%s\n- %s At %s\n```\n",
-			c.Content,
-			discord_utils.GetDisplayName(ctx, c.Author.ID),
-			c.CommentAt.Format("2006-01-02 15:04:05"),
-		)
-		if len(commentString+cs) >= 2000 {
-			commentStrings = append(commentStrings, commentString)
-			commentString = ""
-		}
-		commentString += cs
-	}
-	commentStrings = append(commentStrings, commentString)
-	for _, c := range commentStrings {
-		_, _ = ctx.Send(c)
-	}
-}

internal/exts/utils/utils.go

@@ -11,7 +11,7 @@ import (
 	"github.com/dustinpianalto/disgoman"
 	"github.com/dustinpianalto/geeksbot"
 	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
+	"github.com/dustinpianalto/geeksbot/internal/services"
 )
 
 var PingCommand = &disgoman.Command{

internal/services/services.go

@@ -2,7 +2,7 @@ package services
 
 import (
 	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/pkg/database"
+	"github.com/dustinpianalto/geeksbot/internal/database"
 )
 
 var (

internal/utils/utils.go

@@ -17,8 +17,5 @@ func PluralizeString(s string, i int) string {
 	if i == 1 {
 		return s
 	}
-	if s == "is" {
-		return "are"
-	}
 	return s + "s"
 }

pkg/database/migrations/000005_remove_null_from_lists.down.sql

@@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content DROP NOT NULL;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content DROP DEFAULT;
-COMMIT;

pkg/database/migrations/000005_remove_null_from_lists.up.sql

@@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content SET NOT NULL;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content SET DEFAULT array[]::varchar[];
-COMMIT;

pkg/database/migrations/000006_add_ftp_credentials.down.sql

@@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE servers
-        DROP COLUMN ftp_port,
-        DROP COLUMN ftp_username,
-        DROP COLUMN ftp_password;
-COMMIT;

pkg/database/migrations/000006_add_ftp_credentials.up.sql

@@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE servers
-        ADD COLUMN ftp_port int4,
-        ADD COLUMN ftp_username varchar(200),
-        ADD COLUMN ftp_password varchar(200);
-COMMIT;

server.go

@@ -11,9 +11,6 @@ type Server struct {
 	InfoChannel     *Channel
 	InfoMessage     *Message
 	SettingsMessage *Message
-	FTPPort         int
-	FTPUser         string
-	FTPPass         string
 }
 
 type ServerService interface {

user.go

@@ -16,5 +16,4 @@ type UserService interface {
 	DeleteUser(u User) error
 	UpdateUser(u User) (User, error)
 	GetOrCreateUser(id string) (User, error)
-	GetBySteamID(steamID string) (User, error)
 }