Jocaru/conjuntasbot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed proxy switch

Browse Source
This commit is contained in:
Joan
2024-03-24 18:24:15 +01:00
parent 8af20ad7e9
commit 535a13fe99
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conjuntasbot/conjuntasbot.py
View File

@@ -28,7 +28,7 @@ general_group_chat_id = os.environ.get("GENERAL_GROUP_CHAT_ID")
vip_group_chat_id = os.environ.get("VIP_GROUP_CHAT_ID") vip_group_chat_id = os.environ.get("VIP_GROUP_CHAT_ID")
bot_token = os.environ.get("TELEGRAM_TOKEN") bot_token = os.environ.get("TELEGRAM_TOKEN")
spreadsheet_id = os.environ.get("SPREADSHEET_ID") spreadsheet_id = os.environ.get("SPREADSHEET_ID")
telegram_proxy = os.environ.get("TELEGRAM_PROXY") telegram_proxy = os.environ.get("TELEGRAM_PROXY") == '1'
if telegram_proxy: if telegram_proxy:
telegram_socks_user = os.environ.get("TELEGRAM_SOCKS_USER") telegram_socks_user = os.environ.get("TELEGRAM_SOCKS_USER")
telegram_socks_password = os.environ.get("TELEGRAM_SOCKS_PASSWORD") telegram_socks_password = os.environ.get("TELEGRAM_SOCKS_PASSWORD")
@@ -765,8 +765,10 @@ async def help(update: Update, context: CallbackContext):
def main()->None: def main()->None:
if telegram_proxy: if telegram_proxy:
logging.info("Creating application with socks5 proxy")
application = ApplicationBuilder().get_updates_http_version('1.1').http_version('1.1').token(bot_token).proxy(proxy_url).get_updates_proxy(proxy_url).build() application = ApplicationBuilder().get_updates_http_version('1.1').http_version('1.1').token(bot_token).proxy(proxy_url).get_updates_proxy(proxy_url).build()
else: else:
logging.info("Creating application without socks5 proxy")
application = ApplicationBuilder().get_updates_http_version('1.1').http_version('1.1').token(bot_token).build() application = ApplicationBuilder().get_updates_http_version('1.1').http_version('1.1').token(bot_token).build()
conv_handler = ConversationHandler( conv_handler = ConversationHandler(

1
docker-compose.yml
View File

@@ -15,6 +15,7 @@ services:
- GENERAL_GROUP_CHAT_ID=${GENERAL_GROUP_CHAT_ID} - GENERAL_GROUP_CHAT_ID=${GENERAL_GROUP_CHAT_ID}
- VIP_GROUP_CHAT_ID=${VIP_GROUP_CHAT_ID} - VIP_GROUP_CHAT_ID=${VIP_GROUP_CHAT_ID}
- SPREADSHEET_ID=${SPREADSHEET_ID} - SPREADSHEET_ID=${SPREADSHEET_ID}
- TELEGRAM_PROXY=${TELEGRAM_PROXY}
- TELEGRAM_SOCKS_USER=${TELEGRAM_SOCKS_USER} - TELEGRAM_SOCKS_USER=${TELEGRAM_SOCKS_USER}
- TELEGRAM_SOCKS_PASSWORD=${TELEGRAM_SOCKS_PASSWORD} - TELEGRAM_SOCKS_PASSWORD=${TELEGRAM_SOCKS_PASSWORD}
- TELEGRAM_SOCKS_SERVER=${TELEGRAM_SOCKS_SERVER} - TELEGRAM_SOCKS_SERVER=${TELEGRAM_SOCKS_SERVER}