Skip to content
Snippets Groups Projects

Project/file upload

Merged Jake Taylor requested to merge project/fileUpload into release
Files
15
@@ -258,8 +258,12 @@ func (m *manager) updateFromUUIDCB(data []byte) ([]byte, error) {
status = &msg.Status
}
m.model.UpdateFromUUID(
err = m.model.UpdateFromUUID(
msg.UUID, messageID, timestamp, round, pinned, hidden, status)
if err != nil {
return []byte(err.Error()), nil
}
return nil, nil
}
@@ -292,15 +296,21 @@ func (m *manager) updateFromMessageIDCB(data []byte) ([]byte, error) {
status = &msg.Status
}
uuid := m.model.UpdateFromMessageID(
var ue wChannels.UuidError
uuid, err := m.model.UpdateFromMessageID(
msg.MessageID, timestamp, round, pinned, hidden, status)
if err != nil {
ue.Error = []byte(err.Error())
} else {
ue.UUID = uuid
}
uuidData, err := json.Marshal(uuid)
data, err = json.Marshal(ue)
if err != nil {
return nil, errors.Errorf("failed to JSON marshal UUID: %+v", err)
return nil, errors.Errorf("failed to JSON marshal %T: %+v", ue, err)
}
return uuidData, nil
return data, nil
}
// getMessageCB is the callback for wasmModel.GetMessage. Returns JSON
Loading