twitter-openapi-python 0.0.9__tar.gz → 0.0.12__tar.gz

{twitter_openapi_python-0.0.9 → twitter_openapi_python-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twitter_openapi_python
-Version: 0.0.9
+Version: 0.0.12
 Summary: Twitter OpenAPI
 Home-page: https://github.com/fa0311/twitter_openapi_python
 Author: fa0311

{twitter_openapi_python-0.0.9 → twitter_openapi_python-0.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twitter_openapi_python"
-version = "0.0.9"
+version = "0.0.12"
 description = "Twitter OpenAPI"
 authors = ["fa0311 <yuki@yuki0311.com>"]
 license = "proprietary" # or "AGPL-3.0-only"
@@ -14,7 +14,7 @@ include = ["twitter_openapi_python/py.typed"]
 python = "^3.7"
 pydantic = "^1.10.5, <2"
 
-twitter-openapi-python-generated = "0.0.6"
+twitter-openapi-python-generated = "0.0.7"
 
 [tool.poetry.dev-dependencies]
 

{twitter_openapi_python-0.0.9 → twitter_openapi_python-0.0.12}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import find_packages, setup
 
 NAME = "twitter_openapi_python"
-VERSION = "0.0.9"
+VERSION = "0.0.12"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "twitter_openapi_python_generated == 0.0.6",

{twitter_openapi_python-0.0.9 → twitter_openapi_python-0.0.12}/twitter_openapi_python/client.py

@@ -1,4 +1,4 @@
-import random
+import json
 import re
 from typing import Any
 
@@ -120,12 +120,10 @@ class TwitterOpenapiPython:
 
         if cookies.get("ct0"):
             api_key.update({"AuthType": "OAuth2Session"})
-        ct0 = cookies.get("ct0", "".join(random.choices("0123456789abcdef", k=32)))
-        api_key.update({"CsrfToken": ct0})
+            api_key.update({"CsrfToken": cookies["ct0"]})
 
-        gt = cookies.get("gt")
-        if gt is not None:
-            api_key.update({"GuestToken": gt})
+        if cookies.get("gt"):
+            api_key.update({"GuestToken": cookies["gt"]})
 
         api_conf = conf.Configuration(api_key=api_key)
         api_conf.access_token = self.access_token
@@ -157,4 +155,23 @@ class TwitterOpenapiPython:
 
         find = re.findall(r'document.cookie="(.*?)";', res_2.data.decode())
         session.update(self.cookie_normalize(find))
+
+        session.pop("ct0")
+
+        if not session.get("gt"):
+            activate_header = self.browser_headers | {
+                "authorization": "Bearer {}".format(self.access_token),
+                "x-twitter-active-user": "yes",
+                "x-twitter-client-language": "en",
+            }
+            res_3 = http.request(
+                "POST",
+                "https://api.twitter.com/1.1/guest/activate.json",
+                headers=activate_header | {"Cookie": self.cookie_to_str(session)},
+            )
+            gt = json.loads(res_3.data.decode())["guest_token"]
+            session.update({"gt": gt})
+
+        # ct0 = cookies.get("ct0", "".join(random.choices("0123456789abcdef", k=32)))
+
         return self.get_client_from_cookies(session)

{twitter_openapi_python-0.0.9 → twitter_openapi_python-0.0.12}/twitter_openapi_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twitter-openapi-python
-Version: 0.0.9
+Version: 0.0.12
 Summary: Twitter OpenAPI
 Home-page: https://github.com/fa0311/twitter_openapi_python
 Author: fa0311