fix: decouple permissions reevaluation from torrent client readiness

status-im · Oct 22, 2023 · dc6fe56 · dc6fe56
1 parent bd245ab
commit dc6fe56
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/protocol/messenger.go b/protocol/messenger.go
@@ -835,20 +835,22 @@ func (m *Messenger) Start() (*MessengerResponse, error) {
 		return nil, err
 	}
 
+	controlledCommunities, err := m.communitiesManager.Controlled()
+	if err != nil {
+		return nil, err
+	}
+
 	if m.torrentClientReady() {
-		controlledCommunities, err := m.communitiesManager.Controlled()
-		if err == nil && len(controlledCommunities) > 0 {
-			available := m.SubscribeMailserverAvailable()
-			go func() {
-				<-available
-				m.InitHistoryArchiveTasks(controlledCommunities)
-			}()
-
-			for _, c := range controlledCommunities {
-				if c.Joined() && c.HasTokenPermissions() {
-					go m.communitiesManager.ReevaluateMembersPeriodically(c.ID())
-				}
-			}
+		available := m.SubscribeMailserverAvailable()
+		go func() {
+			<-available
+			m.InitHistoryArchiveTasks(controlledCommunities)
+		}()
+	}
+
+	for _, c := range controlledCommunities {
+		if c.Joined() && c.HasTokenPermissions() {
+			go m.communitiesManager.ReevaluateMembersPeriodically(c.ID())
 		}
 	}