From 0626f1581e61bc24f34231f9d7e47569e52c70e2 Mon Sep 17 00:00:00 2001
From: Xeltica <xeltica@gmail.com>
Date: Mon, 28 Nov 2022 18:30:30 +0900
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E3=81=AA=E3=82=B1=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=E3=81=A7=E4=B8=8D=E6=AD=A3=E3=81=AA=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=8C=E4=BD=9C=E6=88=90=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/backend/router.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/backend/router.ts b/src/backend/router.ts
index f4356b0..05c7b73 100644
--- a/src/backend/router.ts
+++ b/src/backend/router.ts
@@ -9,7 +9,7 @@ import striptags from 'striptags';
 import MarkdownIt from 'markdown-it';
 
 import { config } from '../config';
-import { upsertUser, getUser, updateUser, updateUsersToolsToken } from './functions/users';
+import { upsertUser, getUser, updateUser } from './functions/users';
 import { api } from './services/misskey';
 import { die } from './die';
 import { misskeyAppInfo } from './const';
@@ -50,6 +50,12 @@ router.get('/login', async ctx => {
 		return;
 	}
 
+	// NOTE:
+	//   環境によってはアクセスしたドメインとMisskeyにおけるhostが異なるケースがある
+	//   そういったインスタンスにおいてアカウントの不整合が生じるため、
+	//   APIから戻ってきたホスト名を正しいものとして、改めて正規化する
+	host = meta.uri.replace(/^https?:\/\//g, '').replace(/\/+/g, '').trim();
+
 	const { name, permission, description } = misskeyAppInfo;
 
 	if (meta.features.miauth) {