bobot 4.13.1 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fea75dd1ce76f17fb665eb9b75fc4d5086302de0f484dbb5f7b378d7fbd05d7f
-  data.tar.gz: 4cfcd52a2006ab9bceb2ca5905df48a1b1566ce384d26ee63f810e88a607fdfd
+  metadata.gz: 312aa2653634d73327d66899611310da2c5c7a0514f2bc84afaba332fc31046c
+  data.tar.gz: fa5a7192eafc0455aafb79cedebe9265dc19d1601a4f4adc826ec70145aec170
 SHA512:
-  metadata.gz: 82c1c545c8d2f26fcdf0cc41bde4bf8b83d877451423f83f48330ddbb611b31ed40a7b70aa5c90109fbc5725f3bac86b2a6faa70f7310938a46d00597508b7b0
-  data.tar.gz: 90155f520bc068e75cc0b40f87bd1b2e02654e0d58db5c8c5ff77876421e7b2ebc52b0c6362052f1740607914005fa43afd96e580e91bd654172b3467651c1ba
+  metadata.gz: b99c9349bf4c1109903185ee22ee0f4b4836f08b5f740291c3db9617968b6835bd94370bbec1bfdf5256033676aebc58fd3a01dd4c4ccef41f6cd23697a81c41
+  data.tar.gz: 54f1101c0b51195ec3a5fbeca6ef52b951827807609086c498470039571505bee321b970112790938a21be122230b20d8ed2e7a06b0c319f39237228ab74c32f

data/app/controllers/bobot/webhook_controller.rb

@@ -8,6 +8,8 @@ module Bobot
       some time, check your app's secret token.
     HEREDOC
 
+    OPEN_SSL_AUTHENTICATION_CODE = OpenSSL::Digest.new('sha1'.freeze)
+
     def webhook
       if request.get?
         verify
@@ -44,7 +46,7 @@ module Bobot
     def parsed_body
       @parsed_body ||= ActiveSupport::JSON.decode(body)
     rescue ::ActiveSupport::JSON.parse_error
-      raise BadRequestError.new("Error parsing request body format")
+      raise BadRequestError.new("Error parsing request body format".freeze)
     end
 
     def valid_signature?
@@ -52,7 +54,7 @@ module Bobot
     end
 
     def generate_hmac(content)
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'.freeze), Bobot.config.app_secret, content)
+      OpenSSL::HMAC.hexdigest(self.class::OPEN_SSL_AUTHENTICATION_CODE, Bobot.config.app_secret, content)
     end
 
     def signature_for(string)
@@ -71,12 +73,10 @@ module Bobot
       signature =~ /\Asha1=([0-9a-z]{40})\z/
       hub_signature = Regexp.last_match(1)
       unless hub_signature
-        Rails.logger.error(X_HUB_SIGNATURE_MISSING_WARNING)
+        Rails.logger.error(self.class::X_HUB_SIGNATURE_MISSING_WARNING)
         raise BadRequestError.new("Error getting integrity signature".freeze)
       end
-      unless valid_signature?
-        raise BadRequestError.new("Error checking message integrity".freeze)
-      end
+      raise BadRequestError.new("Error checking message integrity".freeze) unless valid_signature?
     end
 
     def trigger(events)
@@ -84,6 +84,9 @@ module Bobot
         entry['messaging'.freeze].to_a.each do |messaging|
           Bobot::Commander.receive(messaging)
         end
+        entry['standby'.freeze].to_a.each do |standby|
+          Bobot::Commander.receive(standby) if standby["message".freeze]
+        end
       end
     end
   end

data/lib/bobot/commander.rb

@@ -14,15 +14,20 @@ module Bobot
       message_request
       policy-enforcement
       pass_thread_control
+      take_thread_control
     ].freeze
 
     include Bobot::GraphFacebook
 
     class << self
-      def deliver(body:, query:)
-        graph_post '/me/messages', body: body, query: {
-          access_token: query.fetch(:access_token),
-        }
+      def deliver(endpoint: '/me/messages', body:, query:)
+        graph_post(
+          endpoint,
+          body: body,
+          query: {
+            access_token: query.fetch(:access_token),
+          },
+        )
       end
 
       def on(event, &block)
@@ -35,10 +40,8 @@ module Bobot
 
       def receive(payload)
         event = Bobot::Event.parse(payload)
-        return unless event.page.present?
-
+        event.mark_as_seen if event.page.present? && [Bobot::Event::MessageEcho, Bobot::Event::PassThreadControl, Bobot::Event::TakeThreadControl].none? { |c| event.is_a?(c) }
         hooks.fetch(Bobot::Event::EVENTS.invert[event.class].to_sym)
