Merge branch 'master' into feat/move-to-ssr

teknologi-umum · Mar 16, 2024 · 7048661 · 7048661
2 parents 44436be + dbbfb12
commit 7048661
Show file tree

Hide file tree

Showing 5 changed files with 230 additions and 4 deletions.
diff --git a/src/components/chat-bubble/ChatBubble.tsx b/src/components/chat-bubble/ChatBubble.tsx
@@ -1,5 +1,6 @@
 import { Match, Show, Switch } from "solid-js";
 import type { TelegramMessage } from "~/service/Parser";
+import { MediaPoll } from "./MediaPoll";
 import "./ChatBubble.scss";
 
 type ChatBubbleProps = TelegramMessage & {
@@ -47,18 +48,19 @@ export function ChatBubble(props: ChatBubbleProps) {
 				<Match when={props.hasMedia}>
 					<img
 						class={resolveMediaClassname()}
-						src={props.hasMedia ? `/chats/${props.slug}/${props.file}` : ""}
+						src={props.hasMedia && props.mediaType !== "poll" ? `/chats/${props.slug}/${props.file}` : ""}
 					/>
 					<Show when={props.text.length}>
 						<div
 							class="chat-content"
 							style={{
-								"padding": props.repliedTo ? "0" : "1rem 2rem 1.5rem 2rem",
-								"padding-top": "1rem"
+								padding: props.repliedTo ? "0" : "1rem 2rem 1.5rem 2rem",
+								"padding-top": "1rem",
 							}}
 							innerHTML={props.text}
 						/>
 					</Show>
+					{props.hasMedia && props.mediaType === "poll" && <MediaPoll {...props} />}
 				</Match>
 				<Match when={!props.hasMedia}>
 					<div class="chat-content" innerHTML={props.text} />

diff --git a/src/components/chat-bubble/MediaPoll.scss b/src/components/chat-bubble/MediaPoll.scss
@@ -0,0 +1,51 @@
+@use "../../styles/variables.scss";
+
+.poll {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 8rem;
+	padding: 2rem;
+
+	&-chart {
+		width: 50%;
+
+		rect {
+			stroke: variables.$black;
+			stroke-width: 0.01rem;
+		}
+	}
+
+	&-legend {
+		span {
+			display: block;
+		}
+		span::before {
+			content: "";
+			display: inline-block;
+			width: 2rem;
+			height: 2rem;
+			margin-right: 0.5rem;
+			background-color: var(--marker-color);
+			border: 0.2rem variables.$black solid;
+			vertical-align: middle;
+		}
+	}
+}
+@media (max-width: variables.$screen-md-min) {
+	.poll {
+		flex-direction: column;
+		gap: 2rem;
+
+		&-chart {
+			width: 80%;
+		}
+
+		&-legend {
+			span::before {
+				width: 1rem;
+				height: 1rem;
+			}
+		}
+	}
+}
diff --git a/src/components/chat-bubble/MediaPoll.tsx b/src/components/chat-bubble/MediaPoll.tsx
@@ -0,0 +1,60 @@
+import type { TelegramMessagePoll } from "~/service/Parser";
+import "./MediaPoll.scss";
+
+// colorblind-friendly colors
+// and Telegram has maximum of 10 options
+const colors = [
+	"#1F77B4", // Strong Blue
+	"#FF7F0E", // Strong Orange
+	"#2CA02C", // Strong Green
+	"#D62728", // Strong Red
+	"#9467BD", // Strong Purple
+	"#8C564B", // Strong Brown
+	"#E377C2", // Strong Pink
+	"#7F7F7F", // Medium Gray
+	"#BCBD22", // Strong Yellow
+	"#17BECF", // Strong Cyan
+];
+
+export function MediaPoll(props: TelegramMessagePoll) {
+	const chartSize = 20;
+	const barWidth = 20 / props.pollResult.length;
+
+	const maxVotes = Math.max(...props.pollResult.map((opt) => opt.votes));
+	const normalizeVotes = (vote: number) => (vote / maxVotes) * chartSize * /* provide some top padding */ 0.8;
+
+	return (
+		<div class="poll">
+			<svg class="poll-chart" xmlns="http://www.w3.org/2000/svg" viewBox={`0 0 ${chartSize} ${chartSize}`}>
+				<title innerHTML={props.text} />
+
+				<g class="poll-bars">
+					{props.pollResult.map((option, i) => (
+						<>
+							<rect
+								x={i * barWidth}
+								y={chartSize - normalizeVotes(option.votes)}
+								height={normalizeVotes(option.votes)}
+								width={barWidth}
+								fill={colors[i] ?? "#7f7f7f"}
+							/>
+							<text
+								x={i * barWidth + barWidth / 2}
+								y={chartSize - normalizeVotes(option.votes) - 2}
+								font-size="0.14rem"
+								text-anchor="middle"
+							>
+								{option.votes}
+							</text>
+						</>
+					))}
+				</g>
+			</svg>
+			<div class="poll-legend">
+				{props.pollResult.map((option, i) => (
+					<span style={{ "--marker-color": colors[i] }}>{option.text}</span>
+				))}
+			</div>
+		</div>
+	);
+}
diff --git a/src/service/Parser.ts b/src/service/Parser.ts
@@ -54,12 +54,23 @@ export type TelegramMessageWithVideoFile = {
 	height: number;
 } & TelegramMessageBase;
 
+export type TelegramMessagePoll = {
+	hasMedia: true;
+	mediaType: "poll";
+	pollResult: {
+		text: string;
+		votes: number;
+	}[];
+	explanation?: string;
+} & TelegramMessageBase;
+
 export type TelegramMessage =
 	| (TelegramMessageBase & { hasMedia: false })
 	| TelegramMessageWithAnimation
 	| TelegramMessageWithPhoto
 	| TelegramMessageWithSticker
-	| TelegramMessageWithVideoFile;
+	| TelegramMessageWithVideoFile
+	| TelegramMessagePoll;
 
 export type TelegramChat = {
 	chatName: string;
@@ -131,6 +142,20 @@ const exportedChatHistorySchema = z.object({
 					})
 				)
 				.optional(),
+			poll: z
+				.object({
+					question: z.string(),
+					closed: z.boolean(),
+					total_voters: z.number(),
+					answers: z.array(
+						z.object({
+							text: z.string(),
+							voters: z.number(),
+							chosen: z.boolean(),
+						})
+					),
+				})
+				.optional(),
 		})
 	),
 });
