Fahim
/
Tusker
forked from shadowfacts/Tusker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prioritize followed/following accounts in mention suggestions

This commit is contained in:
Shadowfacts 2020-10-14 19:28:32 -04:00
parent 288f855e2f
commit 08045dd1e9
Signed by untrusted user: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tusker/Screens/Compose/ComposeAutocompleteView.swift
View File

@ -143,9 +143,12 @@ struct ComposeAutocompleteMentionsView: View {
localSearchWorkItem.cancel()
// if the query has changed, don't bother loading the now-outdated results
if case .mention(query) = uiState.autocompleteState {
self.loadAccounts(accounts.map { .pachyderm($0) }, query: query)
// dispatch back to the main thread because loadAccounts uses CoreData
DispatchQueue.main.async {
// if the query has changed, don't bother loading the now-outdated results
if case .mention(query) = uiState.autocompleteState {
self.loadAccounts(accounts.map { .pachyderm($0) }, query: query)
}
}
}
}
@ -161,8 +164,20 @@ struct ComposeAutocompleteMentionsView: View {
return res
}
.filter(\.1.matched)
// todo: it would be nice to prioritize followee/follower accounts, but relationships aren't cached
.sorted { $0.1.score > $1.1.score }
.map { (account, res) -> (EitherAccount, Int) in
// give higher weight to accounts that the user follows or is followed by
var score = res.score
if let relationship = mastodonController.persistentContainer.relationship(forAccount: account.id) {
if relationship.following {
score += 3
}
if relationship.followedBy {
score += 2
}
}
return (account, score)
}
.sorted { $0.1 > $1.1 }
.map(\.0)
}