diff --git a/build-buffer/common/SetIntervalMixin.js b/build-buffer/common/SetIntervalMixin.js index 70ebf9b..1df29a5 100644 --- a/build-buffer/common/SetIntervalMixin.js +++ b/build-buffer/common/SetIntervalMixin.js @@ -3,7 +3,11 @@ module.exports = SetIntervalMixin = { this.intervals = []; }, setInterval: function() { - this.intervals.push(setInterval.apply(null, arguments)); + if (arguments[1]) { + this.intervals.push(setInterval.apply(null, arguments)); + } else { + console.log("setInterval requested with malformed interval argument"); + } }, componentWillUnmount: function() { this.intervals.map(clearInterval); diff --git a/build-buffer/other/Conversation.js b/build-buffer/other/Conversation.js index 6cb732a..b1ba744 100644 --- a/build-buffer/other/Conversation.js +++ b/build-buffer/other/Conversation.js @@ -4,6 +4,7 @@ var SetIntervalMixin = require("../common/SetIntervalMixin.js"); var StreamMixin = require("../common/StreamMixin.js"); var SafeStateChangeMixin = require('../common/SafeStateChangeMixin.js'); var EventListenerMixin = require('../common/EventListenerMixin.js'); +var AppSettingsMixin = require('../common/AppSettingsMixin.js'); var ReactBootstrap = require('react-bootstrap') , NavItem = ReactBootstrap.NavItem @@ -17,6 +18,7 @@ var ReactBootstrap = require('react-bootstrap') module.exports = Timeline = React.createClass({displayName: "Timeline", mixins:[ + AppSettingsMixin, StreamMixin, SetIntervalMixin, SafeStateChangeMixin, @@ -38,7 +40,7 @@ module.exports = Timeline = React.createClass({displayName: "Timeline", //console.log(this.state.username+":post"+this.state.postid) - if (!outdatedLimit) {outdatedLimit=this.props.pollInterval/2;} + if (!outdatedLimit) {outdatedLimit=this.state.appSettings.pollInterval/2;} var thisComponent = this; var thisUsername = this.state.username; @@ -75,8 +77,8 @@ module.exports = Timeline = React.createClass({displayName: "Timeline", }, componentDidMount: function() { - this.updatePosts(2*this.props.pollInterval); - this.setInterval(this.updatePosts, this.props.pollInterval*1000); + this.updatePosts(2*this.state.appSettings.pollInterval); + this.setInterval(this.updatePosts, this.state.appSettings.pollInterval*1000); }, onnewpostbyuser: function (event) { diff --git a/build/app-bundle.js b/build/app-bundle.js index c6a6d26..dc6a321 100644 --- a/build/app-bundle.js +++ b/build/app-bundle.js @@ -702,7 +702,11 @@ module.exports = SetIntervalMixin = { this.intervals = []; }, setInterval: function() { - this.intervals.push(setInterval.apply(null, arguments)); + if (arguments[1]) { + this.intervals.push(setInterval.apply(null, arguments)); + } else { + console.log("setInterval requested with malformed interval argument"); + } }, componentWillUnmount: function() { this.intervals.map(clearInterval); @@ -1055,6 +1059,7 @@ var SetIntervalMixin = require("../common/SetIntervalMixin.js"); var StreamMixin = require("../common/StreamMixin.js"); var SafeStateChangeMixin = require('../common/SafeStateChangeMixin.js'); var EventListenerMixin = require('../common/EventListenerMixin.js'); +var AppSettingsMixin = require('../common/AppSettingsMixin.js'); var ReactBootstrap = require('react-bootstrap') , NavItem = ReactBootstrap.NavItem @@ -1068,6 +1073,7 @@ var ReactBootstrap = require('react-bootstrap') module.exports = Timeline = React.createClass({displayName: "Timeline", mixins:[ + AppSettingsMixin, StreamMixin, SetIntervalMixin, SafeStateChangeMixin, @@ -1089,7 +1095,7 @@ module.exports = Timeline = React.createClass({displayName: "Timeline", //console.log(this.state.username+":post"+this.state.postid) - if (!outdatedLimit) {outdatedLimit=this.props.pollInterval/2;} + if (!outdatedLimit) {outdatedLimit=this.state.appSettings.pollInterval/2;} var thisComponent = this; var thisUsername = this.state.username; @@ -1126,8 +1132,8 @@ module.exports = Timeline = React.createClass({displayName: "Timeline", }, componentDidMount: function() { - this.updatePosts(2*this.props.pollInterval); - this.setInterval(this.updatePosts, this.props.pollInterval*1000); + this.updatePosts(2*this.state.appSettings.pollInterval); + this.setInterval(this.updatePosts, this.state.appSettings.pollInterval*1000); }, onnewpostbyuser: function (event) { @@ -1147,7 +1153,7 @@ module.exports = Timeline = React.createClass({displayName: "Timeline", ); } }); -},{"../common/EventListenerMixin.js":3,"../common/Postboard.js":6,"../common/SafeStateChangeMixin.js":9,"../common/SetIntervalMixin.js":10,"../common/StreamMixin.js":11,"react":291,"react-bootstrap":71}],15:[function(require,module,exports){ +},{"../common/AppSettingsMixin.js":2,"../common/EventListenerMixin.js":3,"../common/Postboard.js":6,"../common/SafeStateChangeMixin.js":9,"../common/SetIntervalMixin.js":10,"../common/StreamMixin.js":11,"react":291,"react-bootstrap":71}],15:[function(require,module,exports){ var React = require('react'); var SetIntervalMixin = require("../common/SetIntervalMixin.js"); var SafeStateChangeMixin = require('../common/SafeStateChangeMixin.js'); diff --git a/build/twister-lib.js b/build/twister-lib.js index dd7fea6..b260332 100644 --- a/build/twister-lib.js +++ b/build/twister-lib.js @@ -31901,20 +31901,20 @@ TwisterPubKey.prototype.verifySignature = function (message_ori, signature_ori, message = bencode.encode(message); - signature = new Buffer(signature, 'hex'); - try { - + signature = new Buffer(signature, 'hex'); + try { var retVal = Bitcoin.Message.verify(thisPubKey.getAddress(), signature, message, twister_network); - - } catch(e) { - + } catch(e) { var retVal = false; - - thisResource._handleError({message:message}); - + thisResource._handleError({message:"verification went sideways"}); + } + } catch(e) { + var retVal = false; + thisResource._handleError({message:"signature is malformed"}) } + var compTime = Date.now()-startTime; Twister._averageSignatureCompTime = 0.9*Twister._averageSignatureCompTime + 0.1*compTime; diff --git a/jsx/common/SetIntervalMixin.js b/jsx/common/SetIntervalMixin.js index 70ebf9b..1df29a5 100644 --- a/jsx/common/SetIntervalMixin.js +++ b/jsx/common/SetIntervalMixin.js @@ -3,7 +3,11 @@ module.exports = SetIntervalMixin = { this.intervals = []; }, setInterval: function() { - this.intervals.push(setInterval.apply(null, arguments)); + if (arguments[1]) { + this.intervals.push(setInterval.apply(null, arguments)); + } else { + console.log("setInterval requested with malformed interval argument"); + } }, componentWillUnmount: function() { this.intervals.map(clearInterval); diff --git a/jsx/other/Conversation.js b/jsx/other/Conversation.js index 6c1eca4..03c6886 100644 --- a/jsx/other/Conversation.js +++ b/jsx/other/Conversation.js @@ -4,6 +4,7 @@ var SetIntervalMixin = require("../common/SetIntervalMixin.js"); var StreamMixin = require("../common/StreamMixin.js"); var SafeStateChangeMixin = require('../common/SafeStateChangeMixin.js'); var EventListenerMixin = require('../common/EventListenerMixin.js'); +var AppSettingsMixin = require('../common/AppSettingsMixin.js'); var ReactBootstrap = require('react-bootstrap') , NavItem = ReactBootstrap.NavItem @@ -17,6 +18,7 @@ var ReactBootstrap = require('react-bootstrap') module.exports = Timeline = React.createClass({ mixins:[ + AppSettingsMixin, StreamMixin, SetIntervalMixin, SafeStateChangeMixin, @@ -38,7 +40,7 @@ module.exports = Timeline = React.createClass({ //console.log(this.state.username+":post"+this.state.postid) - if (!outdatedLimit) {outdatedLimit=this.props.pollInterval/2;} + if (!outdatedLimit) {outdatedLimit=this.state.appSettings.pollInterval/2;} var thisComponent = this; var thisUsername = this.state.username; @@ -75,8 +77,8 @@ module.exports = Timeline = React.createClass({ }, componentDidMount: function() { - this.updatePosts(2*this.props.pollInterval); - this.setInterval(this.updatePosts, this.props.pollInterval*1000); + this.updatePosts(2*this.state.appSettings.pollInterval); + this.setInterval(this.updatePosts, this.state.appSettings.pollInterval*1000); }, onnewpostbyuser: function (event) {