From fb461109c10362364a269cc8d48203cf39351cb5 Mon Sep 17 00:00:00 2001 From: Nick Mills-Barrett Date: Fri, 9 Jun 2023 15:38:32 +0100 Subject: [PATCH] Fix socks proxy (#921) * Replace pysocks with python-socks * Log proxy settings on init * Rename extra requirement group Co-authored-by: Tulir Asokan --------- Co-authored-by: Tulir Asokan --- Dockerfile | 2 -- mautrix_telegram/abstract_user.py | 2 ++ optional-requirements.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a060dd72..cb0327ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,6 @@ RUN apk add --no-cache \ py3-idna \ py3-rsa \ #py3-telethon \ (outdated) - # Optional for socks proxies - py3-pysocks \ py3-pyaes \ # cryptg py3-cffi \ diff --git a/mautrix_telegram/abstract_user.py b/mautrix_telegram/abstract_user.py index 574d7db3..27fd07b3 100644 --- a/mautrix_telegram/abstract_user.py +++ b/mautrix_telegram/abstract_user.py @@ -208,6 +208,8 @@ class AbstractUser(ABC): sysversion = self.config["telegram.device_info.system_version"] appversion = self.config["telegram.device_info.app_version"] connection, proxy = self._proxy_settings + if proxy: + self.log.debug(f"Using proxy setting: {proxy}") assert isinstance(session, Session) diff --git a/optional-requirements.txt b/optional-requirements.txt index eb442f40..d80c8854 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -23,3 +23,6 @@ unpaddedbase64>=1,<3 #/sqlite aiosqlite>=0.16,<0.20 + +#/proxy +python-socks[asyncio]