From 986d16b3469e379b82f571a446f8a1859ab59656 Mon Sep 17 00:00:00 2001
From: Dustin Pianalto <dustin@djpianalto.com>
Date: Mon, 22 Feb 2021 23:24:19 -0900
Subject: [PATCH] Add ftp credentials to domain types

---
 pkg/database/server.go | 11 ++++++++---
 server.go              |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/database/server.go b/pkg/database/server.go
index 5498160..56985c1 100644
--- a/pkg/database/server.go
+++ b/pkg/database/server.go
@@ -19,11 +19,12 @@ 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
+						guild_id, info_channel_id, info_message_id, settings_message_id,
+						ftp_port, ftp_username, ftp_password
 						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)
+		&aChanID, &guildID, &iChanID, &iMsgID, &server.FTPPort, &server.FTPUser, &server.FTPPass, &sMsgID)
 	if err != nil {
 		return geeksbot.Server{}, err
 	}
@@ -115,7 +116,8 @@ 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 WHERE id = $1`
+						settings_message_id = $9, ftp_port = $10, ftp_username = $11,
+						ftp_password = $12 WHERE id = $1`
 	_, err := s.db.Exec(queryString,
 		server.Name,
 		server.IPAddr,
@@ -125,6 +127,9 @@ 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
 }
diff --git a/server.go b/server.go
index 4e71ac9..49b9554 100644
--- a/server.go
+++ b/server.go
@@ -11,6 +11,9 @@ type Server struct {
 	InfoChannel     *Channel
 	InfoMessage     *Message
 	SettingsMessage *Message
+	FTPPort         int
+	FTPUser         string
+	FTPPass         string
 }
 
 type ServerService interface {