zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity

Update server-list-sorting during onboarding (IOS-116) (#956)

This commit is contained in:
Nathan Mattes 2023-02-25 12:35:29 +01:00 committed by GitHub
parent eb0c0f395c
commit 75e1dc3abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift
View File

@ -126,45 +126,20 @@ extension MastodonPickServerViewModel {
}
)
.map { indexedServers, selectCategoryItem, searchText, filters -> [Mastodon.Entity.Server] in
// ignore approval required servers when sign-up
var indexedServers = indexedServers
// Note:
// sort by calculate last week users count
// and make medium size (~800) server to top
// group by language user preferred language first
var languageToServersMapping = OrderedDictionary<String, [Mastodon.Entity.Server]>()
for language in Locale.preferredLanguages {
let local = Locale(identifier: language)
guard let languageCode = local.languageCode else { continue }
// skip if key duplicate
guard !languageToServersMapping.keys.contains(languageCode) else { continue }
// append to dict
languageToServersMapping[languageCode] = indexedServers
.filter { $0.language.lowercased() == languageCode.lowercased() }
.sorted(by: { lh, rh in
let lhValue = abs(log2(800.0) - log2(Double(lh.lastWeekUsers)))
let rhValue = abs(log2(800.0) - log2(Double(rh.lastWeekUsers)))
return lhValue < rhValue
})
}
// sort remains servers
let remainsServers = indexedServers
.filter { server in
return !languageToServersMapping.contains { _, servers in servers.contains(server) }
}
.sorted(by: { lh, rh in
let lhValue = abs(log2(800.0) - log2(Double(lh.lastWeekUsers)))
let rhValue = abs(log2(800.0) - log2(Double(rh.lastWeekUsers)))
return lhValue < rhValue
})
var _indexedServers: [Mastodon.Entity.Server] = []
for key in languageToServersMapping.keys {
_indexedServers.append(contentsOf: languageToServersMapping[key] ?? [])
}
_indexedServers.append(contentsOf: remainsServers)
let sortedInstantSignupServers = indexedServers
.filter { $0.approvalRequired == false }
.sorted { $0.lastWeekUsers >= $1.lastWeekUsers }
let sortedApprovalRequiredServers = indexedServers
.filter { $0.approvalRequired }
.sorted { $0.lastWeekUsers >= $1.lastWeekUsers }
_indexedServers.append(contentsOf: sortedInstantSignupServers)
_indexedServers.append(contentsOf: sortedApprovalRequiredServers)
if _indexedServers.count == indexedServers.count {
indexedServers = _indexedServers
} else {