ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-05 13:55:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include urbit/talk#41

Browse Source
This commit is contained in:
Fang 2017-12-16 16:37:49 +01:00
parent 0c02b4a0b1
commit e5ed1662d6
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
web/talk/main.js
View File

@ -1212,7 +1212,7 @@ module.exports = recl({
return;
}
if (this.props['audience-lock'] != null) {
audi = _.union(audi, ["~" + window.urb.ship + "/" + this.props.station]);
audi = ["~" + window.urb.ship + "/" + this.props.station];
}
audi = this.addCC(audi);
txt = this.$message.text().trim().replace(/\xa0/g, ' ');
@ -1542,18 +1542,12 @@ TreeActions.registerComponent("talk-station", StationComponent);
},{"./actions/StationActions.coffee":2,"./components/MessageListComponent.coffee":6,"./components/StationComponent.coffee":7,"./components/WritingComponent.coffee":8,"./util.coffee":15}],11:[function(require,module,exports){
var send, util;
var util;
util = require('../util.coffee');
window.urb.appl = "hall";
send = function(data, cb) {
return window.urb.send(data, {
mark: "hall-action"
}, cb);
};
module.exports = function(arg) {
var MessageActions;
MessageActions = arg.MessageActions;
@ -1624,15 +1618,31 @@ module.exports = function(arg) {
});
},
sendMessage: function(message, cb) {
return send({
convey: [message]
}, function(err, res) {
console.log('sent');
console.log(arguments);
if (cb) {
return cb(err, res);
}
});
if (window.urb.user === window.urb.ship) {
return window.urb.send({
convey: [message]
}, {
mark: "hall-action"
}, function(err, res) {
console.log('sent local');
console.log(arguments);
if (cb) {
return cb(err, res);
}
});
} else {
return window.urb.send({
publish: [message]
}, {
mark: "hall-command"
}, function(err, res) {
console.log('sent remote');
console.log(arguments);
if (cb) {
return cb(err, res);
}
});
}
}
};
};