From fbcba39e691df1d183fbf621c7e1535b3efeccf2 Mon Sep 17 00:00:00 2001
From: Jose Manuel Delicado <jmdaweb@hotmail.com>
Date: Fri, 22 Jan 2021 17:54:47 +0100
Subject: [PATCH] Small fixes. Support for socks4a proxies

---
 src/config.py              | 2 +-
 src/controller/settings.py | 2 +-
 src/main.py                | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/config.py b/src/config.py
index 9b21badd..a7e94eb6 100644
--- a/src/config.py
+++ b/src/config.py
@@ -9,7 +9,7 @@ log = logging.getLogger("config")
 
 MAINFILE = "twblue.conf"
 MAINSPEC = "app-configuration.defaults"
-proxyTypes = ["system", "HTTP", "SOCKS4", "SOCKS5", "SOCKS5H"]
+proxyTypes = ["system", "http", "socks4", "socks4a", "socks5", "socks5h"]
 app = None
 keymap=None
 changed_keymap = False
diff --git a/src/controller/settings.py b/src/controller/settings.py
index f0687514..f1a3e728 100644
--- a/src/controller/settings.py
+++ b/src/controller/settings.py
@@ -74,7 +74,7 @@ class globalSettingsController(object):
   self.dialog.set_value("general", "update_period", config.app["app-settings"]["update_period"])
   self.dialog.set_value("general", "check_for_updates", config.app["app-settings"]["check_for_updates"])
   self.dialog.set_value("general", "remember_mention_and_longtweet", config.app["app-settings"]["remember_mention_and_longtweet"])
-  proxyTypes = [_("System default"), _("HTTP"), _("SOCKS v4"), _("SOCKS v5"), _("SOCKS v5 with DNS support")]
+  proxyTypes = [_("System default"), _("HTTP"), _("SOCKS v4"), _("SOCKS v4 with DNS support"), _("SOCKS v5"), _("SOCKS v5 with DNS support")]
   self.dialog.create_proxy(proxyTypes)
   try:
    self.dialog.proxy.type.SetSelection(config.app["proxy"]["type"])
diff --git a/src/main.py b/src/main.py
index 88ad2417..32e7cb1e 100644
--- a/src/main.py
+++ b/src/main.py
@@ -108,6 +108,8 @@ def proxy_setup():
   proxy_url = config.app["proxy"]["server"] + ":" + str(config.app["proxy"]["port"])
   if config.app["proxy"]["user"] != "" and config.app["proxy"]["password"] != "":
    proxy_url = config.app["proxy"]["user"] + ":" + config.app["proxy"]["password"] + "@" + proxy_url
+  elif config.app["proxy"]["user"] != "" and config.proxyTypes[config.app["proxy"]["type"]] in ["socks4", "socks4a"]:
+   proxy_url = config.app["proxy"]["user"] + "@" + proxy_url
   proxy_url = config.proxyTypes[config.app["proxy"]["type"]] + "://" + proxy_url
   os.environ["HTTP_PROXY"] = proxy_url
   os.environ["HTTPS_PROXY"] = proxy_url