-        event.mark_as_seen
         Bobot::CommanderJob.send(
           Bobot.config.async ? :perform_later : :perform_now,
           { payload: payload },
@@ -49,7 +52,7 @@ module Bobot
 
       def trigger(payload)
         event = Bobot::Event.parse(payload)
-        return unless event.page.present?
+        return if !event.page.present?
 
         hook = hooks.fetch(Bobot::Event::EVENTS.invert[event.class].to_sym)
         hook.call(event)

data/lib/bobot/event.rb

@@ -9,6 +9,7 @@ require 'bobot/events/account_linking'
 require 'bobot/events/referral'
 require 'bobot/events/policy_enforcement'
 require 'bobot/events/pass_thread_control'
+require 'bobot/events/take_thread_control'
 
 module Bobot
   module Event
@@ -23,6 +24,7 @@ module Bobot
       'message_echo' => MessageEcho,
       'policy-enforcement' => PolicyEnforcement,
       'pass_thread_control' => PassThreadControl,
+      'take_thread_control' => TakeThreadControl,
     }.freeze
 
     def self.parse(payload)

data/lib/bobot/events/common.rb

@@ -9,11 +9,11 @@ module Bobot
       end
 
       def sender
-        @messaging['sender']
+        @messaging[is_a?(Bobot::Event::MessageEcho) ? 'recipient' : 'sender']
       end
 
       def recipient
-        @messaging['recipient']
+        @messaging[is_a?(Bobot::Event::MessageEcho) ? 'sender' : 'recipient']
       end
 
       # If the user responds to your message, the appropriate event
@@ -29,6 +29,14 @@ module Bobot
         Time.zone.at(@messaging['timestamp'] / 1000)
       end
 
+      def send_take_thread_control(metadata: nil)
+        page.deliver_take_thread_control(to: sender["id"], metadata: metadata)
+      end
+
+      def send_pass_thread_control(target_app_id:, metadata: nil)
+        page.deliver_pass_thread_control(to: sender["id"], metadata: metadata, target_app_id: target_app_id)
+      end
+
       def sender_action(sender_action:, messaging_options: nil)
         page.sender_action(sender_action: sender_action, to: sender["id"], messaging_options: messaging_options)
       end

data/lib/bobot/events/message_echo.rb

@@ -1,9 +1,6 @@
 module Bobot
   module Event
     class MessageEcho < Message
-      def access_token
-        Bobot::Page.find(sender["id"])
-      end
     end
   end
 end

data/lib/bobot/events/take_thread_control.rb

@@ -0,0 +1,15 @@
+module Bobot
+  module Event
+    class TakeThreadControl
+      include Bobot::Event::Common
+
+      def previous_owner_app_id
+        @messaging['take_thread_control']['previous_owner_app_id  ']
+      end
+
+      def metadata
+        @messaging['take_thread_control']['metadata']
+      end
+    end
+  end
+end

data/lib/bobot/page.rb

@@ -34,6 +34,26 @@ module Bobot
     #
     #####################################
 
+    def deliver_take_thread_control(to:, metadata: nil)
+      body = { recipient: { id: to }, metadata: metadata }
+      query = { access_token: page_access_token }
+      Bobot::Commander.deliver(
+        endpoint: '/me/take_thread_control',
+        body: body,
+        query: query,
+      )
+    end
+
+    def deliver_pass_thread_control(to:, metadata: nil, target_app_id:)
+      body = { recipient: { id: to }, target_app_id: target_app_id, metadata: metadata }
+      query = { access_token: page_access_token }
+      Bobot::Commander.deliver(
+        endpoint: '/me/pass_thread_control',
+        body: body,
+        query: query,
+      )
+    end
+
     def deliver(payload_template:, to:)
       if payload_template.present?
         if payload_template.key?(:messaging_options) && !payload_template[:messaging_options].nil? && payload_template[:messaging_options].key?(:messaging_type)
@@ -49,11 +69,12 @@ module Bobot
       body = { recipient: { id: to }, messaging_type: "RESPONSE" }.merge(payload_template).merge(payload_template[:messaging_options] || {})
       query = { access_token: page_access_token }
       Bobot::Commander.deliver(
+        endpoint: '/me/messages',
         body: body,
         query: query,
       )
     end
-    
+
     def sender_action(sender_action:, to: nil, messaging_options: nil)
       deliver(payload_template: { sender_action: sender_action, messaging_options: messaging_options }, to: to)
     end

data/lib/bobot/version.rb

@@ -1,8 +1,8 @@
 module Bobot
   class Version
     MAJOR = 4
-    MINOR = 13
-    PATCH = 1
+    MINOR = 14
+    PATCH = 0
     PRE = nil
 
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bobot
 version: !ruby/object:Gem::Version
-  version: 4.13.1
+  version: 4.14.0
 platform: ruby
 authors:
 - Navid EMAD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -96,6 +96,7 @@ files:
 - lib/bobot/events/postback.rb
 - lib/bobot/events/read.rb
 - lib/bobot/events/referral.rb
+- lib/bobot/events/take_thread_control.rb
 - lib/bobot/exceptions.rb
 - lib/bobot/graph_facebook.rb
 - lib/bobot/page.rb