From 4ed14fa670652fb205785028dd8bd3156e1a8526 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 17 May 2024 22:17:09 +0300 Subject: [PATCH] sed s/twitter.com/x.com/g --- mautrix_twitter/commands/auth.py | 4 ++-- mautrix_twitter/commands/conn.py | 2 +- mautrix_twitter/portal.py | 2 +- mautwitdm/streamer.py | 8 ++++---- mautwitdm/twitter.py | 16 ++++++++-------- mautwitdm/uploader.py | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mautrix_twitter/commands/auth.py b/mautrix_twitter/commands/auth.py index 03d4321..d167a04 100644 --- a/mautrix_twitter/commands/auth.py +++ b/mautrix_twitter/commands/auth.py @@ -37,10 +37,10 @@ async def login_cookie(evt: CommandEvent) -> None: "auth_token": None, } await evt.reply( - "1. Log in to [Twitter](https://www.twitter.com/) in a private/incognito window.\n" + "1. Log in to [Twitter](https://www.x.com/) in a private/incognito window.\n" "2. Press `F12` to open developer tools.\n" '3. Select the "Application" (Chrome) or "Storage" (Firefox) tab.\n' - '4. In the sidebar, expand "Cookies" and select `https://twitter.com`.\n' + '4. In the sidebar, expand "Cookies" and select `https://x.com`.\n' "5. In the cookie list, find the `auth_token` row and double click on the value" r", then copy the value and send it here." ) diff --git a/mautrix_twitter/commands/conn.py b/mautrix_twitter/commands/conn.py index 69664db..9da583c 100644 --- a/mautrix_twitter/commands/conn.py +++ b/mautrix_twitter/commands/conn.py @@ -45,7 +45,7 @@ async def ping(evt: CommandEvent) -> None: user_info = await evt.sender.get_info() await evt.reply( f"You're logged in as {user_info.name} " - f"([@{evt.sender.username}](https://twitter.com/{evt.sender.username}), " + f"([@{evt.sender.username}](https://x.com/{evt.sender.username}), " f"user ID: {evt.sender.twid})" ) diff --git a/mautrix_twitter/portal.py b/mautrix_twitter/portal.py index f2eaa61..e1ea5de 100644 --- a/mautrix_twitter/portal.py +++ b/mautrix_twitter/portal.py @@ -485,7 +485,7 @@ def deterministic_event_id(self, msg_id: str, part: str) -> EventID: hash_content = f"{self.mxid}/twitter/{msg_id}/{part}" hashed = hashlib.sha256(hash_content.encode("utf-8")).digest() b64hash = base64.urlsafe_b64encode(hashed).decode("utf-8").rstrip("=") - return EventID(f"${b64hash}:twitter.com") + return EventID(f"${b64hash}:x.com") async def _convert_twitter_message( self, source: u.User, sender: p.Puppet, message: MessageData diff --git a/mautwitdm/streamer.py b/mautwitdm/streamer.py index 3a45205..187b689 100644 --- a/mautwitdm/streamer.py +++ b/mautwitdm/streamer.py @@ -25,8 +25,8 @@ class TwitterStreamer(TwitterDispatcher): via ``/live_pipeline/events``. """ - pipeline_url = URL("https://api.twitter.com/live_pipeline/events") - pipeline_update_url = URL("https://api.twitter.com/1.1/live_pipeline/update_subscriptions") + pipeline_url = URL("https://api.x.com/live_pipeline/events") + pipeline_update_url = URL("https://api.x.com/1.1/live_pipeline/update_subscriptions") log: logging.Logger loop: asyncio.AbstractEventLoop @@ -44,8 +44,8 @@ async def _stream(self) -> AsyncGenerator[StreamEvent, None]: "Accept": "text/event-stream", "Accept-Language": "en-US,en;q=0.5", "DNT": "1", - "Origin": "https://twitter.com", - "Referer": "https://twitter.com/messages", + "Origin": "https://x.com", + "Referer": "https://x.com/messages", "Pragma": "no-cache", } empty_bytes = b"" diff --git a/mautwitdm/twitter.py b/mautwitdm/twitter.py index 48b0b72..dc936de 100644 --- a/mautwitdm/twitter.py +++ b/mautwitdm/twitter.py @@ -25,13 +25,13 @@ Tokens = NamedTuple("Tokens", auth_token=str, csrf_token=str) DownloadResp = NamedTuple("DownloadResp", data=bytes, mime_type=str) -twitter_com = URL("https://twitter.com/") +twitter_com = URL("https://x.com/") class TwitterAPI(TwitterUploader, TwitterStreamer, TwitterPoller): """The main entrypoint for using the internal Twitter DM API.""" - base_url: URL = URL("https://api.twitter.com/1.1") + base_url: URL = URL("https://api.x.com/1.1") dm_url: URL = base_url / "dm" loop: asyncio.AbstractEventLoop @@ -76,9 +76,9 @@ def set_tokens(self, auth_token: str, csrf_token: str) -> None: """ cookie = SimpleCookie() cookie["auth_token"] = auth_token - cookie["auth_token"].update({"domain": "twitter.com", "path": "/"}) + cookie["auth_token"].update({"domain": "x.com", "path": "/"}) cookie["ct0"] = csrf_token - cookie["ct0"].update({"domain": "twitter.com", "path": "/"}) + cookie["ct0"].update({"domain": "x.com", "path": "/"}) self.http.cookie_jar.update_cookies(cookie, twitter_com) def mark_typing(self, conversation_id: str | None) -> None: @@ -93,7 +93,7 @@ def mark_typing(self, conversation_id: str | None) -> None: @property def tokens(self) -> Tokens | None: - cookies = self.http.cookie_jar.filter_cookies(URL("https://twitter.com/")) + cookies = self.http.cookie_jar.filter_cookies(URL("https://x.com/")) try: return Tokens(auth_token=cookies["auth_token"].value, csrf_token=cookies["ct0"].value) except KeyError: @@ -118,8 +118,8 @@ def headers(self) -> dict[str, str]: "Accept": "*/*", "Accept-Language": "en-US,en;q=0.5", "DNT": "1", - "Origin": "https://twitter.com", - "Referer": "https://twitter.com/messages", + "Origin": "https://x.com", + "Referer": "https://x.com/messages", "x-twitter-auth-type": "OAuth2Session", "x-twitter-client-language": "en", "x-twitter-active-user": "yes", @@ -130,7 +130,7 @@ async def download_media(self, url: str) -> DownloadResp: headers = { "Accept": "*/*", "DNT": "1", - "Referer": "https://twitter.com/messages", + "Referer": "https://x.com/messages", "User-Agent": self.user_agent, } async with self.http.get(url, headers=headers) as resp: diff --git a/mautwitdm/uploader.py b/mautwitdm/uploader.py index ac1db76..a2ad8bf 100644 --- a/mautwitdm/uploader.py +++ b/mautwitdm/uploader.py @@ -17,7 +17,7 @@ class TwitterUploader: - upload_url: URL = URL("https://upload.twitter.com/i/media/upload.json") + upload_url: URL = URL("https://upload.x.com/i/media/upload.json") http: ClientSession log: logging.Logger