Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 36 additions & 12 deletions lib/pages/chat/chat.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ import 'package:fluffychat/pangea/analytics_data/analytics_update_dispatcher.dar
import 'package:fluffychat/pangea/analytics_data/analytics_updater_mixin.dart';
import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
import 'package:fluffychat/pangea/analytics_misc/level_up/level_up_banner.dart';
import 'package:fluffychat/pangea/analytics_misc/message_analytics_feedback.dart';
import 'package:fluffychat/pangea/bot/utils/bot_name.dart';
import 'package:fluffychat/pangea/chat/utils/unlocked_morphs_snackbar.dart';
import 'package:fluffychat/pangea/chat/chat_banner_controller.dart';
import 'package:fluffychat/pangea/chat/widgets/event_too_large_dialog.dart';
import 'package:fluffychat/pangea/choreographer/assistance_state_enum.dart';
import 'package:fluffychat/pangea/choreographer/choreo_constants.dart';
Expand Down Expand Up @@ -201,6 +200,7 @@ class ChatController extends State<ChatPageWithRoom>
StreamSubscription? _botAudioSubscription;
final timelineUpdateNotifier = _TimelineUpdateNotifier();
late final ActivityChatController activityController;
late final ChatBannerController _bannerController;
final ValueNotifier<bool> scrollableNotifier = ValueNotifier(false);
// Pangea#
Room get room => sendingClient.getRoomById(roomId) ?? widget.room;
Expand Down Expand Up @@ -512,18 +512,41 @@ class ChatController extends State<ChatPageWithRoom>

// #Pangea
void _onLevelUp(LevelUpdate update) {
if (MatrixState.pangeaController.subscriptionController.isSubscribed !=
false) {
LevelUpUtil.showLevelUpDialog(update.newLevel, update.prevLevel, context);
}
final isSubscribed = pangeaController.subscriptionController.isSubscribed;
if (isSubscribed == false) return;

final overlayKey = "level_up_notification";
_bannerController.addBanner(
(Completer<void> completer) => OverlayUtil.showLevelUpBanner(
context,
update.newLevel,
update.prevLevel,
completer,
overlayKey,
),
overlayKey: overlayKey,
);
}

void _onUnlockConstructs(Set<ConstructIdentifier> constructs) {
if (constructs.isEmpty) return;
ConstructNotificationUtil.addUnlockedConstruct(
List.from(constructs),
context,
);
for (final construct in constructs) {
if (_bannerController.queueLength >= 3) {
// If there are already 3 or more banners in the queue, don't add more to prevent overwhelming the user
return;
}

final overlayKey = "${construct.string}_snackbar";
_bannerController.addBanner(
(Completer<void> completer) => OverlayUtil.showUnlockedConstructBanner(
context,
construct,
completer,
overlayKey,
),
overlayKey: overlayKey,
);
}
}

void _onTokenUpdate(Set<ConstructIdentifier> constructs) {
Expand Down Expand Up @@ -574,8 +597,8 @@ class ChatController extends State<ChatPageWithRoom>
choreographer = Choreographer(inputFocus);
final updater = Matrix.of(context).analyticsDataService.updateDispatcher;

_bannerController = ChatBannerController();
_levelSubscription = updater.levelUpdateStream.stream.listen(_onLevelUp);

_constructsSubscription = updater.unlockedConstructsStream.stream.listen(
_onUnlockConstructs,
);
Expand Down Expand Up @@ -856,9 +879,10 @@ class ChatController extends State<ChatPageWithRoom>
MatrixState.pAnyState.closeAllOverlays(force: true);
stopMediaStream.close();
_levelSubscription?.cancel();
_botAudioSubscription?.cancel();
_constructsSubscription?.cancel();
_botAudioSubscription?.cancel();
_tokensSubscription?.cancel();
_bannerController.dispose();
_router.routeInformationProvider.removeListener(_onRouteChanged);
scrollController.dispose();
inputFocus.dispose();
Expand Down
191 changes: 0 additions & 191 deletions lib/pangea/analytics_misc/level_up/level_up_banner.dart

This file was deleted.

96 changes: 96 additions & 0 deletions lib/pangea/chat/chat_banner_controller.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import 'dart:async';
import 'dart:collection';

import 'package:flutter/material.dart';

import 'package:fluffychat/pangea/common/utils/error_handler.dart';
import 'package:fluffychat/widgets/matrix.dart';

typedef BannerExecutor = void Function(Completer<void> completer);

class BannerQueueEntry {
final BannerExecutor show;
final String overlayKey;
final Duration timeout;

BannerQueueEntry({
required this.show,
required this.overlayKey,
this.timeout = const Duration(seconds: 10),
});
}

class ChatBannerController {
ChatBannerController();

Completer<void>? _currentBannerCompleter;
final Queue<BannerQueueEntry> _bannerQueue = Queue();

int get queueLength => _bannerQueue.length;

void dispose() {
// Complete the current banner completer to allow any showing banner to close
if (_currentBannerCompleter != null &&
!_currentBannerCompleter!.isCompleted) {
_currentBannerCompleter!.complete();
}

_currentBannerCompleter = null;
_bannerQueue.clear(); // Clear any pending banners in the queue
}

// The banner widget created by showBanner should call complete on the provided
// Completer when it is dismissed or if it fails to show to allow the next banner to show
void addBanner(
BannerExecutor showBanner, {
required String overlayKey,
Duration timeout = const Duration(seconds: 30),
}) {
if (_bannerQueue.any((b) => b.overlayKey == overlayKey)) return;

Comment on lines +44 to +50
Copy link

Copilot AI Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addBanner dedupes only against _bannerQueue, so the same overlayKey can be enqueued again while it is currently showing (since the active banner isn't part of the queue). Track the currently showing overlayKey (or maintain a Set of queued+active keys) to prevent duplicate banners from showing back-to-back.

Copilot uses AI. Check for mistakes.
_bannerQueue.add(
BannerQueueEntry(
show: showBanner,
overlayKey: overlayKey,
timeout: timeout,
),
);

if (_currentBannerCompleter == null) {
showNextBanner();
}
}

Future<void> showNextBanner() async {
if (_currentBannerCompleter != null || _bannerQueue.isEmpty) {
return; // A banner is currently showing or no banners to show
}

final completer = Completer<void>();
_currentBannerCompleter = completer;
final bannerQueueEntry = _bannerQueue.removeFirst();
final show = bannerQueueEntry.show;
final timeout = bannerQueueEntry.timeout;
final overlayKey = bannerQueueEntry.overlayKey;

try {
show(completer);

await completer.future.timeout(
timeout,
onTimeout: () {
debugPrint(
"Banner '$overlayKey' timed out after ${timeout.inSeconds}s",
);
MatrixState.pAnyState.closeOverlay(overlayKey);
if (!completer.isCompleted) completer.complete();
},
);
} catch (e, s) {
ErrorHandler.logError(e: e, s: s, data: {"overlayKey": overlayKey});
} finally {
_currentBannerCompleter = null;
showNextBanner(); // Show the next banner in the queue
}
}
}
Loading
Loading