Backup deleted communities

VERSION

@@ -1 +1 @@
-0.98.2
+0.98.3

protocol/communities/manager.go

@@ -226,6 +226,10 @@ func (m *Manager) JoinedAndPendingCommunitiesWithRequests() ([]*Community, error
 	return m.persistence.JoinedAndPendingCommunitiesWithRequests(m.identity)
 }
 
+func (m *Manager) DeletedCommunities() ([]*Community, error) {
+	return m.persistence.DeletedCommunities(m.identity)
+}
+
 func (m *Manager) Created() ([]*Community, error) {
 	return m.persistence.CreatedCommunities(m.identity)
 }

protocol/communities/persistence.go

@@ -104,19 +104,7 @@ func (p *Persistence) JoinedCommunities(memberIdentity *ecdsa.PublicKey) ([]*Com
 	return p.queryCommunities(memberIdentity, query)
 }
 
-func (p *Persistence) JoinedAndPendingCommunitiesWithRequests(memberIdentity *ecdsa.PublicKey) (comms []*Community, err error) {
-	query := `SELECT
-c.id, c.private_key, c.description, c.joined, c.verified, c.muted,
-r.id, r.public_key, r.clock, r.ens_name, r.chat_id, r.community_id, r.state
-FROM communities_communities c
-LEFT JOIN communities_requests_to_join r ON c.id = r.community_id AND r.public_key = ?
-WHERE c.Joined OR r.state = ?`
-
-	rows, err := p.db.Query(query, common.PubkeyToHex(memberIdentity), RequestToJoinStatePending)
-	if err != nil {
-		return nil, err
-	}
-
+func (p *Persistence) rowsToCommunities(memberIdentity *ecdsa.PublicKey, rows *sql.Rows) (comms []*Community, err error) {
 	defer func() {
 		if err != nil {
 			// Don't shadow original error
@@ -161,6 +149,38 @@ WHERE c.Joined OR r.state = ?`
 	return comms, nil
 }
 
+func (p *Persistence) JoinedAndPendingCommunitiesWithRequests(memberIdentity *ecdsa.PublicKey) (comms []*Community, err error) {
+	query := `SELECT
+c.id, c.private_key, c.description, c.joined, c.verified, c.muted,
+r.id, r.public_key, r.clock, r.ens_name, r.chat_id, r.community_id, r.state
+FROM communities_communities c
+LEFT JOIN communities_requests_to_join r ON c.id = r.community_id AND r.public_key = ?
+WHERE c.Joined OR r.state = ?`
+
+	rows, err := p.db.Query(query, common.PubkeyToHex(memberIdentity), RequestToJoinStatePending)
+	if err != nil {
+		return nil, err
+	}
+
+	return p.rowsToCommunities(memberIdentity, rows)
+}
+
+func (p *Persistence) DeletedCommunities(memberIdentity *ecdsa.PublicKey) (comms []*Community, err error) {
+	query := `SELECT
+c.id, c.private_key, c.description, c.joined, c.verified, c.muted,
+r.id, r.public_key, r.clock, r.ens_name, r.chat_id, r.community_id, r.state
+FROM communities_communities c
+LEFT JOIN communities_requests_to_join r ON c.id = r.community_id AND r.public_key = ?
+WHERE NOT c.Joined AND (r.community_id IS NULL or r.state != ?)`
+
+	rows, err := p.db.Query(query, common.PubkeyToHex(memberIdentity), RequestToJoinStatePending)
+	if err != nil {
+		return nil, err
+	}
+
+	return p.rowsToCommunities(memberIdentity, rows)
+}
+
 func (p *Persistence) CreatedCommunities(memberIdentity *ecdsa.PublicKey) ([]*Community, error) {
 	query := communitiesBaseQuery + ` WHERE c.private_key IS NOT NULL`
 	return p.queryCommunities(memberIdentity, query)

protocol/messenger_backup.go

@@ -119,10 +119,17 @@ func (m *Messenger) BackupData(ctx context.Context) (uint64, error) {
 
 	}
 
-	cs, err := m.communitiesManager.JoinedAndPendingCommunitiesWithRequests()
+	joinedCs, err := m.communitiesManager.JoinedAndPendingCommunitiesWithRequests()
 	if err != nil {
 		return 0, err
 	}
+
+	deletedCs, err := m.communitiesManager.DeletedCommunities()
+	if err != nil {
+		return 0, err
+	}
+
+	cs := append(joinedCs, deletedCs...)
 	for _, c := range cs {
 
 		syncMessage, err := c.ToSyncCommunityProtobuf(clock)

protocol/messenger_handler.go

@@ -309,6 +309,7 @@ func (m *Messenger) HandleBackup(state *ReceivedMessageState, message protobuf.B
 			return err
 		}
 	}
+
 	return nil
 }