diff --git a/queue_message/appointmentrequestsender.py b/queue_message/appointmentrequestsender.py index 8daef59..69338d7 100644 --- a/queue_message/appointmentrequestsender.py +++ b/queue_message/appointmentrequestsender.py @@ -141,43 +141,42 @@ class AppointmentRequestSender(threading.Thread): if csrf_result == RequestResult.BLOCKED: can_continue = RequestResult.CSRF_BLOCKED break - _new_le_cookies =_received_cookies _new_cookies = _received_cookies - # _new_cookies = captchaResultGetter.get_valid_ch_cookie(sender.proxy_to_use, js_data, - # old_valid_cookie=_received_cookies) + _new_cookies = captchaResultGetter.get_valid_ch_cookie(sender.proxy_to_use, js_data, + old_valid_cookie=_received_cookies) if _new_cookies is not None: - # self.logger.info("new cookie is " + _new_cookies) - # time.sleep(random.randint(1, 3)) - # # m_s_c = f.scroll - # m_s_c = random.randint(0, 3) - # m_c_c = random.randint(3, 5) # click count - # m_m_c = random.randint(3, 5) # move count - # m_cm_r = m_c_c / m_m_c - # m_ms_r = -1 # move scroll ratio - # if m_s_c == 0: - # m_ms_r = -1 - # else: - # m_ms_r = m_m_c / m_s_c - # - # js_le_data = JsDataLeTypePojo(glrd=_received_dict['glrd'], glvd=_received_dict['glvd'], - # hc=_received_dict['hc'], - # ua=_received_dict['ua'], br_oh=_received_dict['br_oh'], - # br_ow=_received_dict['br_ow'], - # ars_h=_received_dict['ars_h'], ars_w=_received_dict['ars_w'], - # pr=_received_dict['pr'], - # plg=_received_dict['plg'], br_h=_received_dict['br_h'], - # br_w=_received_dict['br_w'], - # plu=_received_dict['plu'], vnd=_received_dict['vnd'], - # dvm=_received_dict['dvm'], - # ts_mtp=_received_dict['ts_mtp'], eva=_received_dict['eva'], - # rs_h=_received_dict['rs_h'], - # rs_w=_received_dict['rs_w'], rs_cd=_received_dict['rs_cd'], - # m_s_c=m_s_c, m_m_c=m_m_c, m_c_c=m_c_c, - # m_cm_r=m_cm_r, m_ms_r=m_ms_r, emd=_received_dict['emd']) - # time.sleep(random.randint(1, 4)) - # _new_le_cookies = captchaResultGetter.get_le_valid_cookie(proxy_to_use=_proxy_to_use, - # js_le_type_data=js_le_data, - # old_valid_cookie=_new_cookies) + self.logger.info("new cookie is " + _new_cookies) + time.sleep(random.randint(1, 3)) + # m_s_c = f.scroll + m_s_c = random.randint(0, 3) + m_c_c = random.randint(3, 5) # click count + m_m_c = random.randint(3, 5) # move count + m_cm_r = m_c_c / m_m_c + m_ms_r = -1 # move scroll ratio + if m_s_c == 0: + m_ms_r = -1 + else: + m_ms_r = m_m_c / m_s_c + + js_le_data = JsDataLeTypePojo(glrd=_received_dict['glrd'], glvd=_received_dict['glvd'], + hc=_received_dict['hc'], + ua=_received_dict['ua'], br_oh=_received_dict['br_oh'], + br_ow=_received_dict['br_ow'], + ars_h=_received_dict['ars_h'], ars_w=_received_dict['ars_w'], + pr=_received_dict['pr'], + plg=_received_dict['plg'], br_h=_received_dict['br_h'], + br_w=_received_dict['br_w'], + plu=_received_dict['plu'], vnd=_received_dict['vnd'], + dvm=_received_dict['dvm'], + ts_mtp=_received_dict['ts_mtp'], eva=_received_dict['eva'], + rs_h=_received_dict['rs_h'], + rs_w=_received_dict['rs_w'], rs_cd=_received_dict['rs_cd'], + m_s_c=m_s_c, m_m_c=m_m_c, m_c_c=m_c_c, + m_cm_r=m_cm_r, m_ms_r=m_ms_r, emd=_received_dict['emd']) + time.sleep(random.randint(1, 4)) + _new_le_cookies = captchaResultGetter.get_le_valid_cookie(proxy_to_use=_proxy_to_use, + js_le_type_data=js_le_data, + old_valid_cookie=_new_cookies) if _new_le_cookies is not None: # self.logger.info("new le type cookie is " + _new_le_cookies) sender.cookie_str = _new_le_cookies diff --git a/workers/sender.py b/workers/sender.py index b70fd61..8abbf33 100644 --- a/workers/sender.py +++ b/workers/sender.py @@ -73,11 +73,6 @@ class Sender: if contact.store is not None and contact.store != "random": _selected_store = contact.store self.logger.info("store is:{}".format(_selected_store)) - if "lang=" not in self.cookie_str: - self.cookie_str = self.cookie_str + "; lang=en" - else: - self.cookie_str.replace("lang=fr", "lang=en") - self.logger.info("cookie_str is:{}".format(self.cookie_str)) headers = {'Content-Type': 'application/x-www-form-urlencoded', 'User-Agent': js_data.ua,