Skip to content

Commit a85f423

Browse files
committed
Add back in isSameDomainAsMe
1 parent 3664c35 commit a85f423

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

spec/time-override.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class TimeOverride
8888

8989
@_fakeSetInterval = (callback, ms) =>
9090
id = ++@intervalCount
91-
action = ->
91+
action = =>
9292
callback()
9393
@intervalTimeouts[id] = @_fakeSetTimeout(action, ms)
9494
@intervalTimeouts[id] = @_fakeSetTimeout(action, ms)

src/flux/models/contact.coffee

+5
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ class Contact extends Model
112112
account = AccountStore.accountForEmail(@email)
113113
return account?
114114

115+
hasSameDomainAsMe: ->
116+
for myEmail in AccountStore.emailAddresses()
117+
return true if Utils.emailsHaveSameDomain(@email, myEmail)
118+
return false
119+
115120
isMePhrase: ({includeAccountLabel, forceAccountLabel} = {}) ->
116121
account = AccountStore.accountForEmail(@email)
117122
return null unless account

src/flux/stores/account-store.coffee

+5
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ class AccountStore extends NylasStore
242242
return @accountForId(alias.accountId)
243243
return null
244244

245+
emailAddresses: ->
246+
addresses = _.pluck((@accounts() ? []), "emailAddress")
247+
addresses = addresses.concat(_.pluck((@aliases() ? [])), "email")
248+
return addresses
249+
245250
# Public: Returns the {Account} for the given account id, or null.
246251
accountForId: (id) =>
247252
@_cachedGetter "accountForId:#{id}", => _.findWhere(@_accounts, {id})

src/pro

Submodule pro updated from f75570d to 197c2a6

0 commit comments

Comments
 (0)