Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-21 07:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Participant sidebar shouldn’t query by name, table is uniqued on email+acct

Browse source
This commit is contained in:
Ben Gotow 2017-07-11 22:18:55 -07:00
parent 7171513053
commit d8d150603b
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/client-app/src/flux/mailsync-bridge.es6
View file

@ -35,7 +35,6 @@ export default class MailsyncBridge {
const clientsToStop = Object.assign({}, this.clients);
for (const acct of AccountStore.accounts()) {
console.log(JSON.stringify(acct));
if (!this.clients[acct.id]) {
toLaunch.push(acct);
} else {

25
packages/client-app/src/flux/stores/focused-contacts-store.es6
View file

@ -59,9 +59,12 @@ class FocusedContactsStore extends NylasStore {
}
_clearCurrentParticipants() {
if (this._unsubFocusedContact) {
this._unsubFocusedContact.dispose();
this._unsubFocusedContact = null;
}
this._contactScores = {};
this._currentContacts = [];
if (this._unsubFocusedContact) this._unsubFocusedContact.dispose();
this._unsubFocusedContact = null;
this._currentFocusedContact = null;
this._currentThread = null;
@ -69,19 +72,24 @@ class FocusedContactsStore extends NylasStore {
}
_onFocusContact = (contact) => {
if (this._unsubFocusedContact) this._unsubFocusedContact.dispose();
this._unsubFocusedContact = null;
if (this._unsubFocusedContact) {
this._unsubFocusedContact.dispose();
this._unsubFocusedContact = null;
}
this._currentParticipantThreads = [];
if (contact) {
if (contact && contact.email) {
const query = DatabaseStore.findBy(Contact, {
accountId: this._currentThread.accountId,
email: contact.email,
name: contact.name,
});
this._unsubFocusedContact = Rx.Observable.fromQuery(query).subscribe(match => {
this._unsubFocusedContact = Rx.Observable.fromQuery(query).subscribe((match) => {
if (match) {
match.name = contact.name; // always show the name from the current email
}
this._currentFocusedContact = match || contact;
return this._triggerLater();
this._triggerLater();
});
this._loadCurrentParticipantThreads();
} else {
@ -96,9 +104,8 @@ class FocusedContactsStore extends NylasStore {
if (!email) {
return
}
const parsedQuery = SearchQueryParser.parse(`from:${email}`);
DatabaseStore.findAll(Thread)
.structuredSearch(parsedQuery)
.structuredSearch(SearchQueryParser.parse(`from:${email}`))
.limit(100).background()
.then((threads = []) => {
if (currentContact.email !== email) {