summaryrefslogtreecommitdiff
path: root/http-server/database.go
diff options
context:
space:
mode:
Diffstat (limited to 'http-server/database.go')
-rw-r--r--http-server/database.go20
1 files changed, 9 insertions, 11 deletions
diff --git a/http-server/database.go b/http-server/database.go
index e79b3e7..8f1d094 100644
--- a/http-server/database.go
+++ b/http-server/database.go
@@ -49,23 +49,21 @@ func (conn *SQLConnection) getUserKey(username string) (string, error) {
}
}
-func (conn *SQLConnection) saveMessage(message Message) error {
+func (conn *SQLConnection) saveMessage(signedData string, timestamp int64) error {
var err error
- query := `INSERT INTO messages (userId, data, timestamp) values (
- (SELECT id FROM users WHERE username = ?), ?, ?
- )`
- _, err = conn.db.Exec(query, message.User, message.Data, message.Timestamp)
+ query := `INSERT INTO messages (timestamp, signed_message) values (?, ?);`
+ _, err = conn.db.Exec(query, timestamp, signedData)
return err
}
-func (conn *SQLConnection) getMessagesSince(timestamp int64) ([]Message, error) {
+func (conn *SQLConnection) getMessagesSince(timestamp int64) ([]string, error) {
var err error
- var msg []Message
+ var msg []string
- query := `SELECT username, data, timestamp FROM users JOIN messages
- WHERE users.id = messages.userId AND timestamp > ?
+ query := `SELECT signed_message FROM messages
+ WHERE timestamp > ?
ORDER BY timestamp;`
result, err := conn.db.Query(query, timestamp)
@@ -74,8 +72,8 @@ func (conn *SQLConnection) getMessagesSince(timestamp int64) ([]Message, error)
}
for result.Next() {
- var message Message
- _ = result.Scan(&message.User, &message.Data, &message.Timestamp)
+ var message string
+ _ = result.Scan(&message)
msg = append(msg, message)
}
_ = result.Close()