nostr/damus
1
0
Fork 0
mirror of git://jb55.com/damus synced 2024-09-30 00:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2199 from tyiu/tyiu/search-profile-sort

Browse Source 
Refactor UserSearch profile sorting so that it can be used in SearchResultsView
This commit is contained in:
Daniel D’Aquino 2024-05-03 13:14:16 -07:00 committed by GitHub
commit fc8f211da2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
damus/Views/Posting/UserSearch.swift
View File

@ -18,17 +18,7 @@ struct UserSearch: View {
var users: [Pubkey] { var users: [Pubkey] {
guard let txn = NdbTxn(ndb: damus_state.ndb) else { return [] } guard let txn = NdbTxn(ndb: damus_state.ndb) else { return [] }
return search_profiles(profiles: damus_state.profiles, search: search, txn: txn).sorted { a, b in return search_profiles(profiles: damus_state.profiles, contacts: damus_state.contacts, search: search, txn: txn)
let aFriendTypePriority = get_friend_type(contacts: damus_state.contacts, pubkey: a)?.priority ?? 0
let bFriendTypePriority = get_friend_type(contacts: damus_state.contacts, pubkey: b)?.priority ?? 0
if aFriendTypePriority > bFriendTypePriority {
// `a` should be sorted before `b`
return true
} else {
return false
}
}
} }
func on_user_tapped(pk: Pubkey) { func on_user_tapped(pk: Pubkey) {

22
damus/Views/SearchResultsView.swift
View File

@ -113,11 +113,11 @@ struct SearchResultsView: View {
.frame(maxHeight: .infinity) .frame(maxHeight: .infinity)
.onAppear { .onAppear {
guard let txn = NdbTxn.init(ndb: damus_state.ndb) else { return } guard let txn = NdbTxn.init(ndb: damus_state.ndb) else { return }
self.result = search_for_string(profiles: damus_state.profiles, search: search, txn: txn) self.result = search_for_string(profiles: damus_state.profiles, contacts: damus_state.contacts, search: search, txn: txn)
} }
.onChange(of: search) { new in .onChange(of: search) { new in
guard let txn = NdbTxn.init(ndb: damus_state.ndb) else { return } guard let txn = NdbTxn.init(ndb: damus_state.ndb) else { return }
self.result = search_for_string(profiles: damus_state.profiles, search: search, txn: txn) self.result = search_for_string(profiles: damus_state.profiles, contacts: damus_state.contacts, search: search, txn: txn)
} }
} }
} }
@ -131,7 +131,7 @@ struct SearchResultsView_Previews: PreviewProvider {
*/ */
func search_for_string<Y>(profiles: Profiles, search new: String, txn: NdbTxn<Y>) -> Search? { func search_for_string<Y>(profiles: Profiles, contacts: Contacts, search new: String, txn: NdbTxn<Y>) -> Search? {
guard new.count != 0 else { guard new.count != 0 else {
return nil return nil
} }
@ -174,7 +174,7 @@ func search_for_string<Y>(profiles: Profiles, search new: String, txn: NdbTxn<Y>
return .naddr(naddr) return .naddr(naddr)
} }
let multisearch = MultiSearch(hashtag: make_hashtagable(searchQuery), profiles: search_profiles(profiles: profiles, search: new, txn: txn)) let multisearch = MultiSearch(hashtag: make_hashtagable(searchQuery), profiles: search_profiles(profiles: profiles, contacts: contacts, search: new, txn: txn))
return .multi(multisearch) return .multi(multisearch)
} }
@ -191,7 +191,7 @@ func make_hashtagable(_ str: String) -> String {
return String(new.filter{$0 != " "}) return String(new.filter{$0 != " "})
} }
func search_profiles<Y>(profiles: Profiles, search: String, txn: NdbTxn<Y>) -> [Pubkey] { func search_profiles<Y>(profiles: Profiles, contacts: Contacts, search: String, txn: NdbTxn<Y>) -> [Pubkey] {
// Search by hex pubkey. // Search by hex pubkey.
if let pubkey = hex_decode_pubkey(search), if let pubkey = hex_decode_pubkey(search),
profiles.lookup_key_by_pubkey(pubkey) != nil profiles.lookup_key_by_pubkey(pubkey) != nil
@ -208,8 +208,16 @@ func search_profiles<Y>(profiles: Profiles, search: String, txn: NdbTxn<Y>) -> [
return [pk] return [pk]
} }
let new = search.lowercased() return profiles.search(search, limit: 10, txn: txn).sorted { a, b in
let aFriendTypePriority = get_friend_type(contacts: contacts, pubkey: a)?.priority ?? 0
let bFriendTypePriority = get_friend_type(contacts: contacts, pubkey: b)?.priority ?? 0
return profiles.search(search, limit: 10, txn: txn) if aFriendTypePriority > bFriendTypePriority {
// `a` should be sorted before `b`
return true
} else {
return false
}
}
} }