fix: derive community.Encrypted() from permissions (#4142)

status-im · Oct 11, 2023 · eed3212 · eed3212
1 parent 5a4cc50
commit eed3212
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 69 deletions.
diff --git a/protocol/communities/community.go b/protocol/communities/community.go
@@ -141,7 +141,7 @@ func (o *Community) MarshalPublicAPIJSON() ([]byte, error) {
 				Position: int(c.Position),
 			}
 			communityItem.Categories[id] = category
-			communityItem.Encrypted = o.config.CommunityDescription.Encrypted
+			communityItem.Encrypted = o.Encrypted()
 		}
 		for id, c := range o.config.CommunityDescription.Chats {
 			canPost, err := o.CanPost(o.config.MemberIdentity, id, nil)
@@ -260,7 +260,7 @@ func (o *Community) MarshalJSON() ([]byte, error) {
 				Name:     c.Name,
 				Position: int(c.Position),
 			}
-			communityItem.Encrypted = o.config.CommunityDescription.Encrypted
+			communityItem.Encrypted = o.Encrypted()
 			communityItem.Categories[id] = category
 		}
 		for id, c := range o.config.CommunityDescription.Chats {
@@ -905,7 +905,7 @@ func (o *Community) Spectate() {
 }
 
 func (o *Community) Encrypted() bool {
-	return o.config.CommunityDescription.Encrypted
+	return len(o.TokenPermissionsByType(protobuf.CommunityTokenPermission_BECOME_MEMBER)) > 0
 }
 
 func (o *Community) Joined() bool {
@@ -1474,10 +1474,6 @@ func includes(channelIDs []string, channelID string) bool {
 	return false
 }
 
-func (o *Community) updateEncrypted() {
-	o.config.CommunityDescription.Encrypted = len(o.TokenPermissionsByType(protobuf.CommunityTokenPermission_BECOME_MEMBER)) > 0
-}
-
 func (o *Community) UpsertTokenPermission(tokenPermission *protobuf.CommunityTokenPermission) (*CommunityChanges, error) {
 	o.mutex.Lock()
 	defer o.mutex.Unlock()
@@ -1488,7 +1484,6 @@ func (o *Community) UpsertTokenPermission(tokenPermission *protobuf.CommunityTok
 			return nil, err
 		}
 
-		o.updateEncrypted()
 		o.increaseClock()
 
 		return changes, nil
@@ -1534,7 +1529,6 @@ func (o *Community) DeleteTokenPermission(permissionID string) (*CommunityChange
 			return nil, err
 		}
 
-		o.updateEncrypted()
 		o.increaseClock()
 
 		return changes, nil

diff --git a/protocol/communities/community_encryption_key_action_test.go b/protocol/communities/community_encryption_key_action_test.go
@@ -24,7 +24,6 @@ func createTestCommunity(identity *ecdsa.PrivateKey) *Community {
 				Chats:                   map[string]*protobuf.CommunityChat{},
 				BanList:                 []string{},
 				Categories:              map[string]*protobuf.CommunityCategory{},
-				Encrypted:               false,
 				TokenPermissions:        map[string]*protobuf.CommunityTokenPermission{},
 				CommunityTokensMetadata: []*protobuf.CommunityTokenMetadata{},
 			},

diff --git a/protocol/protobuf/communities.pb.go b/protocol/protobuf/communities.pb.go
diff --git a/protocol/protobuf/communities.proto b/protocol/protobuf/communities.proto
@@ -93,7 +93,7 @@ message CommunityDescription {
   CommunityAdminSettings admin_settings = 10;
   string intro_message = 11;
   string outro_message = 12;
-  bool encrypted = 13;
+  bool encrypted = 13 [deprecated=true];
   repeated string tags = 14;
   map<string, CommunityTokenPermission> token_permissions = 15;
   repeated CommunityTokenMetadata community_tokens_metadata = 16;

diff --git a/protocol/requests/create_community_request.go b/protocol/requests/create_community_request.go
@@ -128,7 +128,6 @@ func (c *CreateCommunity) ToCommunityDescription() (*protobuf.CommunityDescripti
 		},
 		IntroMessage: c.IntroMessage,
 		OutroMessage: c.OutroMessage,
-		Encrypted:    false,
 		Tags:         c.Tags,
 	}
 	return description, nil