From 1982bedd874db7f29e518ef6d7cbfcd1a19410ea Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Wed, 4 Dec 2024 03:01:54 -0800 Subject: [PATCH] mothership: ts fixes --- .../pockethost/src/mothership-app/pb_hooks/mothership.js | 7 +++---- .../pockethost/src/mothership-app/src/lib/util/versions.ts | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/pockethost/src/mothership-app/pb_hooks/mothership.js b/packages/pockethost/src/mothership-app/pb_hooks/mothership.js index 212c505f..f737e95b 100644 --- a/packages/pockethost/src/mothership-app/pb_hooks/mothership.js +++ b/packages/pockethost/src/mothership-app/pb_hooks/mothership.js @@ -2940,6 +2940,7 @@ var HandleSignupConfirm = (c) => { const password = parsed.password?.trim(); const desiredInstanceName = parsed.instanceName?.trim(); const region = parsed.region?.trim(); + const version = parsed.version?.trim() || versions[0]; if (!email) { throw error(`email`, "required", "Email is required"); } @@ -2976,7 +2977,6 @@ var HandleSignupConfirm = (c) => { user.set("username", username); user.set("email", email); user.set("subscription", "free"); - user.set("notifyMaintenanceMode", true); user.setPassword(password); txDao.saveRecord(user); } catch (e) { @@ -2985,13 +2985,12 @@ var HandleSignupConfirm = (c) => { try { const instance = new Record(instanceCollection); instance.set("subdomain", desiredInstanceName); - instance.set("region", region || `sfo-1`); + instance.set("region", region || `sfo-2`); instance.set("uid", user.get("id")); instance.set("status", "idle"); - instance.set("notifyMaintenanceMode", true); instance.set("syncAdmin", true); instance.set("dev", true); - instance.set("version", versions[0]); + instance.set("version", version); txDao.saveRecord(instance); } catch (e) { if (`${e}`.match(/ UNIQUE /)) { diff --git a/packages/pockethost/src/mothership-app/src/lib/util/versions.ts b/packages/pockethost/src/mothership-app/src/lib/util/versions.ts index b74fd011..aed10404 100644 --- a/packages/pockethost/src/mothership-app/src/lib/util/versions.ts +++ b/packages/pockethost/src/mothership-app/src/lib/util/versions.ts @@ -1 +1 @@ -export const versions = require(`${__hooks}/versions.cjs`) +export const versions = require(`${__hooks}/versions.cjs`) as string[]