pampa_workers 1.1.11 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ac92cef77d1d960d4266bef7b3604b7e3b4b11
-  data.tar.gz: 67585e618694d0c31734065a5a4220b9cab1df86
+  metadata.gz: 70181238899f4d62d2ed7c6bdf39807210fd1756
+  data.tar.gz: ace7a6e2947aafd66f34170ec1f291f2273fd936
 SHA512:
-  metadata.gz: 0213d306f51180860cb0cfd8cb5aa92c2c58a6ca2a743c710881e90e10dbbc400519b231169047786c28b8bf7682ab3accded06d91e0cf205fce340b27fe0283
-  data.tar.gz: a346742eabe1963cb28b875b4810a26b4a2df96905645144b56db136f569b61025c26c3982a133e4bfa1421e65d7dec6819fadcd5b2e7ee3ac6b761c8a8be87f
+  metadata.gz: 5598238f0b7b50957eca53f6492b6655f41a3911a280d9f9ae054a47ddbae1cd1de939e9c32239304dd979cf044d731125031c43195bb51a3dfa8a265847c6b5
+  data.tar.gz: b04caea373fcdf1e52c142614bf05cf05388af2810db4df421650fa2e5e724feadd958c0570fc69a583618a2954494512ef4306851410dd24bed4ec31c6fb259

data/lib/client.rb

@@ -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
@@ -172,7 +181,7 @@ module BlackStack
       if self.resellerSignatureEnabled?
         return self.from_email_for_ssm.to_s
       else
-        return BlackStack::Params.getValue("notifications.user.email_from")
+        return NOTIFICATIONS[:from_email]
       end
     end
   
@@ -182,7 +191,7 @@ module BlackStack
       if self.resellerSignatureEnabled?
         return self.from_email_for_ssm.to_s
       else
-        return BlackStack::Params.getValue("notifications.user.name_from")
+        return NOTIFICATIONS[:from_name]
       end
     end
   end # class Client

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.11
+  version: 1.1.17
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket