imperituroard 1.1.15 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b88a1a03fcc8ffa9b104d37fc0167bbe99b3ee9
-  data.tar.gz: 991615ca54d1e743e64955b08fff8b45ff962f5d
+  metadata.gz: 015a5d3136b3e47eab433636dd7b9e0fc4b70fdb
+  data.tar.gz: 90d1189ffd4fdcb5a2458dda0752d5e0b10342c7
 SHA512:
-  metadata.gz: 4fa2c2c4ca77e55e585cde7c0c03d3fc757b43e134691d672560ec22f6533d974882fa45364353dab46582013e75e134397059de936c217e7c572c4ed5c21ec8
-  data.tar.gz: 9415cfc431b7be26a9fab465da942b6b9c1e46205c97d1a84361b2ec93538ae7a8744d697f68a36a25e3ef169808cd5e1428c1287ff64e61cce7f6bf5b2b154b
+  metadata.gz: e55cf9eafb144b4426c61ef65f72d715b8240195af65b173ec09d350a6dead6bff75a9487d8e519ff2ed7dd68047ebffa91f29c54595c37cf03cdd9e7be6a995
+  data.tar.gz: 6df5079662a650f243107f6bc4a22da04054097f4211c514833c349ace9d4312cec8c2c9df9b3f13f7b3f76f03c61ecdf4e074c81e349361a44cef246a32f233

data/lib/imperituroard.rb

@@ -341,8 +341,8 @@ class Mhub_2
     mhub_connector.get_send_message_2(params, ip_src, ip_real, ip_vip)
   end
 
-  def get_send_message_mass(params, ip_src, ip_real, ip_vip, slice_number=100, time_pause_minutes=5)
-    mhub_connector.get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes)
+  def get_send_message_mass(params, ip_src, ip_real, ip_vip, slice_number=100, time_pause_minutes=5, viberttl=60, params_manual_set=0, smsttl=60)
+    mhub_connector.get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes, viberttl, params_manual_set, smsttl)
   end
 
   def recieve_delivery_report(params, ip_src, ip_real, ip_vip, crm_slice_num)

data/lib/imperituroard/projects/mhub.rb

@@ -129,7 +129,16 @@ class MhubFunctions_2
 
 
   #for bank dabrabyt for massive nums
-  def get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes)
+  def get_send_message_mass_2(params,
+                              ip_src,
+                              ip_real,
+                              ip_vip,
+                              slice_number,
+                              time_pause_minutes,
+                              viberttl,
+                              params_manual_set,
+                              smsttl
+  )
 
     input_params = {:params => params}
     output_params = {}
@@ -148,12 +157,29 @@ class MhubFunctions_2
 
           hub_resp = {}
 
-          if null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
-            hub_resp = mhub_connector.sk_send_sms_list(part_list, static_callback, params["sms"]["text"], sms_alphaname, time_pause_minutes)
-          elsif !null_statement.include?(params["viber"]) && null_statement.include?(params["sms"])
-            hub_resp = mhub_connector.sk_send_viber_list(part_list, static_callback, params["viber"]["text"], time_pause_minutes)
-          elsif !null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
-            hub_resp = mhub_connector.sk_send_viber_sms_list(part_list, static_callback, params["sms"]["text"], params["viber"]["text"], sms_alphaname, time_pause_minutes)
+
+          viber_param = params["viber"]
+          sms_param = params["sms"]
+
+          if params_manual_set != 0
+            begin
+              if params_manual_set[:viber] == 0
+                viber_param = nil
+              end
+              if params_manual_set[:sms] == 0
+                sms_param = nil
+              end
+            rescue
+              nil
+            end
+          end
+
+          if null_statement.include?(viber_param) && !null_statement.include?(sms_param)
+            hub_resp = mhub_connector.sk_send_sms_list(part_list, static_callback, params["sms"]["text"], sms_alphaname, time_pause_minutes, smsttl)
+          elsif !null_statement.include?(viber_param) && null_statement.include?(sms_param)
+            hub_resp = mhub_connector.sk_send_viber_list(part_list, static_callback, params["viber"]["text"], time_pause_minutes, viberttl)
+          elsif !null_statement.include?(viber_param) && !null_statement.include?(sms_param)
+            hub_resp = mhub_connector.sk_send_viber_sms_list(part_list, static_callback, params["sms"]["text"], params["viber"]["text"], sms_alphaname, time_pause_minutes, viberttl, smsttl)
           else
             output_params = {"code": 502, "result": "Invalid input data st2", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
           end

data/lib/imperituroard/projects/mhub/sk.rb

@@ -148,7 +148,7 @@ class Sksk_2
     output_params
   end
 
-  def sk_send_viber_sms_one(msisdn, callback_url, sms_text, viber_txt, alphaname)
+  def sk_send_viber_sms_one(msisdn, callback_url, sms_text, viber_txt, alphaname, smsttl=600)
 
     input_params = {:msisdn => msisdn, :callback_url => callback_url, :sms_text => sms_text, :viber_txt => viber_txt, :alphaname => alphaname}
     output_params = {}
@@ -188,7 +188,7 @@ class Sksk_2
                   "sms": {
                       "text": sms_text,
                       "alpha_name": alphaname,
-                      "ttl": 600
+                      "ttl": smsttl
                   },
                   "viber": viber_mess_ans[:body][:to_sk_format]
               }
