Keep older history reachable and skip notifying spam marked mid-translation

- Channel chat: when the message filter hides or collapses loaded messages
  and the list is too short to scroll (so the load-older trigger can't
  fire), load older pages automatically until it can scroll, storage runs
  out, or 20 pages have loaded. Past that cap an empty channel offers a
  "Load older messages" button instead of a dead end.
- Notifications: incoming channel messages notify after awaiting
  translation; marking one as spam meanwhile replaced the stored copy but
  not the captured one, so the spam still notified. Check the stored
  message's filter state before notifying.
This commit is contained in:
zjs81 committed 2026-11-06 00:34:49 -07:00
1 parent 1332c35884
commit 4862966e47
39 files changed
+163 -3

No files matched your search

+17
View File
@@ -1118,6 +1118,17 @@ class MeshCoreConnector extends ChangeNotifier {
return true;
}
/// The loaded copy of [messageId] in channel [channelIndex], or null when
/// it is not in the in-memory window.
ChannelMessage? _loadedChannelMessage(int channelIndex, String messageId) {
final messages = _channelMessages[_canonicalSlot(channelIndex)];
if (messages == null) return null;
for (var i = messages.length - 1; i >= 0; i--) {
if (messages[i].messageId == messageId) return messages[i];
}
return null;
}
/// User marked [message] in [channel] as spam: hide it and teach the
/// filter.
Future<void> markChannelMessageSpam(
@@ -7784,6 +7795,12 @@ class MeshCoreConnector extends ChangeNotifier {
// Check if channel is muted
if (notificationMode == ChannelNotificationMode.muted) return;
// Callers notify after awaiting translation, and the user may mark the
// message as spam meanwhile; that replaces the stored copy, not the
// [message] the caller captured. Go by the stored state.
final stored = _loadedChannelMessage(channelIndex, message.messageId);
if (stored != null && stored.isFiltered) return;
// Reuse translation result only if completed and non-empty; else use original text
final resolvedText =
(translationResult != null &&
+1
View File
@@ -3530,6 +3530,7 @@
"appSettings_showOnlineLinks": "Показвай връзките от онлайн картата",
"appSettings_showOnlineLinksSubtitle": "Показва линии между възлите от онлайн картата",
"map_showOnlineLinks": "Показвай връзките от онлайн картата",
"chat_loadOlderMessages": "Зареди по-стари съобщения",
"messageFilter_title": "Филтър за съобщения",
"messageFilter_settingsSubtitle": "Скрива спам и повтарящи се съобщения",
"messageFilter_enabled": "Филтрирай съобщенията",
+1
View File
@@ -3665,6 +3665,7 @@
"appSettings_showOnlineLinks": "Verbindungen der Online-Karte anzeigen",
"appSettings_showOnlineLinksSubtitle": "Verbindungslinien zwischen Knoten aus der Online-Karte anzeigen",
"map_showOnlineLinks": "Verbindungen der Online-Karte anzeigen",
"chat_loadOlderMessages": "Ältere Nachrichten laden",
"messageFilter_title": "Nachrichtenfilter",
"messageFilter_settingsSubtitle": "Spam und wiederholte Nachrichten ausblenden",
"messageFilter_enabled": "Nachrichten filtern",
+4
View File
@@ -3753,6 +3753,10 @@
"@holidayGreeting_newYear": {
"description": "Holiday greeting that plays the New Year's fireworks animation when it appears in a chat message. Matched in every app language and ignoring case and punctuation, so translate it as people actually write the greeting. Separate alternative phrasings with |."
},
"chat_loadOlderMessages": "Load older messages",
"@chat_loadOlderMessages": {
"description": "Button on an empty channel when filtered messages hide the loaded ones and older history may exist"
},
"messageFilter_title": "Message filter",
"@messageFilter_title": {
"description": "Message filter: Message filter"
+1
View File
@@ -3664,6 +3664,7 @@
"appSettings_showOnlineLinks": "Mostrar conexiones del mapa en línea",
"appSettings_showOnlineLinksSubtitle": "Muestra líneas de conexión entre nodos del mapa en línea",
"map_showOnlineLinks": "Mostrar conexiones del mapa en línea",
"chat_loadOlderMessages": "Cargar mensajes anteriores",
"messageFilter_title": "Filtro de mensajes",
"messageFilter_settingsSubtitle": "Oculta mensajes de spam y repetidos",
"messageFilter_enabled": "Filtrar mensajes",
+1
View File
@@ -3664,6 +3664,7 @@
"appSettings_showOnlineLinks": "Afficher les connexions de la carte en ligne",
"appSettings_showOnlineLinksSubtitle": "Affiche les lignes de connexion entre les nœuds de la carte en ligne",
"map_showOnlineLinks": "Afficher les connexions de la carte en ligne",
"chat_loadOlderMessages": "Charger les anciens messages",
"messageFilter_title": "Filtre de messages",
"messageFilter_settingsSubtitle": "Masquer les spams et les messages répétés",
"messageFilter_enabled": "Filtrer les messages",
+1
View File
@@ -3569,6 +3569,7 @@
"appSettings_showOnlineLinks": "Online térkép kapcsolatainak megjelenítése",
"appSettings_showOnlineLinksSubtitle": "A csomópontok közötti kapcsolatvonalak megjelenítése az online térképről",
"map_showOnlineLinks": "Online térkép kapcsolatainak megjelenítése",
"chat_loadOlderMessages": "Régebbi üzenetek betöltése",
"messageFilter_title": "Üzenetszűrő",
"messageFilter_settingsSubtitle": "Spam és ismétlődő üzenetek elrejtése",
"messageFilter_enabled": "Üzenetek szűrése",
+1
View File
@@ -3664,6 +3664,7 @@
"appSettings_showOnlineLinks": "Mostra connessioni della mappa online",
"appSettings_showOnlineLinksSubtitle": "Mostra le linee di collegamento tra i nodi della mappa online",
"map_showOnlineLinks": "Mostra connessioni della mappa online",
"chat_loadOlderMessages": "Carica messaggi meno recenti",
"messageFilter_title": "Filtro messaggi",
"messageFilter_settingsSubtitle": "Nascondi spam e messaggi ripetuti",
"messageFilter_enabled": "Filtra i messaggi",
+1
View File
@@ -3664,6 +3664,7 @@
"appSettings_showOnlineLinks": "オンライン地図の接続を表示",
"appSettings_showOnlineLinksSubtitle": "オンライン地図にあるノード間の接続線を表示する",
"map_showOnlineLinks": "オンライン地図の接続を表示",
"chat_loadOlderMessages": "以前のメッセージを読み込む",
"messageFilter_title": "メッセージフィルター",
"@messageFilter_title": {
"description": "Message filter: Message filter"
+1
View File
@@ -3664,6 +3664,7 @@
"appSettings_showOnlineLinks": "온라인 지도 연결선 표시",
"appSettings_showOnlineLinksSubtitle": "온라인 지도에 있는 노드 간 연결선을 표시",
"map_showOnlineLinks": "온라인 지도 연결선 표시",
"chat_loadOlderMessages": "이전 메시지 불러오기",
"messageFilter_title": "메시지 필터",
"@messageFilter_title": {
"description": "Message filter: Message filter"
+6
View File
@@ -11491,6 +11491,12 @@ abstract class AppLocalizations {
/// **'Happy New Year|Happy New Year\'s'**
String get holidayGreeting_newYear;
/// Button on an empty channel when filtered messages hide the loaded ones and older history may exist
///
/// In en, this message translates to:
/// **'Load older messages'**
String get chat_loadOlderMessages;
/// Message filter: Message filter
///
/// In en, this message translates to:
+3
View File
@@ -6854,6 +6854,9 @@ class AppLocalizationsBg extends AppLocalizations {
String get holidayGreeting_newYear =>
'Честита Нова година|Щастлива Нова година|Happy New Year';
@override
String get chat_loadOlderMessages => 'Зареди по-стари съобщения';
@override
String get messageFilter_title => 'Филтър за съобщения';
+3
View File
@@ -6866,6 +6866,9 @@ class AppLocalizationsDe extends AppLocalizations {
String get holidayGreeting_newYear =>
'Frohes neues Jahr|Gutes neues Jahr|Guten Rutsch|Prosit Neujahr|Happy New Year|Ein gutes neues Jahr|Guten Rutsch ins neue Jahr|Frohes Neues';
@override
String get chat_loadOlderMessages => 'Ältere Nachrichten laden';
@override
String get messageFilter_title => 'Nachrichtenfilter';
+3
View File
@@ -6751,6 +6751,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get holidayGreeting_newYear => 'Happy New Year|Happy New Year\'s';
@override
String get chat_loadOlderMessages => 'Load older messages';
@override
String get messageFilter_title => 'Message filter';
+3
View File
@@ -6851,6 +6851,9 @@ class AppLocalizationsEs extends AppLocalizations {
String get holidayGreeting_newYear =>
'Feliz Año Nuevo|Próspero Año Nuevo|Feliz Año|Feliz Nochevieja|Próspero Año|Happy New Year';
@override
String get chat_loadOlderMessages => 'Cargar mensajes anteriores';
@override
String get messageFilter_title => 'Filtro de mensajes';
+3
View File
@@ -6876,6 +6876,9 @@ class AppLocalizationsFr extends AppLocalizations {
String get holidayGreeting_newYear =>
'Bonne année|Bonne et heureuse année|Happy New Year';
@override
String get chat_loadOlderMessages => 'Charger les anciens messages';
@override
String get messageFilter_title => 'Filtre de messages';
+3
View File
@@ -6841,6 +6841,9 @@ class AppLocalizationsHu extends AppLocalizations {
String get holidayGreeting_newYear =>
'Boldog új évet|Boldog újévet|Boldog új esztendőt|BÚÉK|Happy New Year';
@override
String get chat_loadOlderMessages => 'Régebbi üzenetek betöltése';
@override
String get messageFilter_title => 'Üzenetszűrő';
+3
View File
@@ -6861,6 +6861,9 @@ class AppLocalizationsIt extends AppLocalizations {
String get holidayGreeting_newYear =>
'Felice Anno Nuovo|Buon Anno Nuovo|Buon Capodanno|Buon Anno|Felice Anno|Felice Capodanno|Happy New Year';
@override
String get chat_loadOlderMessages => 'Carica messaggi meno recenti';
@override
String get messageFilter_title => 'Filtro messaggi';
+3
View File
@@ -6533,6 +6533,9 @@ class AppLocalizationsJa extends AppLocalizations {
String get holidayGreeting_newYear =>
'あけましておめでとう|明けましておめでとう|あけおめ|アケオメ|ハッピーニューイヤー|ハッピー・ニューイヤー|謹賀新年|Happy New Year';
@override
String get chat_loadOlderMessages => '以前のメッセージを読み込む';
@override
String get messageFilter_title => 'メッセージフィルター';
+3
View File
@@ -6544,6 +6544,9 @@ class AppLocalizationsKo extends AppLocalizations {
String get holidayGreeting_newYear =>
'새해 복 많이 받으세요|새해 복 많이 받아|새해 복 많이 받으십시오|새해 복 많이 받아요|해피 뉴 이어|해피 뉴이어|즐거운 새해|행복한 새해';
@override
String get chat_loadOlderMessages => '이전 메시지 불러오기';
@override
String get messageFilter_title => '메시지 필터';
+3
View File
@@ -6815,6 +6815,9 @@ class AppLocalizationsNl extends AppLocalizations {
String get holidayGreeting_newYear =>
'Gelukkig Nieuwjaar|Gelukkig nieuw jaar|Prettig nieuwjaar|Een gelukkig nieuwjaar|Happy New Year|Zalig nieuwjaar|Fijne jaarwisseling';
@override
String get chat_loadOlderMessages => 'Oudere berichten laden';
@override
String get messageFilter_title => 'Berichtenfilter';
+3
View File
@@ -6878,6 +6878,9 @@ class AppLocalizationsPl extends AppLocalizations {
String get holidayGreeting_newYear =>
'Szczęśliwego Nowego Roku|Dobrego Nowego Roku|Udanego Nowego Roku|Happy New Year';
@override
String get chat_loadOlderMessages => 'Wczytaj starsze wiadomości';
@override
String get messageFilter_title => 'Filtr wiadomości';
+3
View File
@@ -6844,6 +6844,9 @@ class AppLocalizationsPt extends AppLocalizations {
String get holidayGreeting_newYear =>
'Feliz Ano Novo|Próspero Ano Novo|Feliz Ano|Feliz Réveillon|Boas Festas e Feliz Ano Novo|Happy New Year';
@override
String get chat_loadOlderMessages => 'Carregar mensagens mais antigas';
@override
String get messageFilter_title => 'Filtro de mensagens';
+3
View File
@@ -6864,6 +6864,9 @@ class AppLocalizationsRu extends AppLocalizations {
String get holidayGreeting_newYear =>
'С Новым годом|С Новым годом!|С Новым годом всех|С наступающим Новым годом|Счастливого Нового года|Happy New Year';
@override
String get chat_loadOlderMessages => 'Загрузить более старые сообщения';
@override
String get messageFilter_title => 'Фильтр сообщений';
+3
View File
@@ -6833,6 +6833,9 @@ class AppLocalizationsSk extends AppLocalizations {
String get holidayGreeting_newYear =>
'Šťastný Nový rok|Úspešný nový rok|Happy New Year';
@override
String get chat_loadOlderMessages => 'Načítať staršie správy';
@override
String get messageFilter_title => 'Filter správ';
+3
View File
@@ -6819,6 +6819,9 @@ class AppLocalizationsSl extends AppLocalizations {
String get holidayGreeting_newYear =>
'Srečno novo leto|Srečno v novem letu|Vse najboljše v novem letu|Happy New Year';
@override
String get chat_loadOlderMessages => 'Naloži starejša sporočila';
@override
String get messageFilter_title => 'Filter sporočil';
+3
View File
@@ -6792,6 +6792,9 @@ class AppLocalizationsSv extends AppLocalizations {
String get holidayGreeting_newYear =>
'Gott nytt år|Happy New Year|Ett gott nytt år';
@override
String get chat_loadOlderMessages => 'Ladda äldre meddelanden';
@override
String get messageFilter_title => 'Meddelandefilter';
+3
View File
@@ -6871,6 +6871,9 @@ class AppLocalizationsUk extends AppLocalizations {
String get holidayGreeting_newYear =>
'З Новим роком|З наступаючим Новим роком|Щасливого Нового року|Happy New Year';
@override
String get chat_loadOlderMessages => 'Завантажити старіші повідомлення';
@override
String get messageFilter_title => 'Фільтр повідомлень';
+3
View File
@@ -6383,6 +6383,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get holidayGreeting_newYear => '新年快乐|新年快樂|元旦快乐|元旦快樂|新年好|新年愉快';
@override
String get chat_loadOlderMessages => '加载更早的消息';
@override
String get messageFilter_title => '消息过滤';
+1
View File
@@ -3431,6 +3431,7 @@
"appSettings_showOnlineLinks": "Verbindingen van de online kaart tonen",
"appSettings_showOnlineLinksSubtitle": "Verbindingslijnen tussen nodes van de online kaart tonen",
"map_showOnlineLinks": "Verbindingen van de online kaart tonen",
"chat_loadOlderMessages": "Oudere berichten laden",
"messageFilter_title": "Berichtenfilter",
"messageFilter_settingsSubtitle": "Spam en herhaalde berichten verbergen",
"messageFilter_enabled": "Berichten filteren",
+1
View File
@@ -3563,6 +3563,7 @@
"appSettings_showOnlineLinks": "Pokaż połączenia z mapy online",
"appSettings_showOnlineLinksSubtitle": "Wyświetlaj linie połączeń między węzłami z mapy online",
"map_showOnlineLinks": "Pokaż połączenia z mapy online",
"chat_loadOlderMessages": "Wczytaj starsze wiadomości",
"messageFilter_title": "Filtr wiadomości",
"@messageFilter_title": {
"description": "Message filter: Message filter"
+1
View File
@@ -3530,6 +3530,7 @@
"appSettings_showOnlineLinks": "Mostrar conexões do mapa online",
"appSettings_showOnlineLinksSubtitle": "Exibe linhas de conexão entre nós do mapa online",
"map_showOnlineLinks": "Mostrar conexões do mapa online",
"chat_loadOlderMessages": "Carregar mensagens mais antigas",
"messageFilter_title": "Filtro de mensagens",
"messageFilter_settingsSubtitle": "Oculta mensagens de spam e repetidas",
"messageFilter_enabled": "Filtrar mensagens",
+1
View File
@@ -2827,6 +2827,7 @@
"appSettings_showOnlineLinks": "Показывать связи с онлайн-карты",
"appSettings_showOnlineLinksSubtitle": "Показывать линии связи между узлами с онлайн-карты",
"map_showOnlineLinks": "Показывать связи с онлайн-карты",
"chat_loadOlderMessages": "Загрузить более старые сообщения",
"messageFilter_title": "Фильтр сообщений",
"messageFilter_settingsSubtitle": "Скрывать спам и повторяющиеся сообщения",
"messageFilter_enabled": "Фильтровать сообщения",
+1
View File
@@ -3531,6 +3531,7 @@
"appSettings_showOnlineLinks": "Zobraziť spojenia z online mapy",
"appSettings_showOnlineLinksSubtitle": "Zobrazí spojovacie čiary medzi uzlami z online mapy",
"map_showOnlineLinks": "Zobraziť spojenia z online mapy",
"chat_loadOlderMessages": "Načítať staršie správy",
"messageFilter_title": "Filter správ",
"messageFilter_settingsSubtitle": "Skryje spam a opakované správy",
"messageFilter_enabled": "Filtrovať správy",
+1
View File
@@ -3531,6 +3531,7 @@
"appSettings_showOnlineLinks": "Pokaži povezave spletnega zemljevida",
"appSettings_showOnlineLinksSubtitle": "Prikaži povezovalne črte med napravami iz spletnega zemljevida",
"map_showOnlineLinks": "Pokaži povezave spletnega zemljevida",
"chat_loadOlderMessages": "Naloži starejša sporočila",
"messageFilter_title": "Filter sporočil",
"@messageFilter_title": {
"description": "Message filter: Message filter"
+1
View File
@@ -3525,6 +3525,7 @@
"appSettings_showOnlineLinks": "Visa anslutningar från onlinekartan",
"appSettings_showOnlineLinksSubtitle": "Visa anslutningslinjer mellan noder från onlinekartan",
"map_showOnlineLinks": "Visa anslutningar från onlinekartan",
"chat_loadOlderMessages": "Ladda äldre meddelanden",
"messageFilter_title": "Meddelandefilter",
"messageFilter_settingsSubtitle": "Dölj skräppost och upprepade meddelanden",
"messageFilter_enabled": "Filtrera meddelanden",
+1
View File
@@ -3510,6 +3510,7 @@
"appSettings_showOnlineLinks": "Показувати зв’язки з онлайн-карти",
"appSettings_showOnlineLinksSubtitle": "Показує лінії між вузлами з онлайн-карти",
"map_showOnlineLinks": "Показувати зв’язки з онлайн-карти",
"chat_loadOlderMessages": "Завантажити старіші повідомлення",
"messageFilter_title": "Фільтр повідомлень",
"messageFilter_settingsSubtitle": "Приховує спам і повідомлення, що повторюються",
"messageFilter_enabled": "Фільтрувати повідомлення",
+1
View File
@@ -3535,6 +3535,7 @@
"appSettings_showOnlineLinks": "显示在线地图连接",
"appSettings_showOnlineLinksSubtitle": "显示在线地图中节点之间的连接线",
"map_showOnlineLinks": "显示在线地图连接",
"chat_loadOlderMessages": "加载更早的消息",
"messageFilter_title": "消息过滤",
"messageFilter_settingsSubtitle": "隐藏垃圾消息和重复消息",
"messageFilter_enabled": "过滤消息",
+65 -3
View File
@@ -101,6 +101,15 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
final CommunityPskIndex _communityIndex = CommunityPskIndex();
final Map<String, GlobalKey> _messageKeys = {};
bool _isLoadingOlder = false;
/// Storage returned no more history; stop asking for older pages.
bool _olderHistoryExhausted = false;
/// Older pages loaded automatically because filtered messages left the
/// list too short to scroll (and so to reach the load-older trigger).
int _hiddenBackfillPages = 0;
bool _hiddenBackfillScheduled = false;
static const int _maxHiddenBackfillPages = 20;
bool _communitiesLoaded = false;
/// Per-screen image-id allocator. The id is 8 bits and the reassembly key also
@@ -229,17 +238,52 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
}
Future<void> _loadOlderMessages() async {
if (_isLoadingOlder) return;
if (_isLoadingOlder || _olderHistoryExhausted) return;
setState(() => _isLoadingOlder = true);
final connector = context.read<MeshCoreConnector>();
await connector.loadOlderChannelMessages(widget.channel.index);
final older = await connector.loadOlderChannelMessages(
widget.channel.index,
);
if (mounted) {
setState(() => _isLoadingOlder = false);
setState(() {
_isLoadingOlder = false;
if (older.isEmpty) _olderHistoryExhausted = true;
});
}
}
/// When filtered messages are hidden or collapsed, the loaded window can
/// leave nothing (or too little) on screen to scroll, so the scroll-near-top
/// trigger for older history never fires. Keep loading older pages until
/// the list can scroll, storage runs out, or the automatic page cap is hit.
void _scheduleHiddenHistoryBackfill() {
if (_hiddenBackfillScheduled ||
_isLoadingOlder ||
_olderHistoryExhausted ||
_hiddenBackfillPages >= _maxHiddenBackfillPages) {
return;
}
_hiddenBackfillScheduled = true;
WidgetsBinding.instance.addPostFrameCallback((_) {
_hiddenBackfillScheduled = false;
if (!mounted || _isLoadingOlder || _olderHistoryExhausted) return;
if (_scrollController.hasClients &&
_scrollController.position.maxScrollExtent > 0) {
return;
}
_hiddenBackfillPages++;
unawaited(_loadOlderMessages());
});
}
/// Loads an older page on request, restarting the automatic page cap.
void _loadOlderHiddenHistory() {
_hiddenBackfillPages = 0;
unawaited(_loadOlderMessages());
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
@@ -563,8 +607,14 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
),
);
final layout = _transcriptLayoutFor(context, messages);
// Fewer entries than messages means the filter hid or
// collapsed some; make sure older history stays reachable.
final hidesMessages = layout.length < messages.length;
if (hidesMessages) _scheduleHiddenHistoryBackfill();
if (layout.length == 0) {
final canLoadOlder =
hidesMessages && !_olderHistoryExhausted;
return EmptyState(
icon: widget.channel.isPublicChannel
? Icons.public
@@ -577,6 +627,18 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
)
: widget.channel.name,
),
// Past the automatic page cap, filtered messages may
// still hide older conversation: let the user ask.
action: canLoadOlder
? FilledButton.tonal(
onPressed: _isLoadingOlder
? null
: _loadOlderHiddenHistory,
child: Text(
context.l10n.chat_loadOlderMessages,
),
)
: null,
);
}