Merge branch 'develop'

serafuku · Nov 24, 2024 · 5b442a3 · 5b442a3
2 parents fbdc0ff + 8770586
commit 5b442a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/src/app/api/db/create-question/route.ts b/src/app/api/db/create-question/route.ts
@@ -72,7 +72,7 @@ export async function POST(req: NextRequest) {
         if (!tokenPayload) {
           throw new Error(`No Auth Token`);
         }
-        if (tokenPayload.handle.toLowerCase() !== data.questioner.toLowerCase()) {
+        if (tokenPayload.handle !== data.questioner) {
           throw new Error(`Token and questioner not match`);
         }
       } catch (err) {

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -52,18 +52,18 @@ const mastodonAuth = async ({ host }: loginReqDto) => {
 
 /**
  * https://example.com/ 같은 URL 형식으로 온 경우 Host 형식으로 변환
- * host형식으로 온 경우 그대로 반환
+ * 소문자 처리
  * @param urlOrHost
  * @returns
  */
-function urlToHost(urlOrHost: string) {
+function convertHost(urlOrHost: string) {
   const re = /\/\/[^/@\s]+(:[0-9]{1,5})?\/?/;
   const matched_str = urlOrHost.match(re)?.[0];
   if (matched_str) {
     console.log(`URL ${urlOrHost} replaced with ${matched_str.replaceAll('/', '')}`);
-    return matched_str.replaceAll('/', '');
+    return matched_str.replaceAll('/', '').toLowerCase();
   }
-  return urlOrHost;
+  return urlOrHost.toLowerCase();
 }
 
 export default function Home() {
@@ -80,7 +80,7 @@ export default function Home() {
 
   const onSubmit: SubmitHandler<FormValue> = async (e) => {
     setIsLoading(true);
-    const host = urlToHost(e.address);
+    const host = convertHost(e.address);
     localStorage.setItem('server', host);
 
     detectInstance(host).then((type) => {
@@ -89,20 +89,7 @@ export default function Home() {
       };
       switch (type) {
         case 'misskey':
-          localStorage.setItem('server', host);
-          misskeyAuth(payload)
-            .then((r) => {
-              setIsLoading(false);
-              router.replace(r.url);
-            })
-            .catch((err) => {
-              setIsLoading(false);
-              setErrorMessage(err);
-              errModalRef.current?.showModal();
-            });
-          break;
         case 'cherrypick':
-          localStorage.setItem('server', host);
           misskeyAuth(payload)
             .then((r) => {
               setIsLoading(false);
@@ -115,7 +102,6 @@ export default function Home() {
             });
           break;
         case 'mastodon':
-          localStorage.setItem('server', host);
           mastodonAuth(payload)
             .then((r) => {
               router.replace(r);