Skip to content
Snippets Groups Projects
Commit bfc9784e authored by Jake Taylor's avatar Jake Taylor
Browse files

pull in indexedDb refactor

parent 32b16d75
Branches
Tags
2 merge requests!60Revert "Fail a test to be sure it works",!32Admin Commands
...@@ -289,7 +289,7 @@ func (w *wasmModel) UpdateFromMessageID(messageID cryptoChannel.MessageID, ...@@ -289,7 +289,7 @@ func (w *wasmModel) UpdateFromMessageID(messageID cryptoChannel.MessageID,
defer w.updateMux.Unlock() defer w.updateMux.Unlock()
msgIDStr := base64.StdEncoding.EncodeToString(messageID.Marshal()) msgIDStr := base64.StdEncoding.EncodeToString(messageID.Marshal())
currentMsgObj, err := w.getIndex(messageStoreName, currentMsgObj, err := indexedDb.GetIndex(w.db, messageStoreName,
messageStoreMessageIndex, js.ValueOf(msgIDStr)) messageStoreMessageIndex, js.ValueOf(msgIDStr))
if err != nil { if err != nil {
jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr, jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
...@@ -506,20 +506,24 @@ func (w *wasmModel) GetMessage(messageID cryptoChannel.MessageID) (channels.Mode ...@@ -506,20 +506,24 @@ func (w *wasmModel) GetMessage(messageID cryptoChannel.MessageID) (channels.Mode
}, nil }, nil
} }
// msgIDLookup gets the UUID of the Message with the given messageID. // msgIDLookup gets the UUID of the Message with the given messageID.
func (w *wasmModel) msgIDLookup(messageID cryptoChannel.MessageID) (uint64, func (w *wasmModel) msgIDLookup(messageID cryptoChannel.MessageID) (*Message,
error) { error) {
msgIDStr := js.ValueOf(base64.StdEncoding.EncodeToString(messageID.Bytes())) msgIDStr := js.ValueOf(base64.StdEncoding.EncodeToString(messageID.Bytes()))
resultObj, err := indexedDb.GetIndex(w.db, messageStoreName, resultObj, err := indexedDb.GetIndex(w.db, messageStoreName,
messageStoreMessageIndex, msgIDStr) messageStoreMessageIndex, msgIDStr)
if err != nil { if err != nil {
return 0, err return nil, err
} else if resultObj.IsUndefined() {
return nil, errors.Errorf("no message for %s found", msgIDStr)
} }
uuid := uint64(0) // Process result into string
if !resultObj.IsUndefined() { resultMsg := &Message{}
uuid = uint64(resultObj.Get("id").Int()) err = json.Unmarshal([]byte(utils.JsToJson(resultObj)), resultMsg)
if err != nil {
return nil, err
} }
return resultMsg, nil return resultMsg, nil
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment