From 1cf1418cb50268a54c7e407867e9671b7411a20f Mon Sep 17 00:00:00 2001 From: unknown <2303063@ad.nchc.org.tw> Date: Mon, 8 Jan 2024 19:13:11 +0800 Subject: [PATCH] 2023-12-31, update for indievox --- chrome_tixcraft.py | 2 +- config_launcher.py | 2 +- settings.json | 2 +- settings.py | 2 +- text_server.py | 2 +- .../Maxbotplus_1.0.0/js/tixcraft_detail.js | 3 +- webdriver/Maxbotplus_1.0.0/manifest.json | 32 ++++++++++++++++--- 7 files changed, 35 insertions(+), 10 deletions(-) diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index 6123840..81311a0 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -54,7 +54,7 @@ import webbrowser import chromedriver_autoinstaller -CONST_APP_VERSION = "MaxBot (2023.12.30)" +CONST_APP_VERSION = "MaxBot (2023.12.31)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" diff --git a/config_launcher.py b/config_launcher.py index c8f7fe6..c6df3ce 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -22,7 +22,7 @@ import sys import threading import webbrowser -CONST_APP_VERSION = "MaxBot (2023.12.30)" +CONST_APP_VERSION = "MaxBot (2023.12.31)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/settings.json b/settings.json index b30cf2e..61c8e28 100644 --- a/settings.json +++ b/settings.json @@ -1 +1 @@ -{"homepage": "https://tixcraft.com", "browser": "chrome", "language": "\u7e41\u9ad4\u4e2d\u6587", "ticket_number": 2, "ocr_captcha": {"enable": true, "beta": true, "force_submit": true, "image_source": "canvas"}, "webdriver_type": "undetected_chromedriver", "date_auto_select": {"enable": true, "date_keyword": "", "mode": "random"}, "area_auto_select": {"enable": true, "mode": "random", "area_keyword": ""}, "keyword_exclude": "\"\u8f2a\u6905\",\"\u8eab\u969c\",\"\u8eab\u5fc3 \u969c\u7919\",\"Restricted View\",\"\u71c8\u67f1\u906e\u853d\",\"\u8996\u7dda\u4e0d\u5b8c\u6574\"", "kktix": {"auto_press_next_step_button": true, "auto_fill_ticket_number": true}, "tixcraft": {"pass_date_is_sold_out": true, "auto_reload_coming_soon_page": true}, "advanced": {"play_captcha_sound": {"enable": true, "filename": "ding-dong.wav"}, "tixcraft_sid": "", "ibonqware": "", "facebook_account": "", "kktix_account": "", "fami_account": "", "cityline_account": "", "urbtix_account": "", "hkticketing_account": "", "kham_account": "", "ticket_account": "", "udn_account": "", "ticketplus_account": "", "facebook_password": "", "kktix_password": "", "fami_password": "", "urbtix_password": "", "cityline_password": "", "hkticketing_password": "", "kham_password": "", "ticket_password": "", "udn_password": "", "ticketplus_password": "", "adblock_plus_enable": false, "disable_adjacent_seat": false, "hide_some_image": false, "block_facebook_network": false, "headless": false, "verbose": false, "auto_guess_options": true, "user_guess_string": "", "online_dictionary_url": "", "auto_reload_page_interval": 1.0, "auto_reload_random_delay": false, "proxy_server_port": ""}} \ No newline at end of file +{"homepage": "https://tixcraft.com", "browser": "chrome", "language": "\u7e41\u9ad4\u4e2d\u6587", "ticket_number": 2, "ocr_captcha": {"enable": true, "beta": true, "force_submit": true, "image_source": "canvas"}, "webdriver_type": "undetected_chromedriver", "date_auto_select": {"enable": true, "date_keyword": "", "mode": "random"}, "area_auto_select": {"enable": true, "mode": "random", "area_keyword": ""}, "keyword_exclude": "\"\u8f2a\u6905\",\"\u8eab\u969c\",\"\u8eab\u5fc3 \u969c\u7919\",\"Restricted View\",\"\u71c8\u67f1\u906e\u853d\",\"\u8996\u7dda\u4e0d\u5b8c\u6574\"", "kktix": {"auto_press_next_step_button": true, "auto_fill_ticket_number": true}, "tixcraft": {"pass_date_is_sold_out": true, "auto_reload_coming_soon_page": true}, "advanced": {"play_captcha_sound": {"enable": true, "filename": "ding-dong.wav"}, "tixcraft_sid": "", "ibonqware": "", "facebook_account": "", "kktix_account": "", "fami_account": "", "cityline_account": "", "urbtix_account": "", "hkticketing_account": "", "kham_account": "", "ticket_account": "", "udn_account": "", "ticketplus_account": "", "facebook_password": "", "kktix_password": "", "fami_password": "", "urbtix_password": "", "cityline_password": "", "hkticketing_password": "", "kham_password": "", "ticket_password": "", "udn_password": "", "ticketplus_password": "", "adblock_plus_enable": false, "disable_adjacent_seat": false, "hide_some_image": true, "block_facebook_network": false, "headless": false, "verbose": false, "auto_guess_options": true, "user_guess_string": "", "online_dictionary_url": "", "auto_reload_page_interval": 1.0, "auto_reload_random_delay": false, "proxy_server_port": ""}} \ No newline at end of file diff --git a/settings.py b/settings.py index 1fe4cc0..12e075e 100644 --- a/settings.py +++ b/settings.py @@ -34,7 +34,7 @@ import ssl ssl._create_default_https_context = ssl._create_unverified_context -CONST_APP_VERSION = "MaxBot (2023.12.30)" +CONST_APP_VERSION = "MaxBot (2023.12.31)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" diff --git a/text_server.py b/text_server.py index db26df1..1ecc78a 100644 --- a/text_server.py +++ b/text_server.py @@ -27,7 +27,7 @@ import pyperclip import tornado from tornado.web import Application -CONST_APP_VERSION = "MaxBot (2023.12.30)" +CONST_APP_VERSION = "MaxBot (2023.12.31)" CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt" diff --git a/webdriver/Maxbotplus_1.0.0/js/tixcraft_detail.js b/webdriver/Maxbotplus_1.0.0/js/tixcraft_detail.js index 36c79fc..58a1bbf 100644 --- a/webdriver/Maxbotplus_1.0.0/js/tixcraft_detail.js +++ b/webdriver/Maxbotplus_1.0.0/js/tixcraft_detail.js @@ -4,7 +4,8 @@ //console.log(currentUrl); //console.log(event_code); if(event_code){ - let new_url = "https://tixcraft.com/activity/game/"+ event_code; + let domain = currentUrl.split('/')[2]; + let new_url = "https://"+ domain +"/activity/game/"+ event_code; location.href=new_url; } })(); diff --git a/webdriver/Maxbotplus_1.0.0/manifest.json b/webdriver/Maxbotplus_1.0.0/manifest.json index 7d1797e..3a6b2d4 100644 --- a/webdriver/Maxbotplus_1.0.0/manifest.json +++ b/webdriver/Maxbotplus_1.0.0/manifest.json @@ -47,22 +47,46 @@ "js" : [ "jquery.min.js", "js/tixcraft_area.js" ] }, { - "matches" : [ "https://tixcraft.com/activity/game/*" ], + "matches" : [ + "https://tixcraft.com/activity/game/*", + "https://www.indievox.com/activity/game/*", + "https://indievox.com/activity/game/*", + "https://ticketmaster.sg/activity/game/*", + "https://ticketmaster.com/activity/game/*" + ], "run_at": "document_end", "js" : [ "jquery.min.js", "js/common.js", "js/tixcraft_game.js" ] }, { - "matches" : [ "https://tixcraft.com/activity/detail/*" ], + "matches" : [ + "https://tixcraft.com/activity/detail/*", + "https://www.indievox.com/activity/detail/*", + "https://indievox.com/activity/detail/*", + "https://ticketmaster.sg/activity/detail/*", + "https://ticketmaster.com/activity/detail/*" + ], "run_at": "document_end", "js" : [ "jquery.min.js", "js/tixcraft_detail.js" ] }, { - "matches" : [ "https://tixcraft.com/ticket/ticket/*" ], + "matches" : [ + "https://tixcraft.com/ticket/ticket/*", + "https://www.indievox.com/ticket/ticket/*", + "https://indievox.com/ticket/ticket/*", + "https://ticketmaster.sg/ticket/ticket/*", + "https://ticketmaster.com/ticket/ticket/*" + ], "run_at": "document_end", "js" : [ "jquery.min.js", "js/tixcraft_ticket.js" ] }, { - "matches" : [ "https://tixcraft.com/" ], + "matches" : [ + "https://tixcraft.com/", + "https://www.indievox.com/", + "https://indievox.com/", + "https://ticketmaster.sg/", + "https://ticketmaster.com/" + ], "run_at": "document_end", "js" : [ "jquery.min.js", "js/tixcraft_home.js" ] },