Mute muted users (Chris's revision, 2 of 2)

assets/l10n/app_en.arb

@@ -1007,17 +1007,13 @@
   "@noEarlierMessages": {
     "description": "Text to show at the start of a message list if there are no earlier messages."
   },
-  "mutedSender": "Muted sender",
-  "@mutedSender": {
-    "description": "Name for a muted user to display in message list."
-  },
-  "revealButtonLabel": "Reveal message for muted sender",
+  "revealButtonLabel": "Reveal message",
   "@revealButtonLabel": {
     "description": "Label for the button revealing hidden message from a muted sender in message list."
   },
   "mutedUser": "Muted user",
   "@mutedUser": {
-    "description": "Name for a muted user to display all over the app."
+    "description": "Text to display in place of a muted user's name."
   },
   "scrollToBottomTooltip": "Scroll to bottom",
   "@scrollToBottomTooltip": {

assets/l10n/app_pl.arb

@@ -1089,10 +1089,6 @@
   "@mutedSender": {
     "description": "Name for a muted user to display in message list."
   },
-  "revealButtonLabel": "Odsłoń wiadomość od wyciszonego użytkownika",
-  "@revealButtonLabel": {
-    "description": "Label for the button revealing hidden message from a muted sender in message list."
-  },
   "mutedUser": "Wyciszony użytkownik",
   "@mutedUser": {
     "description": "Name for a muted user to display all over the app."

assets/l10n/app_ru.arb

@@ -1081,10 +1081,6 @@
   "@mutedSender": {
     "description": "Name for a muted user to display in message list."
   },
-  "revealButtonLabel": "Показать сообщение отключенного отправителя",
-  "@revealButtonLabel": {
-    "description": "Label for the button revealing hidden message from a muted sender in message list."
-  },
   "mutedUser": "Отключенный пользователь",
   "@mutedUser": {
     "description": "Name for a muted user to display all over the app."

lib/generated/l10n/zulip_localizations.dart

@@ -1499,19 +1499,13 @@ abstract class ZulipLocalizations {
   /// **'No earlier messages'**
   String get noEarlierMessages;
 
-  /// Name for a muted user to display in message list.
-  ///
-  /// In en, this message translates to:
-  /// **'Muted sender'**
-  String get mutedSender;
-
   /// Label for the button revealing hidden message from a muted sender in message list.
   ///
   /// In en, this message translates to:
-  /// **'Reveal message for muted sender'**
+  /// **'Reveal message'**
   String get revealButtonLabel;
 
-  /// Name for a muted user to display all over the app.
+  /// Text to display in place of a muted user's name.
   ///
   /// In en, this message translates to:
   /// **'Muted user'**

lib/generated/l10n/zulip_localizations_ar.dart

@@ -820,10 +820,7 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
   String get noEarlierMessages => 'No earlier messages';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/generated/l10n/zulip_localizations_de.dart

@@ -820,10 +820,7 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
   String get noEarlierMessages => 'No earlier messages';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/generated/l10n/zulip_localizations_en.dart

@@ -820,10 +820,7 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
   String get noEarlierMessages => 'No earlier messages';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/generated/l10n/zulip_localizations_ja.dart

@@ -820,10 +820,7 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
   String get noEarlierMessages => 'No earlier messages';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/generated/l10n/zulip_localizations_nb.dart

@@ -820,10 +820,7 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
   String get noEarlierMessages => 'No earlier messages';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/generated/l10n/zulip_localizations_pl.dart

@@ -833,10 +833,7 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
   String get noEarlierMessages => 'Brak historii';
 
   @override
-  String get mutedSender => 'Wyciszony nadawca';
-
-  @override
-  String get revealButtonLabel => 'Odsłoń wiadomość od wyciszonego użytkownika';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Wyciszony użytkownik';

lib/generated/l10n/zulip_localizations_ru.dart

@@ -835,10 +835,7 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
   String get noEarlierMessages => 'Предшествующих сообщений нет';
 
   @override
-  String get mutedSender => 'Отключенный отправитель';
-
-  @override
-  String get revealButtonLabel => 'Показать сообщение отключенного отправителя';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Отключенный пользователь';

lib/generated/l10n/zulip_localizations_sk.dart

@@ -822,10 +822,7 @@ class ZulipLocalizationsSk extends ZulipLocalizations {
   String get noEarlierMessages => 'No earlier messages';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/generated/l10n/zulip_localizations_uk.dart

@@ -834,10 +834,7 @@ class ZulipLocalizationsUk extends ZulipLocalizations {
   String get noEarlierMessages => 'Немає попередніх повідомлень';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/generated/l10n/zulip_localizations_zh.dart

@@ -820,10 +820,7 @@ class ZulipLocalizationsZh extends ZulipLocalizations {
   String get noEarlierMessages => 'No earlier messages';
 
   @override
-  String get mutedSender => 'Muted sender';
-
-  @override
-  String get revealButtonLabel => 'Reveal message for muted sender';
+  String get revealButtonLabel => 'Reveal message';
 
   @override
   String get mutedUser => 'Muted user';

lib/model/autocomplete.dart

@@ -12,6 +12,7 @@ import 'compose.dart';
 import 'emoji.dart';
 import 'narrow.dart';
 import 'store.dart';
+import 'user.dart';
 
 extension ComposeContentAutocomplete on ComposeContentController {
   AutocompleteIntent<ComposeAutocompleteQuery>? autocompleteIntent() {
@@ -648,7 +649,7 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
   }
 
   MentionAutocompleteResult? _testUser(MentionAutocompleteQuery query, User user) {
-    if (query.testUser(user, store.autocompleteViewManager.autocompleteDataCache)) {
+    if (query.testUser(user, store.autocompleteViewManager.autocompleteDataCache, store)) {
       return UserMentionAutocompleteResult(userId: user.userId);
     }
     return null;
@@ -753,9 +754,10 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {
       || wildcardOption.localizedCanonicalString(localizations).contains(_lowercase);
   }
 
-  bool testUser(User user, AutocompleteDataCache cache) {
+  bool testUser(User user, AutocompleteDataCache cache, UserStore store) {
     // TODO(#236) test email too, not just name
     if (!user.isActive) return false;
+    if (store.isUserMuted(user.userId)) return false;
 
     return _testName(user, cache);
   }

lib/model/channel.dart

@@ -69,10 +69,10 @@ mixin ChannelStore {
 
   /// Whether the given event will change the result of [isTopicVisibleInStream]
   /// for its stream and topic, compared to the current state.
-  VisibilityEffect willChangeIfTopicVisibleInStream(UserTopicEvent event) {
+  UserTopicVisibilityEffect willChangeIfTopicVisibleInStream(UserTopicEvent event) {
     final streamId = event.streamId;
     final topic = event.topicName;
-    return VisibilityEffect._fromBeforeAfter(
+    return UserTopicVisibilityEffect._fromBeforeAfter(
       _isTopicVisibleInStream(topicVisibilityPolicy(streamId, topic)),
       _isTopicVisibleInStream(event.visibilityPolicy));
   }
@@ -106,10 +106,10 @@ mixin ChannelStore {
 
   /// Whether the given event will change the result of [isTopicVisible]
   /// for its stream and topic, compared to the current state.
-  VisibilityEffect willChangeIfTopicVisible(UserTopicEvent event) {
+  UserTopicVisibilityEffect willChangeIfTopicVisible(UserTopicEvent event) {
     final streamId = event.streamId;
     final topic = event.topicName;
-    return VisibilityEffect._fromBeforeAfter(
+    return UserTopicVisibilityEffect._fromBeforeAfter(
       _isTopicVisible(streamId, topicVisibilityPolicy(streamId, topic)),
       _isTopicVisible(streamId, event.visibilityPolicy));
   }
@@ -137,7 +137,7 @@ mixin ChannelStore {
 /// Whether and how a given [UserTopicEvent] will affect the results
 /// that [ChannelStore.isTopicVisible] or [ChannelStore.isTopicVisibleInStream]
 /// would give for some messages.
-enum VisibilityEffect {
+enum UserTopicVisibilityEffect {
   /// The event will have no effect on the visibility results.
   none,
 
@@ -147,11 +147,11 @@ enum VisibilityEffect {
   /// The event will change some visibility results from false to true.
   unmuted;
 
-  factory VisibilityEffect._fromBeforeAfter(bool before, bool after) {
+  factory UserTopicVisibilityEffect._fromBeforeAfter(bool before, bool after) {
     return switch ((before, after)) {
-      (false, true) => VisibilityEffect.unmuted,
-      (true, false) => VisibilityEffect.muted,
-      _             => VisibilityEffect.none,
+      (false, true) => UserTopicVisibilityEffect.unmuted,
+      (true, false) => UserTopicVisibilityEffect.muted,
+      _             => UserTopicVisibilityEffect.none,
     };
   }
 }

lib/model/compose.dart

@@ -130,14 +130,33 @@ String wrapWithBacktickFence({required String content, String? infoString}) {
 /// To omit the user ID part ("|13313") whenever the name part is unambiguous,
 /// pass the full UserStore.  This means accepting a linear scan
 /// through all users; avoid it in performance-sensitive codepaths.
+///
+/// See also [userMentionFromMessage].
 String userMention(User user, {bool silent = false, UserStore? users}) {
   bool includeUserId = users == null
     || users.allUsers.where((u) => u.fullName == user.fullName)
          .take(2).length == 2;
-
-  return '@${silent ? '_' : ''}**${user.fullName}${includeUserId ? '|${user.userId}' : ''}**';
+  return _userMentionImpl(
+    silent: silent,
+    fullName: user.fullName,
+    userId: includeUserId ? user.userId : null);
 }
 
+/// An @-mention of an individual user, like @**Chris Bobbe|13313**,
+/// from sender data in a [Message].
+///
+/// The user ID part ("|13313") is always included.
+///
+/// See also [userMention].
+String userMentionFromMessage(Message message, {bool silent = false, required UserStore users}) =>
+  _userMentionImpl(
+    silent: silent,
+    fullName: users.senderDisplayName(message, replaceIfMuted: false),
+    userId: message.senderId);
+
+String _userMentionImpl({required bool silent, required String fullName, int? userId}) =>
+  '@${silent ? '_' : ''}**$fullName${userId != null ? '|$userId' : ''}**';
+
 /// An @-mention of all the users in a conversation, like @**channel**.
 String wildcardMention(WildcardMentionOption wildcardOption, {
   required PerAccountStore store,
@@ -190,13 +209,11 @@ String quoteAndReplyPlaceholder(
   PerAccountStore store, {
   required Message message,
 }) {
-  final sender = store.getUser(message.senderId);
-  assert(sender != null); // TODO(#716): should use `store.senderDisplayName`
   final url = narrowLink(store,
     SendableNarrow.ofMessage(message, selfUserId: store.selfUserId),
     nearMessageId: message.id);
-  // See note in [quoteAndReply] about asking `mention` to omit the |<id> part.
-  return '${userMention(sender!, silent: true)} ${inlineLink('said', url)}: ' // TODO(#1285)
+  return '${userMentionFromMessage(message, silent: true, users: store)} '
+    '${inlineLink('said', url)}: ' // TODO(#1285)
     '*${zulipLocalizations.composeBoxLoadingMessage(message.id)}*\n';
 }
 
@@ -212,14 +229,14 @@ String quoteAndReply(PerAccountStore store, {
   required Message message,
   required String rawContent,
 }) {
-  final sender = store.getUser(message.senderId);
-  assert(sender != null); // TODO(#716): should use `store.senderDisplayName`
   final url = narrowLink(store,
     SendableNarrow.ofMessage(message, selfUserId: store.selfUserId),
     nearMessageId: message.id);
-    // Could ask `mention` to omit the |<id> part unless the mention is ambiguous…
-    // but that would mean a linear scan through all users, and the extra noise
-    // won't much matter with the already probably-long message link in there too.
-    return '${userMention(sender!, silent: true)} ${inlineLink('said', url)}:\n' // TODO(#1285)
-      '${wrapWithBacktickFence(content: rawContent, infoString: 'quote')}';
+  // Could ask userMentionFromMessage to omit the |<id> part unless the mention
+  // is ambiguous… but that would mean a linear scan through all users,
+  // and the extra noise won't much matter with the already probably-long
+  // message link in there too.
+  return '${userMentionFromMessage(message, silent: true, users: store)} '
+    '${inlineLink('said', url)}:\n' // TODO(#1285)
+    '${wrapWithBacktickFence(content: rawContent, infoString: 'quote')}';
 }

lib/model/message.dart

@@ -287,6 +287,12 @@ class MessageStoreImpl extends PerAccountStoreBase with MessageStore, _OutboxMes
     }
   }
 
+  void handleMutedUsersEvent(MutedUsersEvent event) {
+    for (final view in _messageListViews) {
+      view.handleMutedUsersEvent(event);
+    }
+  }
+
   void handleMessageEvent(MessageEvent event) {
     // If the message is one we already know about (from a fetch),
     // clobber it with the one from the event system.