status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix syncing of public chats 

Timeline chats are created as public chats, in any place where we sync
them we need to check that they are excluded.
This commit is contained in:
Andrea Maria Piana 2021-03-02 16:20:25 +01:00
parent 09942bf200
commit 0a686bba4c
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.72.1 0.72.2

5
protocol/chat.go
View File

@ -4,6 +4,7 @@ import (
"crypto/ecdsa" "crypto/ecdsa"
"errors" "errors"
"math/rand" "math/rand"
"strings"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
@ -100,8 +101,10 @@ func (c *Chat) ProfileUpdates() bool {
return c.ChatType == ChatTypeProfile return c.ChatType == ChatTypeProfile
} }
// It looks like status-react created profile chats as public chats
// so for now we need to check for the presence of "@" in their chatID
func (c *Chat) Timeline() bool { func (c *Chat) Timeline() bool {
return c.ChatType == ChatTypeTimeline return c.ChatType == ChatTypeTimeline || (c.Public() && strings.HasPrefix(c.ID, "@"))
} }
func (c *Chat) OneToOne() bool { func (c *Chat) OneToOne() bool {

5
protocol/message_handler.go
View File

@ -4,7 +4,6 @@ import (
"crypto/ecdsa" "crypto/ecdsa"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"strings"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -449,9 +448,7 @@ func (m *MessageHandler) HandleChatMessage(state *ReceivedMessageState) error {
return err // matchChatEntity returns a descriptive error message return err // matchChatEntity returns a descriptive error message
} }
// It looks like status-react created profile chats as public chats if chat.Public() && receivedMessage.ContentType == protobuf.ChatMessage_IMAGE && !chat.Timeline() {
// so for now we need to check for the presence of "@" in their chatID
if chat.Public() && receivedMessage.ContentType == protobuf.ChatMessage_IMAGE && !strings.HasPrefix(chat.ID, "@") {
return errors.New("images are not allowed in public chats") return errors.New("images are not allowed in public chats")
} }

2
protocol/messenger.go
View File

@ -2210,7 +2210,7 @@ func (m *Messenger) SyncDevices(ctx context.Context, ensName, photoPath string)
} }
for _, chat := range m.allChats { for _, chat := range m.allChats {
if chat.Public() && chat.Active { if !chat.Timeline() && chat.Public() && chat.Active {
if err := m.syncPublicChat(ctx, chat); err != nil { if err := m.syncPublicChat(ctx, chat); err != nil {
return err return err
} }

3
protocol/messenger_chats.go
View File

@ -3,7 +3,6 @@ package protocol
import ( import (
"context" "context"
"errors" "errors"
"strings"
"github.com/status-im/status-go/protocol/common" "github.com/status-im/status-go/protocol/common"
"github.com/status-im/status-go/protocol/requests" "github.com/status-im/status-go/protocol/requests"
@ -155,7 +154,7 @@ func (m *Messenger) saveChat(chat *Chat) error {
chat.Identicon = identicon chat.Identicon = identicon
} }
// Sync chat if it's a new active public chat, but not a timeline chat // Sync chat if it's a new active public chat, but not a timeline chat
if !ok && chat.Active && chat.Public() && !strings.HasPrefix(chat.ID, "@") { if !ok && chat.Active && chat.Public() && !chat.Timeline() {
if err := m.syncPublicChat(context.Background(), chat); err != nil { if err := m.syncPublicChat(context.Background(), chat); err != nil {
return err return err