|
@@ -22,7 +22,7 @@ const sandstormBoard = {
|
|
|
|
|
|
if (isSandstorm && Meteor.isServer) {
|
|
|
const fs = require('fs');
|
|
|
- const Capnp = require("/node_modules/capnp.js");
|
|
|
+ const Capnp = require('capnp');
|
|
|
const Package = Capnp.importSystem('sandstorm/package.capnp');
|
|
|
const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp');
|
|
|
const Identity = Capnp.importSystem('sandstorm/identity.capnp');
|
|
@@ -73,7 +73,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;
|
|
@@ -113,9 +113,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
|
|
@@ -130,7 +130,7 @@ if (isSandstorm && Meteor.isServer) {
|
|
|
|
|
|
return session.activity(event);
|
|
|
}).then(() => done(),
|
|
|
- (e) => done(e));
|
|
|
+ (e) => done(e));
|
|
|
})();
|
|
|
}
|
|
|
|