TeamPGM/PagerMaid-Modify
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

✨ Support http proxy. (#93)

Browse Source 
✨ 支持使用 http 代理。
This commit is contained in:
Xtao_dada 2021-06-19 21:53:03 +08:00 committed by GitHub
parent cb7697b895
commit 3552ebf0be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.gen.yml
View File

@ -51,9 +51,11 @@ height: "1080"
background: "#101010" background: "#101010"
margin: "20" margin: "20"
#socks5 or MTProto #socks5 or http or MTProto
proxy_addr: "" proxy_addr: ""
proxy_port: "" proxy_port: ""
http_addr: ""
http_port: ""
mtp_addr: "" mtp_addr: ""
mtp_port: "" mtp_port: ""
mtp_secret: "" mtp_secret: ""

21
pagermaid/__init__.py
View File

@ -111,12 +111,16 @@ api_hash = config['api_hash']
try: try:
proxy_addr = config['proxy_addr'].strip() proxy_addr = config['proxy_addr'].strip()
proxy_port = config['proxy_port'].strip() proxy_port = config['proxy_port'].strip()
http_addr = config['http_addr'].strip()
http_port = config['http_port'].strip()
mtp_addr = config['mtp_addr'].strip() mtp_addr = config['mtp_addr'].strip()
mtp_port = config['mtp_port'].strip() mtp_port = config['mtp_port'].strip()
mtp_secret = config['mtp_secret'].strip() mtp_secret = config['mtp_secret'].strip()
except: except:
proxy_addr = '' proxy_addr = ''
proxy_port = '' proxy_port = ''
http_addr = ''
http_port = ''
mtp_addr = '' mtp_addr = ''
mtp_port = '' mtp_port = ''
mtp_secret = '' mtp_secret = ''
@ -140,11 +144,20 @@ if api_key is None or api_hash is None:
if not proxy_addr == '' and not proxy_port == '': if not proxy_addr == '' and not proxy_port == '':
try: try:
import socks import python_socks
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True,
proxy=(python_socks.ProxyType.SOCKS5, proxy_addr, int(proxy_port)))
except: except:
pass bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True)
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True, elif not http_addr == '' and not http_port == '':
proxy=(socks.SOCKS5, proxy_addr, int(proxy_port))) try:
import python_socks
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True,
proxy=(python_socks.ProxyType.HTTP, proxy_addr, int(proxy_port)))
except:
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True)
elif not mtp_addr == '' and not mtp_port == '' and not mtp_secret == '': elif not mtp_addr == '' and not mtp_port == '' and not mtp_secret == '':
from telethon import connection from telethon import connection

2
requirements.txt
View File

@ -32,7 +32,7 @@ Flask-Bcrypt>=0.7.1
Flask-WTF>=0.15.1 Flask-WTF>=0.15.1
WTForms>=2.3.3 WTForms>=2.3.3
cheroot>=8.5.2 cheroot>=8.5.2
PySocks>=1.7.1 python-socks[asyncio]>=1.2.4
certifi>=2021.5.30 certifi>=2021.5.30
magic_google>=0.2.9 magic_google>=0.2.9
sentry-sdk>=1.1.0 sentry-sdk>=1.1.0