WIP

database/message.go

@@ -43,12 +43,12 @@ func (mq *MessageQuery) New() *Message {
 const (
 	getAllMessagesSelect = `
 		SELECT chat_gmid, chat_receiver, gmid, mxid, sender, timestamp, sent
-		FROM messages
+		FROM message
 	`
 	getAllMessagesQuery = getAllMessagesSelect + `
 		WHERE chat_gmid=$1 AND chat_receiver=$2
 	`
-	getByGMIDQuery            = getAllMessagesQuery + "AND jid=$3"
+	getByGMIDQuery            = getAllMessagesQuery + "AND gmid=$3"
 	getByMXIDQuery            = getAllMessagesSelect + "WHERE mxid=$1"
 	getLastMessageInChatQuery = getAllMessagesQuery + `
 		AND timestamp<=$3 AND sent=true