From f936e5832cdf830742cf23cc4d5566193d9f88b5 Mon Sep 17 00:00:00 2001
From: zkun <zhukun6150909@outlook.com>
Date: Wed, 28 Feb 2024 21:00:39 +0800
Subject: [PATCH] add proxy for account

---
 twitter/account.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/twitter/account.py b/twitter/account.py
index cc155d1..8436e26 100644
--- a/twitter/account.py
+++ b/twitter/account.py
@@ -42,7 +42,7 @@ def __init__(self, email: str = None, username: str = None, password: str = None
         self.v2_api = 'https://twitter.com/i/api/2'
         self.logger = self._init_logger(**kwargs)
         self.proxies = proxies
-        self.session = self._validate_session(email, username, password, session, proxies=proxies, **kwargs)
+        self.session = self._validate_session(email, username, password, session, proxies, **kwargs)
 
     def gql(self, method: str, operation: tuple, variables: dict, features: dict = Operation.default_features) -> dict:
         qid, op = operation
@@ -51,8 +51,6 @@ def gql(self, method: str, operation: tuple, variables: dict, features: dict = O
             'features': features,
             'variables': Operation.default_variables | variables
         }
-        if self.proxies:
-            self.session.proxies.update(self.proxies)
         if method == 'POST':
             data = {'json': params}
         else:
@@ -617,7 +615,7 @@ def _init_logger(self, **kwargs) -> Logger:
 
     @staticmethod
     def _validate_session(*args, **kwargs):
-        email, username, password, session = args
+        email, username, password, session, proxies = args
 
         # validate credentials
         if all((email, username, password)):
@@ -635,14 +633,14 @@ def _validate_session(*args, **kwargs):
 
         # try validating cookies dict
         if isinstance(cookies, dict) and all(cookies.get(c) for c in {'ct0', 'auth_token'}):
-            _session = Client(cookies=cookies, follow_redirects=True)
+            _session = Client(cookies=cookies, follow_redirects=True, proxies=proxies)
             _session._init_with_cookies = True
             _session.headers.update(get_headers(_session))
             return _session
 
         # try validating cookies from file
         if isinstance(cookies, str):
-            _session = Client(cookies=orjson.loads(Path(cookies).read_bytes()), follow_redirects=True)
+            _session = Client(cookies=orjson.loads(Path(cookies).read_bytes()), follow_redirects=True, proxies=proxies)
             _session._init_with_cookies = True
             _session.headers.update(get_headers(_session))
             return _session