[App] Set version

[Core] Fix base64 parsing
OzymandiasTheGreat · Jul 14, 2022 · bda8330 · bda8330
1 parent 1de122a
commit bda8330
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/apps/app/app.json b/apps/app/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "Void",
     "slug": "Void",
-    "version": "1.0.0",
+    "version": "0.1.0-alpha1",
     "scheme": "screamingvoid",
     "orientation": "portrait",
     "icon": "./assets/icon.png",

diff --git a/apps/app/package.json b/apps/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "void",
-  "version": "1.0.0",
+  "version": "0.1.0-alpha1",
   "scripts": {
     "android": "expo run:android",
     "ios": "expo run:ios",

diff --git a/apps/app/src-tauri/tauri.conf.json b/apps/app/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Void",
-    "version": "0.1.0"
+    "version": "0.1.0-alpha1"
   },
   "tauri": {
     "allowlist": {

diff --git a/apps/app/src/interface.ts b/apps/app/src/interface.ts
@@ -673,8 +673,6 @@ export class VoidInterface extends EventEmitter2 {
 				data.bio,
 				data.avatar
 			);
-			// TODO DELETEME
-			this.core.onAny(console.log);
 			this.subscribe();
 			await RNFS.writeFile(
 				path.join(AVATARS, data.publicKey),

diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
@@ -31,11 +31,21 @@ export async function uriToImage(uri: string): Promise<Buffer> {
 		const base64 = uri.slice(uri.indexOf(","));
 		data = Buffer.from(base64, "base64");
 	} else {
-		mimetype = mimetypes.lookup(uri) as string;
-		if (!mimetype) {
-			return Buffer.alloc(0);
+		if (
+			await fs
+				.access(uri)
+				.then(() => true)
+				.catch(() => false)
+		) {
+			mimetype = mimetypes.lookup(uri) as string;
+			if (!mimetype) {
+				return Buffer.alloc(0);
+			}
+			data = await fs.readFile(uri);
+		} else {
+			mimetype = "image/jpeg";
+			data = Buffer.from(uri, "base64");
 		}
-		data = await fs.readFile(uri);
 	}
 	return Image.encode({ mimetype, data });
 }