From 380f878d8193accdc294874213e318ca25c0dfbb Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Fri, 10 Nov 2023 14:42:48 -0500 Subject: [PATCH] Use server language preference for default search token suggestion --- Tusker/Screens/Search/MastodonSearchController.swift | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tusker/Screens/Search/MastodonSearchController.swift b/Tusker/Screens/Search/MastodonSearchController.swift index d227d0dc..d766647b 100644 --- a/Tusker/Screens/Search/MastodonSearchController.swift +++ b/Tusker/Screens/Search/MastodonSearchController.swift @@ -65,12 +65,13 @@ class MastodonSearchController: UISearchController { searchText.isEmpty || $0.contains(searchText) })) - // TODO: use default language from preferences var langSuggestions = [String]() - if searchText.isEmpty || "language:en".contains(searchText) { - langSuggestions.append("language:en") + let defaultLanguage = searchResultsController.mastodonController.accountPreferences.serverDefaultLanguage ?? "en" + let languageToken = "language:\(defaultLanguage)" + if searchText.isEmpty || languageToken.contains(searchText) { + langSuggestions.append(languageToken) } - if searchText != "en", + if searchText != defaultLanguage, let match = languageRegex.firstMatch(in: searchText, range: NSRange(location: 0, length: searchText.utf16.count)) { let identifier = (searchText as NSString).substring(with: match.range(at: 1)) if #available(iOS 16.0, *) {