Fix request message

.github/workflows/main.yml

@@ -26,8 +26,8 @@ jobs:
           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/
+            /home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -prefix $GITHUB_WORKSPACE/pkg/database/migrations/ -o $GITHUB_WORKSPACE/pkg/database/migrations/bindata.go $GITHUB_WORKSPACE/pkg/database/migrations/
-            head $GITHUB_WORKSPACE/internal/database/migrations/bindata.go
+            head $GITHUB_WORKSPACE/pkg/database/migrations/bindata.go
 
       - name: Build container image
         env:
@@ -43,7 +43,9 @@ jobs:
         run: doctl registry login --expiry-seconds 600
 
       - name: Push image to DigitalOcean Container Registry
-        run: docker push registry.digitalocean.com/djpianalto/geeksbot
+        run: docker push registry.digitalocean.com/djpianalto/geeksbot:$IMAGE_TAG
+        env:
+          IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
 
       - name: Update deployment file
         run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml

internal/exts/init.go

@@ -32,4 +32,6 @@ 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)
 }

internal/exts/requests/requests.go

@@ -9,6 +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"
 )
 
@@ -234,7 +235,7 @@ func listCommandFunc(ctx disgoman.Context, args []string) {
 
 		_, _ = ctx.Send(fmt.Sprintf("```md\n"+
 			"< Request ID            Requested By >\n"+
-			"< %11s %-23s >\n"+
+			"< %-11d %23s >\n"+
 			"%s\n\n"+
 			"Comments: Not Implemented Yet\n"+
 			"Requested At: %s\n"+
@@ -247,4 +248,6 @@ func listCommandFunc(ctx disgoman.Context, args []string) {
 			channelName,
 		))
 	}
+
+	_, _ = ctx.Send(fmt.Sprintf("```There %s currently %d open %s```", utils.PluralizeString("is", len(requests)), len(requests), utils.PluralizeString("request", len(requests))))
 }

internal/utils/utils.go

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

pkg/database/message.go

@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/dustinpianalto/geeksbot"
+	"github.com/lib/pq"
 )
 
 type messageService struct {
@@ -21,7 +22,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,
-		&m.PreviousContent, &channel_id, &author_id)
+		pq.Array(&m.PreviousContent), &channel_id, &author_id)
 	if err != nil {
 		return geeksbot.Message{}, err
 	}

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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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/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
+						completed_at, completed_by, message_id, completed_message FROM requests
 						WHERE id = $1`
 	row := s.db.QueryRow(queryString, id)
 	err := row.Scan(&r.ID, &aID, &cID, &gID, &r.Content, &r.RequestedAt, &r.Completed,
@@ -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 WHERE id = $1"
+	queryString := "SELECT id, author_id, request_id, comment_at, content FROM comments WHERE id = $1"
 	row := s.db.QueryRow(queryString, id)
 	err := row.Scan(&c.ID, &aID, &rID, &c.CommentAt, &c.Content)
 	if err != nil {