@@ -349,6 +374,26 @@ export class Parser {
 					mimeType: message.mime_type ?? "",
 				});
 				continue;
+			} else if (message.poll !== undefined) {
+				telegramChat.message.push({
+					date: new Date(message.date),
+					from: {
+						name: message.from,
+						id: Number.parseInt(message.from_id.replace("user", "")),
+					},
+					messageId: message.id,
+					replyToMessageId: message.reply_to_message_id,
+					text: message.poll.question,
+					hasMedia: true,
+					mediaType: "poll",
+					pollResult: message.poll.answers.map((answer) => {
+						return {
+							text: answer.text,
+							votes: answer.voters,
+						};
+					}),
+				});
+				continue;
 			} else {
 				telegramChat.message.push({
 					date: new Date(message.date),

diff --git a/tests/service/Parser.test.ts b/tests/service/Parser.test.ts
@@ -1709,3 +1709,71 @@ test("parse without text_entity", () => {
 		},
 	]);
 });
+
+test("message poll", () => {
+	const stub = `{
+		"name": "Teknologi Umum v2.0",
+		"type": "public_supergroup",
+		"id": 1712691810,
+		"messages": [
+			{
+				"id": 632576,
+				"type": "message",
+				"date": "2024-02-25T11:53:31",
+				"date_unixtime": "1708836811",
+				"from": "Reinaldy",
+				"from_id": "user1462097294",
+				"poll": {
+					"question": "Apakah Anda tahu kalau SSL certificate bisa digunakan selain untuk keperluan website (https)?",
+					"closed": false,
+					"total_voters": 25,
+					"answers": [
+						{
+							"text": "Tahu",
+							"voters": 11,
+							"chosen": true
+						},
+						{
+							"text": "Tidak",
+							"voters": 14,
+							"chosen": false
+						}
+					]
+				},
+				"text": "",
+				"text_entities": []
+			}
+		]
+	}`;
+
+	const parser = new Parser();
+
+	const telegramChat = parser.fromExportedChatHistory(stub);
+
+	expect(telegramChat.chatId).toEqual(1712691810);
+	expect(telegramChat.chatName).toEqual("Teknologi Umum v2.0");
+	expect(telegramChat.message).toStrictEqual([
+		{
+			date: new Date("2024-02-25T11:53:31"),
+			from: {
+				id: 1462097294,
+				name: "Reinaldy",
+			},
+			hasMedia: true,
+			mediaType: "poll",
+			messageId: 632576,
+			replyToMessageId: undefined,
+			text: "Apakah Anda tahu kalau SSL certificate bisa digunakan selain untuk keperluan website (https)?",
+			pollResult: [
+				{
+					text: "Tahu",
+					votes: 11,
+				},
+				{
+					text: "Tidak",
+					votes: 14,
+				},
+			],
+		},
+	]);
+});