Fix socks proxy (#921)

* Replace pysocks with python-socks

* Log proxy settings on init

* Rename extra requirement group

Co-authored-by: Tulir Asokan <tulir@maunium.net>

---------

Co-authored-by: Tulir Asokan <tulir@maunium.net>

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 \

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)
 

optional-requirements.txt

@@ -23,3 +23,6 @@ unpaddedbase64>=1,<3
 
 #/sqlite
 aiosqlite>=0.16,<0.20
+
+#/proxy
+python-socks[asyncio]