mirror of
https://github.com/mastodon/mastodon-ios.git
synced 2025-02-03 18:57:46 +01:00
Change random server picking logic to require "general" category, prefer no approval and own language code (#929)
This commit is contained in:
parent
70d939c3ad
commit
fe12019370
@ -235,9 +235,37 @@ extension MastodonPickServerViewModel {
|
|||||||
let servers = indexedServers.value
|
let servers = indexedServers.value
|
||||||
guard servers.isNotEmpty else { return nil }
|
guard servers.isNotEmpty else { return nil }
|
||||||
|
|
||||||
let randomServer = servers.filter {
|
let generalServers = servers.filter {
|
||||||
$0.language.lowercased() == language
|
$0.categories.contains("general")
|
||||||
}.randomElement()
|
}
|
||||||
|
|
||||||
|
let randomServer: Mastodon.Entity.Server?
|
||||||
|
|
||||||
|
let noApprovalRequired = generalServers.filter { !$0.approvalRequired }
|
||||||
|
let approvalRequired = generalServers.filter { $0.approvalRequired }
|
||||||
|
|
||||||
|
let languageMatchesWithoutApproval = noApprovalRequired.filter { $0.language.lowercased() == language }
|
||||||
|
let languageMatchesWithApproval = approvalRequired.filter { $0.language.lowercased() == language }
|
||||||
|
let languageDoesNotMatchWithoutApproval = noApprovalRequired.filter { $0.language.lowercased() != language }
|
||||||
|
let languageDoesNotMatchWithApproval = approvalRequired.filter { $0.language.lowercased() != language }
|
||||||
|
|
||||||
|
switch (
|
||||||
|
languageMatchesWithoutApproval.isEmpty,
|
||||||
|
languageMatchesWithApproval.isEmpty,
|
||||||
|
languageDoesNotMatchWithoutApproval.isEmpty,
|
||||||
|
languageDoesNotMatchWithApproval.isEmpty
|
||||||
|
) {
|
||||||
|
case (true, true, true, true):
|
||||||
|
randomServer = generalServers.randomElement()
|
||||||
|
case (true, true, true, false):
|
||||||
|
randomServer = languageDoesNotMatchWithApproval.randomElement()
|
||||||
|
case (true, true, false, _):
|
||||||
|
randomServer = languageDoesNotMatchWithoutApproval.randomElement()
|
||||||
|
case (true, false, _, _):
|
||||||
|
randomServer = languageMatchesWithApproval.randomElement()
|
||||||
|
case (false, _, _, _):
|
||||||
|
randomServer = languageMatchesWithoutApproval.randomElement()
|
||||||
|
}
|
||||||
|
|
||||||
return randomServer ?? servers.randomElement() ?? servers.first
|
return randomServer ?? servers.randomElement() ?? servers.first
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user