LordMZTE/mautrix-whatsapp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename binary content en/decode functions

Browse source
This commit is contained in:
Tulir Asokan 2018-09-01 23:53:47 +03:00
parent ed27fa775e
commit 68c0190594
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
database/message.go
View file

@ -102,15 +102,14 @@ func (msg *Message) Scan(row Scannable) *Message {
return nil return nil
} }
msg.parseBinaryContent(content) msg.decodeBinaryContent(content)
return msg return msg
} }
func (msg *Message) parseBinaryContent(content []byte) { func (msg *Message) decodeBinaryContent(content []byte) {
msg.Content = &waProto.Message{} msg.Content = &waProto.Message{}
reader := bytes.NewReader(content) reader := bytes.NewReader(content)
// dec := gob.NewDecoder(reader)
dec := json.NewDecoder(reader) dec := json.NewDecoder(reader)
err := dec.Decode(msg.Content) err := dec.Decode(msg.Content)
if err != nil { if err != nil {
@ -118,9 +117,8 @@ func (msg *Message) parseBinaryContent(content []byte) {
} }
} }
func (msg *Message) binaryContent() []byte { func (msg *Message) encodeBinaryContent() []byte {
var buf bytes.Buffer var buf bytes.Buffer
//enc := gob.NewEncoder(&buf)
enc := json.NewEncoder(&buf) enc := json.NewEncoder(&buf)
err := enc.Encode(msg.Content) err := enc.Encode(msg.Content)
if err != nil { if err != nil {
@ -130,7 +128,7 @@ func (msg *Message) binaryContent() []byte {
} }
func (msg *Message) Insert() error { func (msg *Message) Insert() error {
_, err := msg.db.Exec("INSERT INTO message VALUES (?, ?, ?, ?, ?, ?)", msg.Chat.JID, msg.Chat.Receiver, msg.JID, msg.MXID, msg.Sender, msg.binaryContent()) _, err := msg.db.Exec("INSERT INTO message VALUES (?, ?, ?, ?, ?, ?)", msg.Chat.JID, msg.Chat.Receiver, msg.JID, msg.MXID, msg.Sender, msg.encodeBinaryContent())
if err != nil { if err != nil {
msg.log.Warnfln("Failed to insert %s@%s: %v", msg.Chat, msg.JID, err) msg.log.Warnfln("Failed to insert %s@%s: %v", msg.Chat, msg.JID, err)
} }