Add ftp credentials to db schema

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.up.sql

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

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

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

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