@@ -220,7 +220,7 @@ class Sksk_2
   end
 
 
-  def sk_send_sms_list(msisdn_list, callback_url, text, alphaname, time_pause_minutes=1)
+  def sk_send_sms_list(msisdn_list, callback_url, text, alphaname, time_pause_minutes=1, smsttl)
 
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :text => text, :alphaname => alphaname}
     output_params = {}
@@ -256,7 +256,7 @@ class Sksk_2
                 "sms": {
                     "alpha_name": alphaname,
                     "text": text,
-                    "ttl": 60
+                    "ttl": smsttl
                 }
             }
         }
@@ -282,7 +282,10 @@ class Sksk_2
   end
 
 
-  def sk_send_viber_list(msisdn_list, callback_url, text, time_pause_minutes)
+  def sk_send_viber_list(msisdn_list, callback_url, text, time_pause_minutes, viberttl)
+
+    internal_func.printer_texter({:input => "Fun started", :output => {}, :procedure => "Sksk_2.sk_send_viber_list"}, log_level)
+
 
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :text => text}
     output_params = {}
@@ -292,7 +295,7 @@ class Sksk_2
 
       thr_sk_send_viber_list = Thread.new do
 
-        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text)
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text, viberttl)
 
         if viber_mess_ans[:code] == 200
           uri = URI(sk_url_broadcast)
@@ -346,7 +349,7 @@ class Sksk_2
   end
 
 
-  def sk_send_viber_sms_list(msisdn_list, callback_url, sms_text, viber_text, alphaname, time_pause_minutes)
+  def sk_send_viber_sms_list(msisdn_list, callback_url, sms_text, viber_text, alphaname, time_pause_minutes, viberttl, smsttl)
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :sms_text => sms_text, :viber_text => viber_text, :alphaname => alphaname}
     output_params = {}
     request_message = {}
@@ -355,7 +358,7 @@ class Sksk_2
       thr_sk_send_viber_sms_list = Thread.new do
 
 
-        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_text)
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_text, viberttl)
 
         if viber_mess_ans[:code] == 200
 
@@ -388,7 +391,7 @@ class Sksk_2
                   "sms": {
                       "alpha_name": alphaname,
                       "text": sms_text,
-                      "ttl": 60
+                      "ttl": smsttl
                   },
                   "viber": viber_mess_ans[:body][:to_sk_format]
               }

data/lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb

@@ -9,7 +9,7 @@ class Dabrab
     @log_level = log_level
   end
 
-  def dabrabyt_text_field_parse(stri)
+  def dabrabyt_text_field_parse(stri, viberttl)
     button_url = ""
     image = ""
     button_text = ""
@@ -101,13 +101,13 @@ class Dabrab
 
       case scheme
         when 0
-          sk_format = {"text": text, "ttl": 60}
+          sk_format = {"text": text, "ttl": viberttl}
         when 1
-          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url}
+          sk_format = {"text": text, "ttl": viberttl, "caption": button_text, "action": button_url}
         when 2
-          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url, "img": image}
+          sk_format = {"text": text, "ttl": viberttl, "caption": button_text, "action": button_url, "img": image}
         when 3
-          sk_format = {"img": image, "ttl": 60}
+          sk_format = {"img": image, "ttl": viberttl}
         else
           nil
       end

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.15"
+  VERSION = "1.1.17"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.17
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler