pampa_workers 1.1.10 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff32f498a9f417bca1cd87cf09b5a834d6682d02
-  data.tar.gz: e078e98d93b15003592bd75c63615ae04cc97add
+  metadata.gz: d220ce3a1a32528fef038c7b6e3682b7e2b4dea4
+  data.tar.gz: f9fa423fb8833f6bd4ce4d33d764565269e58c44
 SHA512:
-  metadata.gz: 495dd61d71142f0c760624819b78693647b4251c870fab166694cb1c55f1a8b8debdda627a08aa1c9513b131bd51b9d1deff9cd8fd89af20b12e44f55d2be589
-  data.tar.gz: be9351da878c5670bdf8836ec79781395225a23dc6d632b6312d67084ff7eaa6d2c5c07f095013b03b8cd6f260e9bb312cde3d622d10bdccec103d99e63c16b7
+  metadata.gz: d6fa838696c0ecbe59466d33e04f4c01ccca4bd56d8dcdd6699dada04ecca6ed4bfa0764900736f2433a84be45c450f8c52d080759a321b1e299c9df4aa212ae
+  data.tar.gz: fc6dcc979f8e005c2a6c7409cdd546fcf45bea6c2d581c7d3f2dce09bc181311c6bb86bdef7a94f4f142c5f7f9e205a295d273083c8ed65f349187b45738014a

data/lib/client.rb

@@ -10,7 +10,7 @@ module BlackStack
     one_to_many :users, :class=>:'BlackStack::User', :key=>:id_client
     many_to_one :timezone, :class=>:'BlackStack::Timezone', :key=>:id_timezone
     many_to_one :billingCountry, :class=>:'BlackStack::LnCountry', :key=>:billing_id_lncountry
-    many_to_one :user_to_contect, :class=>'BlackStack:::User', :key=>:id_user_to_contact
+    many_to_one :user_to_contect, :class=>'BlackStack::User', :key=>:id_user_to_contact
   
   
     # ----------------------------------------------------------------------------------------- 
@@ -85,50 +85,59 @@ module BlackStack
   
     # llama a la api de postmark preguntando el reseller email configurado para este clietne fue ferificado
     def checkDomainForSSMVerified()
-      return_message = {}
+			return_message = {}  
       domain = self.domain_for_ssm
       email = self.from_email_for_ssm
       id = ''
       client = ''
-  
       if domain != nil && email != nil
         begin
-          client_postmark = Postmark::AccountApiClient.new(POSTMARK_API_TOKEN, secure: true)      
-          client_list = client_postmark.get_signatures()
-  
-          client_list.each do |sign|
-            if sign[:domain] == domain
-              if sign[:email_address] == email
-                id = sign[:id]
-                break
-              end
-            end
-          end
-  
-          if id.to_s.size > 0
-            client = client_postmark.get_sender(id)
+          # create postmark client
+					client_postmark = Postmark::AccountApiClient.new(POSTMARK_API_TOKEN, secure: true)      
+					
+          # get signature
+					# more info: https://github.com/wildbit/postmark-gem/wiki/Senders
+					#
+					# this first strategy is not scalable if we handle a large list of signatures.
+					#sign = client_postmark.signatures.select { |sign| sign[:domain]==domain }.first
+					# 
+					# this other approach is a bit more scalable, but anyway we need to call the API 
+					# with filering by the domain.
+					# 
+					pagesize = 30 # TODO: increase this value to 300 for optimization
+					i = 0
+					j = 1
+					sign = nil
+					while j>0 && sign.nil?
+						buff = client_postmark.get_signatures(offset: i, count: pagesize)
+						j = buff.size
+						i += pagesize
+						sign = buff.select { |s| s[:domain]==domain }.first
+					end # while
+					
+					# if signature has been found?
+          if sign.nil?
+						# sincronizo con la central
+						return_message[:status] = "Client Signature Not Found"
+						return_message[:value] = client[:id]
+						return return_message.to_json 
+					else
+            id = sign[:id]
+						client = client_postmark.get_sender(id)
             if !client[:confirmed]
               self.domain_for_ssm_verified = false
-              self.save
-  
+              self.save  
               return_message[:status] = "No Verified"
               return_message[:value] = client[:id]
-  
               return return_message.to_json 
             else
               self.domain_for_ssm_verified = true
-              self.save
-  
-              # sincronizo con la central
-              return_message = {}
-  
+              self.save  
               return_message[:status] = "success"
               return_message[:value] = client[:id]
-  
               return return_message.to_json 
             end
           end
-    
         rescue Postmark::ApiInputError => e
           return_message[:status] = e.to_s
           return return_message.to_json

data/lib/mybotprocess.rb

@@ -113,14 +113,14 @@ module BlackStack
         url = 
           "#{BlackStack::Pampa::api_protocol}://#{self.ws_url}:#{self.ws_port}/api1.3/pampa/scrape.inbox/notify_lnchat.json?" +
           "api_key=#{BlackStack::Pampa::api_key}&" +
-          "profile_code=#{URI.escape(conv[:profile_code])}&" +
-          "profile_name=#{URI.escape(conv[:profile_name])}&" +
-          "profile_headline=#{URI.escape(conv[:profile_headline])}&" +
-          "first=#{URI.escape(conv[:first])}&" +
+          "profile_code=#{CGI.escape(conv[:profile_code])}&" +
+          "profile_name=#{CGI.escape(conv[:profile_name])}&" +
+          "profile_headline=#{CGI.escape(conv[:profile_headline])}&" +
+          "first=#{CGI.escape(conv[:first])}&" +
           "position=#{chat[:position].to_s}&" +
           "uid=#{lnuser['id']}&" +
-          "sender_name=#{URI.escape(chat[:sender_name])}&" +
-          "body=#{URI.escape(chat[:body])}&" 
+          "sender_name=#{CGI.escape(chat[:sender_name])}&" +
+          "body=#{CGI.escape(chat[:body])}&" 
 puts ""
 puts "url:#{url}:."
 puts ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa_workers
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.16
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket