diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-18 16:22:53 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-05-18 16:22:53 +0300 |
commit | 50f751e0a9f8214d690f6fd39136d09a46a8e69a (patch) | |
tree | 3a0e58883030abbfa8eb454d181356a8be299d79 /sandstorm.js | |
parent | 61b240d126bcce7adcdb303c5b01a202dc7fa395 (diff) | |
parent | 1984a6b1c80dbd8b4eff89aa92913f943bacc63b (diff) | |
download | wekan-50f751e0a9f8214d690f6fd39136d09a46a8e69a.tar.gz wekan-50f751e0a9f8214d690f6fd39136d09a46a8e69a.tar.bz2 wekan-50f751e0a9f8214d690f6fd39136d09a46a8e69a.zip |
Merge branch 'devel' into greenkeeper/initial
Diffstat (limited to 'sandstorm.js')
-rw-r--r-- | sandstorm.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sandstorm.js b/sandstorm.js index 3ea85fef..d34bc015 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -75,7 +75,7 @@ if (isSandstorm && Meteor.isServer) { session.claimRequest(token).then((response) => { const identity = response.cap.castAs(Identity.Identity); const promises = [api.getIdentityId(identity), identity.getProfile(), - httpBridge.saveIdentity(identity)]; + httpBridge.saveIdentity(identity)]; return Promise.all(promises).then((responses) => { const identityId = responses[0].id.toString('hex').slice(0, 32); const profile = responses[1].profile; @@ -115,9 +115,9 @@ if (isSandstorm && Meteor.isServer) { const identity = response.identity; return identity.getProfile().then(() => { return { identity, - mentioned: !!user.mentioned, - subscribed: !!user.subscribed, - }; + mentioned: !!user.mentioned, + subscribed: !!user.subscribed, + }; }); }).catch(() => { // Ignore identities that fail to restore. Either they were added before we set @@ -132,7 +132,7 @@ if (isSandstorm && Meteor.isServer) { return session.activity(event); }).then(() => done(), - (e) => done(e)); + (e) => done(e)); })(); } |