update unique result parsing

ZakariaMQ · Jun 7, 2023 · 00f6325 · 00f6325
1 parent 938bad8
commit 00f6325
Show file tree

Hide file tree

Showing 6 changed files with 222 additions and 31 deletions.
diff --git a/scripts/clean.py b/scripts/clean.py
@@ -1 +1 @@
-import shutil;import pathlib;[shutil.rmtree(p) for p in pathlib.Path().iterdir() if p.name in {'env', 'dist', 'twitter_api_client.egg-info'}]
+import shutil;import pathlib;[shutil.rmtree(p) for p in pathlib.Path('../').iterdir() if p.name in {'env', 'dist', 'twitter_api_client.egg-info'}]
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 setup(
     name="twitter-api-client",
-    version="0.9.1",
+    version="0.9.2",
     python_requires=">=3.10.10",
     description="Twitter API",
     long_description=dedent('''

diff --git a/twitter/constants.py b/twitter/constants.py
@@ -52,6 +52,18 @@
     }
 }
 
+ID_MAP = {
+    'Followers': '^user-\d+$',
+    'Following': '^user-\d+$',
+    'UserTweets': '^tweet-\d+$',
+    'Likes': '^tweet-\d+$',
+    'UserMedia': '^tweet-\d+$',
+    'TweetsAndReplies': '^profile-conversation-\d+-tweet-\d+$',
+    'TweetDetail': '^conversationthread-\d+-tweet-\d+$',  # if another key after tweet-\d+, it's an ad
+    'Retweeters': '^user-\d+$',
+    'Favoriters': '^user-\d+$'
+}
+
 
 @dataclass
 class SpaceCategory:

diff --git a/twitter/login.py b/twitter/login.py
@@ -1,7 +1,7 @@
 import sys
-import time
 
 from httpx import Client
+
 from .constants import GREEN, YELLOW, RED, BOLD, RESET
 from .util import find_key  # ,get_confirmation_code, get_inbox, init_protonmail_session
 
@@ -162,15 +162,15 @@ def login(email: str, username: str, password: str, **kwargs) -> Client:
         headers={
             'authorization': 'Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA',
             'content-type': 'application/json',
-            'user-agent': 'Mozilla/5.0 (Linux; Android 11; Nokia G20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.88 Mobile Safari/537.36',
+            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36',
             'x-twitter-active-user': 'yes',
             'x-twitter-client-language': 'en',
         })
 
     # client.protonmail = kwargs.get('protonmail')
 
     client = execute_login_flow(client)
-    if kwargs.get('debug', True):
+    if kwargs.get('debug'):
         if not client or client.cookies.get('flow_errors') == 'true':
             print(f'[{RED}error{RESET}] {BOLD}{username}{RESET} login failed')
         else:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import shutil;import pathlib;[shutil.rmtree(p) for p in pathlib.Path().iterdir() if p.name in {'env', 'dist', 'twitter_api_client.egg-info'}]
		import shutil;import pathlib;[shutil.rmtree(p) for p in pathlib.Path('../').iterdir() if p.name in {'env', 'dist', 'twitter_api_client.egg-info'}]