@@ -12,6 +12,7 @@ import 'compose.dart';
12
12
import 'emoji.dart' ;
13
13
import 'narrow.dart' ;
14
14
import 'store.dart' ;
15
+ import 'user.dart' ;
15
16
16
17
extension ComposeContentAutocomplete on ComposeContentController {
17
18
AutocompleteIntent <ComposeAutocompleteQuery >? autocompleteIntent () {
@@ -449,6 +450,8 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
449
450
required PerAccountStore store,
450
451
required Narrow narrow,
451
452
}) {
453
+ // return store.allUsers.whereNot((user) => store.isUserMuted(user.userId)).toList()
454
+ // ..sort(_comparator(store: store, narrow: narrow));
452
455
return store.allUsers.toList ()
453
456
..sort (_comparator (store: store, narrow: narrow));
454
457
}
@@ -649,7 +652,7 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
649
652
}
650
653
651
654
MentionAutocompleteResult ? _testUser (MentionAutocompleteQuery query, User user) {
652
- if (query.testUser (user, store.autocompleteViewManager.autocompleteDataCache)) {
655
+ if (query.testUser (user, store.autocompleteViewManager.autocompleteDataCache, store )) {
653
656
return UserMentionAutocompleteResult (userId: user.userId);
654
657
}
655
658
return null ;
@@ -754,9 +757,10 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {
754
757
|| wildcardOption.localizedCanonicalString (localizations).contains (_lowercase);
755
758
}
756
759
757
- bool testUser (User user, AutocompleteDataCache cache) {
760
+ bool testUser (User user, AutocompleteDataCache cache, UserStore userStore ) {
758
761
// TODO(#236) test email too, not just name
759
762
if (! user.isActive) return false ;
763
+ if (userStore.isUserMuted (user.userId)) return false ;
760
764
761
765
return _testName (user, cache);
762
766
}
0 commit comments