ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Once again improved Siri contacts resolving

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-08-11 00:11:06 +03:00
parent fae73d12e8
commit d4247feacb
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
SiriIntents/IntentHandler.swift
View File

@@ -202,11 +202,6 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
return
}
if filteredPersons.count > 1 {
completion([.disambiguation(filteredPersons)])
return
}
var allPersonsAlreadyMatched = true
for person in filteredPersons {
if !(person.customIdentifier ?? "").hasPrefix("tg") {
@@ -215,7 +210,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
}
}
if allPersonsAlreadyMatched {
if allPersonsAlreadyMatched && filteredPersons.count == 1 {
completion([.success(filteredPersons[0])])
return
}
@@ -239,29 +234,31 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
let account = self.accountPromise.get()
let signal = matchingDeviceContacts(stableIds: stableIds)
|> take(1)
|> mapToSignal { matchedContacts in
return account
|> introduceError(IntentContactsError.self)
|> mapToSignal { account -> Signal<[(String, TelegramUser)], IntentContactsError> in
if let account = account {
return matchingCloudContacts(postbox: account.postbox, contacts: matchedContacts)
|> introduceError(IntentContactsError.self)
} else {
return .fail(.generic)
}
}
|> take(1)
|> mapToSignal { matchedContacts in
return account
|> introduceError(IntentContactsError.self)
|> mapToSignal { account -> Signal<[(String, TelegramUser)], IntentContactsError> in
if let account = account {
return matchingCloudContacts(postbox: account.postbox, contacts: matchedContacts)
|> introduceError(IntentContactsError.self)
} else {
return .fail(.generic)
}
}
}
self.resolvePersonsDisposable.set((signal
|> deliverOnMainQueue).start(next: { peers in
if peers.isEmpty {
completion([.needsValue])
} else {
completion(peers.map { .success(personWithUser(stableId: $0, user: $1)) })
}
}, error: { error in
completion([.skip])
}))
|> deliverOnMainQueue).start(next: { peers in
if peers.isEmpty {
completion([.noResult])
} else if peers.count == 1 {
completion(peers.map { .success(personWithUser(stableId: $0, user: $1)) })
} else {
completion([.disambiguation(peers.map { (personWithUser(stableId: $0, user: $1)) })])
}
}, error: { error in
completion([.skip])
}))
}
// MARK: - INSendMessageIntentHandling