From ea0c1afb10bb0b0622134200a3318a704961e841 Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Wed, 21 Jan 2026 11:23:17 -0500
Subject: [PATCH] fix: use sync stream to update analytics requests indicator
 (#5307)

---
 .../analytics_request_indicator.dart          | 41 ++++++++++++++-----
 .../analytics_requests_repo.dart              |  4 ++
 .../space_analytics/space_analytics.dart      |  1 +
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/lib/pangea/space_analytics/analytics_request_indicator.dart b/lib/pangea/space_analytics/analytics_request_indicator.dart
index 9ba4e910b..6b9d854a8 100644
--- a/lib/pangea/space_analytics/analytics_request_indicator.dart
+++ b/lib/pangea/space_analytics/analytics_request_indicator.dart
@@ -10,7 +10,6 @@ import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pangea/analytics_misc/client_analytics_extension.dart';
 import 'package:fluffychat/pangea/events/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/space_analytics/space_analytics_requested_dialog.dart';
-import 'package:fluffychat/utils/stream_extension.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 
 class AnalyticsRequestIndicator extends StatefulWidget {
@@ -60,18 +59,38 @@ class AnalyticsRequestIndicatorState extends State<AnalyticsRequestIndicator> {
     );
     await Future.wait(futures);
 
-    final analyicsRoomIds = analyticsRooms.map((r) => r.id).toSet();
+    final analyticsRoomIds = analyticsRooms.map((r) => r.id).toSet();
     _analyticsRoomSub?.cancel();
-    _analyticsRoomSub = widget.room.client.onRoomState.stream
-        .where(
-          (event) =>
-              analyicsRoomIds.contains(event.roomId) &&
-              event.state.type == EventTypes.RoomMember,
-        )
-        .rateLimit(const Duration(seconds: 1))
-        .listen((_) => setState(() {}));
+    _analyticsRoomSub = widget.room.client.onSync.stream.listen((update) async {
+      final joined = update.rooms?.join?.entries
+          .where((e) => analyticsRoomIds.contains(e.key));
 
-    if (mounted) setState(() {});
+      if (joined == null || joined.isEmpty) return;
+      final Set<String> updatedRoomIds = {};
+      for (final entry in joined) {
+        final memberEvents = entry.value.timeline?.events?.where(
+          (e) => e.type == EventTypes.RoomMember,
+        );
+        if (memberEvents != null && memberEvents.isNotEmpty) {
+          updatedRoomIds.add(entry.key);
+        }
+      }
+
+      if (updatedRoomIds.isEmpty) return;
+      for (final roomId in updatedRoomIds) {
+        final room = widget.room.client.getRoomById(roomId);
+        if (room == null) continue;
+        await room.requestParticipants(
+          [Membership.join, Membership.invite, Membership.knock],
+          false,
+          true,
+        );
+      }
+
+      if (mounted) {
+        setState(() {});
+      }
+    });
   }
 
   Map<User, List<Room>> get _knockingAdmins {
diff --git a/lib/pangea/space_analytics/analytics_requests_repo.dart b/lib/pangea/space_analytics/analytics_requests_repo.dart
index ef6bfe1a5..2c3b39ffd 100644
--- a/lib/pangea/space_analytics/analytics_requests_repo.dart
+++ b/lib/pangea/space_analytics/analytics_requests_repo.dart
@@ -94,4 +94,8 @@ class AnalyticsRequestsRepo {
     final key = _storageKey(userId, language);
     await _requestStorage.remove(key);
   }
+
+  static Future<void> clear() async {
+    await _requestStorage.erase();
+  }
 }
diff --git a/lib/pangea/space_analytics/space_analytics.dart b/lib/pangea/space_analytics/space_analytics.dart
index bef031cf5..5db3b2248 100644
--- a/lib/pangea/space_analytics/space_analytics.dart
+++ b/lib/pangea/space_analytics/space_analytics.dart
@@ -189,6 +189,7 @@ class SpaceAnalyticsState extends State<SpaceAnalytics> {
 
   Future<void> refresh() async {
     if (room == null || !room!.isSpace || selectedLanguage == null) return;
+    await AnalyticsRequestsRepo.clear();
 
     setState(() {
       downloads = Map.fromEntries(