2

Author: d60

README-ja.md

@@ -1,4 +1,4 @@
-<img  src="https://i.imgur.com/iJe6rsZ.png"  width="500">
+<img src="https://i.imgur.com/iJe6rsZ.png"  width="500">
 
 
 
@@ -34,10 +34,6 @@
 
 このライブラリは、無料で使用することができます。
 
-### 同期と非同期の両方に対応
-
-同期と非同期の両方に対応しています。
-
 
 ## 機能
 
@@ -67,6 +63,7 @@ pip install twikit
 **クライアントを定義し、アカウントにログインする。**
 
 ```python
+import asyncio
 from twikit import Client
 
 USERNAME = 'example_user'
@@ -76,25 +73,28 @@ PASSWORD = 'password0000'
 # Initialize client
 client = Client('en-US')
 
-# アカウントにログイン
-client.login(
-    auth_info_1=USERNAME ,
-    auth_info_2=EMAIL,
-    password=PASSWORD
-)
+async def main():
+    # アカウントにログイン
+    client.login(
+        auth_info_1=USERNAME ,
+        auth_info_2=EMAIL,
+        password=PASSWORD
+    )
+
+asyncio.run(main())
 ```
 
 **メディア付きツイートを作成する。**
 
 ```python
 # メディアをアップロードし、メディアIDを取得する。
 media_ids = [
-    client.upload_media('media1.jpg'),
-    client.upload_media('media2.jpg')
+    await client.upload_media('media1.jpg'),
+    await client.upload_media('media2.jpg')
 ]
 
 # ツイートを投稿する
-client.create_tweet(
+await client.create_tweet(
     text='Example Tweet',
     media_ids=media_ids
 )
@@ -103,7 +103,7 @@ client.create_tweet(
 
 **ツイートを検索する**
 ```python
