From 4f9dfbc3c63f5e77566043687c2da29501266844 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 11 Dec 2022 18:32:19 -0800
Subject: [PATCH] Fix UI, beta versioning

---
 package.json                                  |  2 +-
 .../src/server/api/endpoints/i/known-as.ts    | 21 +++++++++----------
 .../client/src/pages/settings/migration.vue   |  5 ++++-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 212136cda..dad94fd35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.0.0-rc5",
+	"version": "13.0.0-beta1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/server/api/endpoints/i/known-as.ts b/packages/backend/src/server/api/endpoints/i/known-as.ts
index 924d74de8..7b3354190 100644
--- a/packages/backend/src/server/api/endpoints/i/known-as.ts
+++ b/packages/backend/src/server/api/endpoints/i/known-as.ts
@@ -1,14 +1,14 @@
 import { In } from 'typeorm';
-import { User } from '@/models/entities/user.js';
+import type { User } from '@/models/entities/user.js';
 import { Users, DriveFiles, Notes, Channels, Blockings } from '@/models/index.js';
 import { resolveUser } from '@/remote/resolve-user.js';
-import { ApiError } from '../../error.js';
 import acceptAllFollowRequests from '@/services/following/requests/accept-all.js';
 import { publishToFollowers } from '@/services/i/update.js';
-import { apiLogger } from '../../logger.js';
 import { publishMainStream, publishUserEvent } from '@/services/stream.js';
-import define from '../../define.js';
 import { DAY } from '@/const.js';
+import { apiLogger } from '../../logger.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['users'],
@@ -32,7 +32,7 @@ export const meta = {
 			code: 'NOT_REMOTE',
 			id: '4362f8dc-731f-4ad8-a694-be2a88922a24',
 		},
-	}
+	},
 } as const;
 
 export const paramDef = {
@@ -45,15 +45,14 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
-
-	if(!ps.alsoKnownAs) throw new ApiError(meta.errors.noSuchUser);
+	if (!ps.alsoKnownAs) throw new ApiError(meta.errors.noSuchUser);
 
 	let unfiltered: string = ps.alsoKnownAs;
 
-	if(unfiltered.startsWith('@')) unfiltered = unfiltered.substring(1);
-	if(!unfiltered.includes('@')) throw new ApiError(meta.errors.notRemote);
+	if (unfiltered.startsWith('@')) unfiltered = unfiltered.substring(1);
+	if (!unfiltered.includes('@')) throw new ApiError(meta.errors.notRemote);
 
-	let userAddress: string[] = unfiltered.split("@");
+	const userAddress: string[] = unfiltered.split('@');
 
 	const knownAs: User = await resolveUser(userAddress[0], userAddress[1]).catch(e => {
 		apiLogger.warn(`failed to resolve remote user: ${e}`);
@@ -62,7 +61,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	const updates = {} as Partial<User>;
 
-	if(!knownAs.uri) knownAs.uri = "";
+	if (!knownAs.uri) knownAs.uri = '';
 	updates.alsoKnownAs = [knownAs.uri];
 
 	await Users.update(user.id, updates);
diff --git a/packages/client/src/pages/settings/migration.vue b/packages/client/src/pages/settings/migration.vue
index 80285b232..005abf5e4 100644
--- a/packages/client/src/pages/settings/migration.vue
+++ b/packages/client/src/pages/settings/migration.vue
@@ -18,7 +18,7 @@
 			<template #prefix><i class="ph-airplane-landing-bold ph-lg"></i></template>
 			<template #label>{{ i18n.ts.moveFromLabel }}</template>
 		</FormInput>
-		<FormButton class="button" inline primary @click="save(accountAlias)">
+		<FormButton class="button" inline primary @click="save(accountAlias.toString())">
 			<i class="ph-floppy-disk-back-bold ph-lg"></i> {{ i18n.ts.save }}
 		</FormButton>
 		<div class="description">{{ i18n.ts.moveFromDescription }}</div>
@@ -38,6 +38,9 @@ let moveToAccount = $ref('');
 let accountAlias = $ref('');
 
 async function save(account): Promise<void> {
+	console.log(accountAlias);
+	console.log(accountAlias.toString());
+	console.log(account);
 	os.apiWithDialog('i/known-as', {
 		alsoKnownAs: account,
 	});