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_: fix deleted communities query (#5232) 

Removes the community_id IS NULL condition when fetching deleted
communities and cleanup. This fixes #5222
This commit is contained in:
Godfrain Jacques 2024-05-27 10:09:15 -07:00 committed by GitHub
parent bb09cd328f
commit 07de481b69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocol/communities/manager.go
View File

@ -889,10 +889,6 @@ func (m *Manager) JoinedAndPendingCommunitiesWithRequests() ([]*Community, error
return m.persistence.JoinedAndPendingCommunitiesWithRequests(&m.identity.PublicKey)
}
func (m *Manager) LeftCommunities() ([]*Community, error) {
return m.persistence.LeftCommunities(&m.identity.PublicKey)
}
func (m *Manager) DeletedCommunities() ([]*Community, error) {
return m.persistence.DeletedCommunities(&m.identity.PublicKey)
}

13
protocol/communities/persistence.go
View File

@ -327,17 +327,6 @@ func (p *Persistence) rowsToCommunities(rows *sql.Rows) (comms []*Community, err
return comms, nil
}
func (p *Persistence) LeftCommunities(memberIdentity *ecdsa.PublicKey) (comms []*Community, err error) {
query := communitiesBaseQuery + ` WHERE NOT c.Joined AND NOT c.spectated AND r.state != ?`
rows, err := p.db.Query(query, common.PubkeyToHex(memberIdentity), RequestToJoinStatePending)
if err != nil {
return nil, err
}
return p.rowsToCommunities(rows)
}
func (p *Persistence) JoinedAndPendingCommunitiesWithRequests(memberIdentity *ecdsa.PublicKey) (comms []*Community, err error) {
query := communitiesBaseQuery + ` WHERE c.Joined OR r.state = ?`
@ -350,7 +339,7 @@ func (p *Persistence) JoinedAndPendingCommunitiesWithRequests(memberIdentity *ec
}
func (p *Persistence) DeletedCommunities(memberIdentity *ecdsa.PublicKey) (comms []*Community, err error) {
query := communitiesBaseQuery + ` WHERE NOT c.Joined AND (r.community_id IS NULL or r.state != ?)`
query := communitiesBaseQuery + ` WHERE NOT c.Joined AND r.state != ?`
rows, err := p.db.Query(query, common.PubkeyToHex(memberIdentity), RequestToJoinStatePending)
if err != nil {

9
protocol/messenger_backup.go
View File

@ -28,7 +28,6 @@ var backupIntervalSeconds uint64 = 28800
type CommunitySet struct {
Joined []*communities.Community
Left []*communities.Community
Deleted []*communities.Community
}
@ -298,11 +297,6 @@ func (m *Messenger) retrieveAllCommunities() (*CommunitySet, error) {
return nil, err
}
leftCs, err := m.communitiesManager.LeftCommunities()
if err != nil {
return nil, err
}
deletedCs, err := m.communitiesManager.DeletedCommunities()
if err != nil {
return nil, err
@ -310,7 +304,6 @@ func (m *Messenger) retrieveAllCommunities() (*CommunitySet, error) {
return &CommunitySet{
Joined: joinedCs,
Left: leftCs,
Deleted: deletedCs,
}, nil
}
@ -322,7 +315,7 @@ func (m *Messenger) backupCommunities(ctx context.Context, clock uint64) ([]*pro
}
var backupMessages []*protobuf.Backup
combinedCs := append(append(communitySet.Joined, communitySet.Left...), communitySet.Deleted...)
combinedCs := append(communitySet.Joined, communitySet.Deleted...)
for _, c := range combinedCs {
_, beingImported := m.importingCommunities[c.IDString()]