-tweets = client.search_tweet('python', 'Latest')
+tweets = await client.search_tweet('python', 'Latest')
 
 for tweet in tweets:
     print(
@@ -115,7 +115,7 @@ for tweet in tweets:
 
 **ユーザーのツイートを取得する**
 ```python
-tweets = client.get_user_tweets('123456', 'Tweet')
+tweets = await client.get_user_tweets('123456', 'Tweet')
 
 for tweet in tweets:
     print(tweet.text)

README-zh.md

@@ -1,4 +1,4 @@
-<img  src="https://i.imgur.com/iJe6rsZ.png"  width="500">
+<img src="https://i.imgur.com/iJe6rsZ.png"  width="500">
 
 
 
@@ -36,10 +36,6 @@
 
 本库无需付费。
 
-### 同步/异步支持
-
-Twikit 同时提供同步和异步的实现。
-
 
 ## 功能
 
@@ -69,6 +65,7 @@ pip install twikit
 **定义一个客户端并登录**
 
 ```python
+import asyncio
 from twikit import Client
 
 USERNAME = 'example_user'
@@ -78,24 +75,27 @@ PASSWORD = 'password0000'
 # 初始化客户端
 client = Client('en-US')
 
-client.login(
-    auth_info_1=USERNAME ,
-    auth_info_2=EMAIL,
-    password=PASSWORD
-)
+async def main():
+    await client.login(
+        auth_info_1=USERNAME ,
+        auth_info_2=EMAIL,
+        password=PASSWORD
+    )
+
+asyncio.run(main())
 ```
 
 **创建一条附带媒体的推文**
 
 ```python
 # 上传媒体文件并获取媒体ID
 media_ids = [
-    client.upload_media('media1.jpg'),
-    client.upload_media('media2.jpg')
+    await client.upload_media('media1.jpg'),
+    await client.upload_media('media2.jpg')
 ]
 
 # 创建一条带有提供的文本和附加媒体的推文
-client.create_tweet(
+await client.create_tweet(
     text='Example Tweet',
     media_ids=media_ids
 )
@@ -104,7 +104,7 @@ client.create_tweet(
 
 **搜索推文**
 ```python
-tweets = client.search_tweet('python', 'Latest')
+tweets = await client.search_tweet('python', 'Latest')
 
 for tweet in tweets:
     print(
@@ -116,7 +116,7 @@ for tweet in tweets:
 
 **检索用户的推文**
 ```python
-tweets = client.get_user_tweets('123456', 'Tweet')
+tweets = await client.get_user_tweets('123456', 'Tweet')
 
 for tweet in tweets:
     print(tweet.text)

README.md

@@ -1,4 +1,4 @@
-<img  src="https://i.imgur.com/iJe6rsZ.png"  width="500">
+<img src="https://i.imgur.com/iJe6rsZ.png"  width="500">
 
 
 
@@ -43,10 +43,6 @@ This library uses scraping and does not require an API key.
 
 This library is free to use.
 
-### Both Synchronous and Asynchronous Support
-
-Twikit supports both synchronous and asynchronous.
-
 
 ## Functionality
 
@@ -77,6 +73,7 @@ pip install twikit
 **Define a client and log in to the account.**
 
 ```python
+import asyncio
 from twikit import Client
 
 USERNAME = 'example_user'
@@ -86,24 +83,27 @@ PASSWORD = 'password0000'
 # Initialize client
 client = Client('en-US')
 
-client.login(
-    auth_info_1=USERNAME ,
-    auth_info_2=EMAIL,
-    password=PASSWORD
-)
+async def main():
+    await client.login(
+        auth_info_1=USERNAME ,
+        auth_info_2=EMAIL,
+        password=PASSWORD
+    )
+
+asyncio.run(main())
 ```
 
 **Create a tweet with media attached.**
 
 ```python
 # Upload media files and obtain media_ids
 media_ids = [
-    client.upload_media('media1.jpg'),
-    client.upload_media('media2.jpg')
+    await client.upload_media('media1.jpg'),
+    await client.upload_media('media2.jpg')
 ]
 
 # Create a tweet with the provided text and attached media
-client.create_tweet(
+await client.create_tweet(
     text='Example Tweet',
     media_ids=media_ids
 )
@@ -112,7 +112,7 @@ client.create_tweet(
 
 **Search the latest tweets based on a keyword**
 ```python
-tweets = client.search_tweet('python', 'Latest')
+tweets = await client.search_tweet('python', 'Latest')
 
 for tweet in tweets:
     print(
@@ -124,7 +124,7 @@ for tweet in tweets:
 
 **Retrieve user tweets**
 ```python
-tweets = client.get_user_tweets('123456', 'Tweet')
+tweets = await client.get_user_tweets('123456', 'Tweet')
 
 for tweet in tweets:
     print(tweet.text)

examples/delete_all_tweets.py

@@ -1,7 +1,7 @@
 import asyncio
 import time
 
-from twikit.twikit_async import Client
+from twikit import Client
 
 AUTH_INFO_1 = '...'
 AUTH_INFO_2 = '...'

examples/dm_auto_reply.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 
 from twikit import Client
@@ -9,27 +10,32 @@
 
 client = Client()
 
-if os.path.exists('cookies.json'):
-    client.load_cookies('cookies.json')
-else:
-    client.login(
-        auth_info_1=AUTH_INFO_1,
-        auth_info_2=AUTH_INFO_2,
-        password=PASSWORD
-    )
-    client.save_cookies('cookies.json')
-
-
-user_id = '1752362966203469824'  # User ID of the DM partner to stream.
-reply_message = 'Hello'
-
-topics = {
-    Topic.dm_update(f'{client.user_id()}-{user_id}')
-}
-streaming_session = client.get_streaming_session(topics)
-
-for topic, payload in streaming_session:
-    if payload.dm_update:
-        if client.user_id() == payload.dm_update.user_id:
-            continue
-        client.send_dm(payload.dm_update.user_id, reply_message)
+
+async def main():
+    if os.path.exists('cookies.json'):
+        client.load_cookies('cookies.json')
+    else:
+        await client.login(
+            auth_info_1=AUTH_INFO_1,
+            auth_info_2=AUTH_INFO_2,
+            password=PASSWORD
+        )
+        client.save_cookies('cookies.json')
+
+
+    user_id = '1752362966203469824'  # User ID of the DM partner to stream.
+    reply_message = 'Hello'
+
+    topics = {
+        Topic.dm_update(f'{client.user_id()}-{user_id}')
+    }
+    streaming_session = await client.get_streaming_session(topics)
+
+    async for topic, payload in streaming_session:
+        if payload.dm_update:
+            if client.user_id() == payload.dm_update.user_id:
+                continue
+            await client.send_dm(payload.dm_update.user_id, reply_message)
+
+asyncio.run(main())
+

examples/download_tweet_media.py

@@ -1,4 +1,5 @@
-from twikit.twikit_async import Client
+import asyncio
+from twikit import Client
 
 AUTH_INFO_1 = '...'
 AUTH_INFO_2 = '...'
@@ -7,13 +8,16 @@
 client = Client('en-US')
 
 
-tweet = client.get_tweet_by_id('...')
+async def main():
+    tweet = await client.get_tweet_by_id('...')
 
-for i, media in enumerate(tweet.media):
-    media_url = media.get('media_url_https')
-    extension = media_url.rsplit('.', 1)[-1]
+    for i, media in enumerate(tweet.media):
+        media_url = media.get('media_url_https')
+        extension = media_url.rsplit('.', 1)[-1]
 
-    response = client.get_media(media_url)
+        response = await client.get(media_url, headers=client._base_headers)
 
-    with open(f'media_{i}.{extension}', 'wb') as f:
-        f.write(response.content)
+        with open(f'media_{i}.{extension}', 'wb') as f:
+            f.write(response.content)
+
+asyncio.run(main())