Christopher Vollick created
This is currently just my branch, but we'll move to another commit after
it gets merged.
This commit makes it so session IDs and IQ IDs are unique rather than
the current state where they're always blather01, blather02, etc.
Given that we just start, run roughly the same commands, and then close
it meant all of our sessions were predictably numbered, and so we were
seeing some previous runs of the script picking up old sessions, etc.
Not great!
Also, at some point between whenever the last version was and now the
API changed for handlers, so we have to do that now. If we don't, the
commands just sit there and never respond. Bad.
So this makes our extensions more inline with upstream's new API.Gemfile | 2 +-
lib/blather_client.rb | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
@@ -4,7 +4,7 @@ source "https://rubygems.org"
gem "amazing_print"
gem "bandwidth-sdk", "<= 6.1.0"
-gem "blather", git: "https://github.com/adhearsion/blather", branch: "develop"
+gem "blather", git: "https://github.com/psycotica0/blather", branch: "cv_new_id"
gem "braintree"
gem "dhall", ">= 0.5.3.fixed"
gem "em-hiredis"
@@ -59,7 +59,8 @@ class BlatherClient < Blather::Client
found = stanza.find(*guards)
handler.call(stanza, found) unless found.empty?
else
- handler.call(stanza) unless guarded?(guards, stanza)
+ throw :pass if guarded?(guards, stanza)
+ handler.call(stanza)
end
return result unless result.is_a?(Promise)