From 5742cdaf5a0285725b630a769626c7f72cf635d8 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 11 Mar 2021 22:54:12 +0800 Subject: refactor: Improve base64. --- FrontEnd/src/app/http/common.ts | 6 +++++- FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'FrontEnd/src') diff --git a/FrontEnd/src/app/http/common.ts b/FrontEnd/src/app/http/common.ts index ef9a505e..5006109d 100644 --- a/FrontEnd/src/app/http/common.ts +++ b/FrontEnd/src/app/http/common.ts @@ -61,7 +61,11 @@ export function setHttpToken(token: string | null): void { } } -export function base64(blob: Blob): Promise { +export function base64(blob: Blob | string): Promise { + if (typeof blob === "string") { + return Promise.resolve(btoa(blob)); + } + return new Promise((resolve) => { const reader = new FileReader(); reader.onload = function () { diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx index 6c428b74..025b41c0 100644 --- a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx +++ b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx @@ -168,13 +168,13 @@ const TimelinePostEdit: React.FC = (props) => { case "text": requestData = { contentType: "text/plain", - data: await base64(new Blob([text])), + data: await base64(text), }; break; case "markdown": requestData = { contentType: "text/markdown", - data: await base64(new Blob([markdown])), + data: await base64(markdown), }; break; case "image": -- cgit v1.2.3