Skip to content
Snippets Groups Projects
Commit 392cbb8b authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

add codeset version back into conversation, we need it on init

parent 0f2906c1
No related branches found
No related tags found
1 merge request!67fix for latest client release
...@@ -41,7 +41,7 @@ type wasmModel struct { ...@@ -41,7 +41,7 @@ type wasmModel struct {
// joinConversation is used for joining new conversations. // joinConversation is used for joining new conversations.
func (w *wasmModel) joinConversation(nickname string, func (w *wasmModel) joinConversation(nickname string,
pubKey ed25519.PublicKey, dmToken uint32) error { pubKey ed25519.PublicKey, dmToken uint32, codeset uint8) error {
parentErr := errors.New("failed to joinConversation") parentErr := errors.New("failed to joinConversation")
// Build object // Build object
...@@ -49,6 +49,7 @@ func (w *wasmModel) joinConversation(nickname string, ...@@ -49,6 +49,7 @@ func (w *wasmModel) joinConversation(nickname string,
Pubkey: pubKey, Pubkey: pubKey,
Nickname: nickname, Nickname: nickname,
Token: dmToken, Token: dmToken,
CodesetVersion: codeset,
Blocked: false, Blocked: false,
} }
...@@ -105,7 +106,8 @@ func (w *wasmModel) Receive(messageID message.ID, nickname string, text []byte, ...@@ -105,7 +106,8 @@ func (w *wasmModel) Receive(messageID message.ID, nickname string, text []byte,
_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)) _, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
if err != nil { if err != nil {
if strings.Contains(err.Error(), impl.ErrDoesNotExist) { if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
err = w.joinConversation(nickname, pubKey, dmToken) err = w.joinConversation(nickname, pubKey, dmToken,
codeset)
if err != nil { if err != nil {
jww.ERROR.Printf("[DM indexedDB] %+v", err) jww.ERROR.Printf("[DM indexedDB] %+v", err)
return 0 return 0
...@@ -154,7 +156,8 @@ func (w *wasmModel) ReceiveText(messageID message.ID, nickname, text string, ...@@ -154,7 +156,8 @@ func (w *wasmModel) ReceiveText(messageID message.ID, nickname, text string,
_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)) _, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
if err != nil { if err != nil {
if strings.Contains(err.Error(), impl.ErrDoesNotExist) { if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
err = w.joinConversation(nickname, pubKey, dmToken) err = w.joinConversation(nickname, pubKey, dmToken,
codeset)
if err != nil { if err != nil {
jww.ERROR.Printf("[DM indexedDB] %+v", err) jww.ERROR.Printf("[DM indexedDB] %+v", err)
return 0 return 0
...@@ -206,7 +209,8 @@ func (w *wasmModel) ReceiveReply(messageID, reactionTo message.ID, nickname, ...@@ -206,7 +209,8 @@ func (w *wasmModel) ReceiveReply(messageID, reactionTo message.ID, nickname,
_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)) _, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
if err != nil { if err != nil {
if strings.Contains(err.Error(), impl.ErrDoesNotExist) { if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
err = w.joinConversation(nickname, pubKey, dmToken) err = w.joinConversation(nickname, pubKey, dmToken,
codeset)
if err != nil { if err != nil {
jww.ERROR.Printf("[DM indexedDB] %+v", err) jww.ERROR.Printf("[DM indexedDB] %+v", err)
return 0 return 0
...@@ -258,7 +262,8 @@ func (w *wasmModel) ReceiveReaction(messageID, _ message.ID, nickname, ...@@ -258,7 +262,8 @@ func (w *wasmModel) ReceiveReaction(messageID, _ message.ID, nickname,
_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)) _, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
if err != nil { if err != nil {
if strings.Contains(err.Error(), impl.ErrDoesNotExist) { if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
err = w.joinConversation(nickname, pubKey, dmToken) err = w.joinConversation(nickname, pubKey, dmToken,
codeset)
if err != nil { if err != nil {
jww.ERROR.Printf("[DM indexedDB] %+v", err) jww.ERROR.Printf("[DM indexedDB] %+v", err)
return 0 return 0
......
...@@ -60,5 +60,6 @@ type Conversation struct { ...@@ -60,5 +60,6 @@ type Conversation struct {
Pubkey []byte `json:"pub_key"` // Matches convoPkeyName Pubkey []byte `json:"pub_key"` // Matches convoPkeyName
Nickname string `json:"nickname"` Nickname string `json:"nickname"`
Token uint32 `json:"token"` Token uint32 `json:"token"`
CodesetVersion uint8 `json:"codeset_version"`
Blocked bool `json:"blocked"` Blocked bool `json:"blocked"`
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment