Skip to content

Commit fd51498

Browse files
committed
autocomplete [nfc]: Cut separate cache param on testUser, reuse store
Since 9815022, this method already takes the whole store, which it uses in order to identify muted users. So it can get the autocomplete-data cache from the store just as well as its caller can.
1 parent 2d217a0 commit fd51498

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

lib/model/autocomplete.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import 'compose.dart';
1212
import 'emoji.dart';
1313
import 'narrow.dart';
1414
import 'store.dart';
15-
import 'user.dart';
1615

1716
extension ComposeContentAutocomplete on ComposeContentController {
1817
AutocompleteIntent<ComposeAutocompleteQuery>? autocompleteIntent() {
@@ -649,7 +648,7 @@ class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery,
649648
}
650649

651650
MentionAutocompleteResult? _testUser(MentionAutocompleteQuery query, User user) {
652-
return query.testUser(user, store.autocompleteViewManager.autocompleteDataCache, store);
651+
return query.testUser(user, store);
653652
}
654653

655654
@override
@@ -753,10 +752,11 @@ class MentionAutocompleteQuery extends ComposeAutocompleteQuery {
753752
return WildcardMentionAutocompleteResult(wildcardOption: wildcardOption);
754753
}
755754

756-
MentionAutocompleteResult? testUser(User user, AutocompleteDataCache cache, UserStore store) {
755+
MentionAutocompleteResult? testUser(User user, PerAccountStore store) {
757756
if (!user.isActive) return null;
758757
if (store.isUserMuted(user.userId)) return null;
759758

759+
final cache = store.autocompleteViewManager.autocompleteDataCache;
760760
// TODO(#236) test email too, not just name
761761
if (!_testName(user, cache)) return null;
762762

test/model/autocomplete_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,7 @@ void main() {
407407
late PerAccountStore store;
408408

409409
void doCheck(String rawQuery, User user, bool expected) {
410-
final result = MentionAutocompleteQuery(rawQuery)
411-
.testUser(user, AutocompleteDataCache(), store);
410+
final result = MentionAutocompleteQuery(rawQuery).testUser(user, store);
412411
expected
413412
? check(result).isA<UserMentionAutocompleteResult>()
414413
: check(result).isNull();

0 commit comments

Comments
 (0)