From 3a24019d96b0d9d1616280b9519508a96e2c440a Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Sun, 21 Nov 2021 20:50:07 +0530
Subject: [PATCH] Convert common.js to ts

---
 src/matrix/net/common.ts       | 20 +++++++++++---------
 src/platform/types/Platform.ts |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/matrix/net/common.ts b/src/matrix/net/common.ts
index 1f0a9f69..ce9baeba 100644
--- a/src/matrix/net/common.ts
+++ b/src/matrix/net/common.ts
@@ -15,15 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import type {BlobHandle} from "../../platform/web/dom/BlobHandle.js";
+import {BlobHandle} from "../../platform/web/dom/BlobHandle.js";
 
-export interface BlobBody {
+export interface IEncodedBody {
     mimeType: string;
-    body: BlobHandle;
+    body: BlobHandle | string;
     length: number;
 }
 
-export function encodeQueryParams(queryParams) {
+export function encodeQueryParams(queryParams: object): string {
     return Object.entries(queryParams || {})
         .filter(([, value]) => value !== undefined)
         .map(([name, value]) => {
@@ -35,9 +35,10 @@ export function encodeQueryParams(queryParams) {
         .join("&");
 }
 
-export function encodeBody(body) {
-    if (body.nativeBlob && body.mimeType) {
-        const blob = body;
+export function encodeBody(body: {}): IEncodedBody {
+    // todo: code change here
+    if (body instanceof BlobHandle) {
+        const blob = body as BlobHandle;
         return {
             mimeType: blob.mimeType,
             body: blob, // will be unwrapped in request fn
@@ -48,8 +49,9 @@ export function encodeBody(body) {
         return {
             mimeType: "application/json",
             body: json,
-            length: body.length
-        };
+            // todo: code change here; body.length is a mistake?
+            length: json.length
+        }
     } else {
         throw new Error("Unknown body type: " + body);
     }
diff --git a/src/platform/types/Platform.ts b/src/platform/types/Platform.ts
index fce55f81..1cc972a8 100644
--- a/src/platform/types/Platform.ts
+++ b/src/platform/types/Platform.ts
@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 import type {RequestResult} from "../web/dom/request/fetch.js";
-import type {BlobBody} from "../../matrix/net/common";
+import type {IEncodedBody} from "../../matrix/net/common";
 
 interface IRequestOptions {
     uploadProgress?: (loadedBytes: number) => void;
     timeout?: number;
-    body?: string | BlobBody;
+    body?: IEncodedBody;
     headers?: { [key: string]: number | string };
     cache?: boolean;
     method: string;