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

✨ support ipv6 (#102)

Browse Source 
* ✨ 支持 ipv6
This commit is contained in:
Xtao_dada 2021-07-11 14:08:29 +08:00 committed by GitHub
parent 265af933e8
commit 2f50c4cbe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.gen.yml
View File

@ -62,3 +62,6 @@ mtp_secret: ""
# Apt Git source # Apt Git source
git_source: "https://raw.githubusercontent.com/Xtao-Labs/PagerMaid_Plugins/master/" git_source: "https://raw.githubusercontent.com/Xtao-Labs/PagerMaid_Plugins/master/"
# ipv6
ipv6: "False"

37
pagermaid/__init__.py
View File

@ -121,7 +121,7 @@ try:
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 KeyError:
proxy_addr = '' proxy_addr = ''
proxy_port = '' proxy_port = ''
http_addr = '' http_addr = ''
@ -141,6 +141,13 @@ try:
redis_db = config['redis']['db'] redis_db = config['redis']['db']
except KeyError: except KeyError:
redis_db = 14 redis_db = 14
try:
if strtobool(config['ipv6']):
use_ipv6 = True
else:
use_ipv6 = False
except KeyError:
use_ipv6 = False
if api_key is None or api_hash is None: if api_key is None or api_hash is None:
logs.info( logs.info(
lang('config_error') lang('config_error')
@ -151,26 +158,36 @@ if not proxy_addr == '' and not proxy_port == '':
try: try:
import python_socks import python_socks
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True, bot = TelegramClient("pagermaid", api_key, api_hash,
proxy=(python_socks.ProxyType.SOCKS5, proxy_addr, int(proxy_port))) auto_reconnect=True,
proxy=(python_socks.ProxyType.SOCKS5, proxy_addr, int(proxy_port)),
use_ipv6=use_ipv6)
except: except:
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True) bot = TelegramClient("pagermaid", api_key, api_hash,
auto_reconnect=True,
use_ipv6=use_ipv6)
elif not http_addr == '' and not http_port == '': elif not http_addr == '' and not http_port == '':
try: try:
import python_socks import python_socks
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True, bot = TelegramClient("pagermaid", api_key, api_hash,
proxy=(python_socks.ProxyType.HTTP, http_addr, int(http_port))) auto_reconnect=True,
proxy=(python_socks.ProxyType.HTTP, http_addr, int(http_port)),
use_ipv6=use_ipv6)
except: except:
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True) bot = TelegramClient("pagermaid", api_key, api_hash,
auto_reconnect=True,
use_ipv6=use_ipv6)
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
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True, bot = TelegramClient("pagermaid", api_key, api_hash,
auto_reconnect=True,
connection=connection.ConnectionTcpMTProxyRandomizedIntermediate, connection=connection.ConnectionTcpMTProxyRandomizedIntermediate,
proxy=(mtp_addr, int(mtp_port), mtp_secret)) proxy=(mtp_addr, int(mtp_port), mtp_secret),
use_ipv6=use_ipv6)
else: else:
bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True) bot = TelegramClient("pagermaid", api_key, api_hash, auto_reconnect=True, use_ipv6=use_ipv6)
redis = StrictRedis(host=redis_host, port=redis_port, db=redis_db) redis = StrictRedis(host=redis_host, port=redis_port, db=redis_db)