feat: winter 2024 high priority

* fix: Japanese signedInAs text * fix: replace new line for single enter * feat: Suggest text length over * feat: Read emoji in tweet * fix: format
RTAinJapan · Dec 17, 2024 · 4e8fbf3 · 4e8fbf3
1 parent 931cc6e
commit 4e8fbf3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/app/api/twitter.server.ts b/app/api/twitter.server.ts
@@ -159,7 +159,16 @@ export const getTweets = async () => {
 		await Promise.all(
 			tweets.slice(0, 10).map(async (tweetElement) => {
 				const textElement = await tweetElement.$("div[data-testid=tweetText]");
-				const text = await textElement?.evaluate((el) => el.textContent);
+				const text = await textElement?.evaluate((el) => {
+					let text = "";
+					for (const element of Array.from(el.children)) {
+						const looksEmoji = element.tagName === "IMG";
+						text += looksEmoji
+							? element.getAttribute("alt")
+							: element.textContent;
+					}
+					return text;
+				});
 				const timeElement = await tweetElement.waitForSelector("time");
 				if (!timeElement) {
 					return;
@@ -218,7 +227,8 @@ export const tweet = async (text: string, files: string[]) => {
 			throw new Error("No tweet input label");
 		}
 		await input.click({ count: 3 });
-		await input.type(text);
+		const fixedText = text.replace(/\r\n|\r/, "\n");
+		await input.type(fixedText);
 
 		if (files.length >= 1) {
 			const fileInput = await page.waitForSelector("input[type=file]");

diff --git a/app/i18next/translation/ja.json b/app/i18next/translation/ja.json
@@ -5,7 +5,7 @@
 	"tweetFinished": "ツイートしました",
 	"tweetFailed": "ツイートに失敗しました",
 	"submit": "送信",
-	"signedInAs": "{{account}}としてログイン中",
+	"signedInAs": "{{username}}としてログイン中",
 	"signOut": "ログアウト",
 	"delete": "削除",
 	"reply": "リプライ",

diff --git a/app/routes/_index/tweet-form.tsx b/app/routes/_index/tweet-form.tsx
@@ -13,6 +13,8 @@ const videoFileTypes = ["video/mp4", "video/quicktime"];
 
 const TweetTextInput = () => {
 	const [tweetLength, setTweetLength] = useState(0);
+	const suggestLengthOver = tweetLength > 280;
+
 	return (
 		<>
 			<TextArea
@@ -21,8 +23,16 @@ const TweetTextInput = () => {
 					setTweetLength(twitterText.getTweetLength(e.target.value));
 				}}
 				className={css({ height: "150px", width: "100%" })}
+				{...(suggestLengthOver ? { color: "red" } : {})}
 			/>
-			<div className={css({ justifySelf: "end" })}>{tweetLength}/280</div>
+			<div
+				className={css({
+					justifySelf: "end",
+					...(suggestLengthOver ? { color: "red" } : {}),
+				})}
+			>
+				{tweetLength}/280
+			</div>
 		</>
 	);
 };