From 026329b68b3c6cb6ab1375ddcb40b1de8cb2d469 Mon Sep 17 00:00:00 2001
From: tako0614 <shoutatomiyama0614@gmail.com>
Date: Wed, 17 Jul 2024 22:23:59 +0900
Subject: [PATCH] Refactor code to use 'timestamp' instead of 'time' in
 ChatTalkContent

---
 components/OtherMessage.tsx                   |  11 +--
 components/WelcomeMessage.tsx                 |   2 +-
 components/welcome.tsx                        |  48 +++++++++--
 islands/ChatTalkContent.tsx                   |  81 +++++++-----------
 routes/api/v2/client/friends/list.ts          |   2 +-
 routes/api/v2/client/friends/request/list.ts  |   2 +-
 routes/api/v2/client/settings/privacy.ts      |  10 ++-
 routes/api/v2/client/talks/friend/data.ts     |   4 +-
 routes/api/v2/client/talks/friend/text.ts     |   5 +-
 routes/api/v2/client/users/friendkey.ts       |   5 +-
 routes/api/v2/client/users/icon.ts            |   2 +-
 routes/api/v2/client/users/settings.ts        |   5 +-
 .../v2/server/information/users/changes.ts    |   5 +-
 .../v2/server/information/users/profile.ts    |  20 ++++-
 static/logo.png                               | Bin 0 -> 4954 bytes
 util/takosClient.ts                           |   7 ++
 16 files changed, 131 insertions(+), 78 deletions(-)
 create mode 100644 static/logo.png

diff --git a/components/OtherMessage.tsx b/components/OtherMessage.tsx
index 842e198d..737ca168 100644
--- a/components/OtherMessage.tsx
+++ b/components/OtherMessage.tsx
@@ -1,28 +1,23 @@
-const ChatOtherMessage = (
-  { time, message, sender, senderNickName, isPrimary }: any,
-) => {
+const ChatOtherMessage = ({ name, time, message, isPrimary, nickName }: any) => {
   const isPrimaryClass = isPrimary ? "c-talk-chat other primary" : "c-talk-chat other subsequent";
-
   return (
     <li class={isPrimaryClass}>
       <div class="c-talk-chat-box">
         {isPrimary && (
           <div class="c-talk-chat-icon">
             <img
-              src={`/api/v1/friends/${sender}/icon/`}
+              src={`/api/v2/client/friends/info/${name}/icon/friend`}
               alt=""
               class="rounded-full text-white dark:text-black"
             />
           </div>
         )}
-
         <div class="c-talk-chat-right">
           {isPrimary && (
             <div class="c-talk-chat-name">
-              <p>{senderNickName}</p>
+              <p>{nickName}</p>
             </div>
           )}
-
           <div class="c-talk-chat-msg">
             <p>
               {convertLineBreak(message)}
diff --git a/components/WelcomeMessage.tsx b/components/WelcomeMessage.tsx
index 439ebeaf..616e6155 100644
--- a/components/WelcomeMessage.tsx
+++ b/components/WelcomeMessage.tsx
@@ -17,7 +17,7 @@ const ChatOtherMessage = (
             <img
               src={iconPath}
               alt=""
-              class="rounded-full text-white dark:text-black"
+              class="rounded-full text-white"
             />
           </div>
         )}
diff --git a/components/welcome.tsx b/components/welcome.tsx
index f9d7a697..f5f26c19 100644
--- a/components/welcome.tsx
+++ b/components/welcome.tsx
@@ -90,7 +90,7 @@ function welcome() {
               <div class="w-full">
                 <div class="flex items-center mb-4">
                   <img
-                    src="./logo-mine.jpg"
+                    src="/logo-mine.jpg"
                     alt="logo"
                     class="w-20 h-20 rounded-lg shadow-md"
                   />
@@ -142,6 +142,44 @@ function welcome() {
               <img src="/api/v2/client/chart" class="w-full" alt="list" />
             </div>
           </div>
+          <div class="mt-4">
+            <div class="bg-white text-black rounded-lg shadow-[0_12px_32px_#00000040] p-6 max-w-[472px] lg:ml-[100px] lg:mt-[20px] mx-auto">
+              <div class="text-center">
+              <p class="text-sm text-gray-700">© 2024 Tomiyama Shota.</p>
+                <p class="text-base text-gray-600">
+                    Operat By takoserver
+                </p>
+
+                <p class="text-sm text-gray-700">
+                    This site is protected by reCAPTCHA and the Google
+                    <a href="https://policies.google.com/privacy">Privacy Policy</a> and
+                    <a href="https://policies.google.com/terms">Terms of Service</a> apply.
+                </p>
+                <div class="flex justify-between w-5/6 mx-auto">
+                    <p>
+                        <a href="https://www.takos.jp/privacypolicy">
+                            プライバシーポリシー
+                        </a>
+                    </p>
+                    <p class="ml-4">
+                        <a href="https://www.takos.jp/terms">
+                            利用規約
+                        </a>
+                    </p>
+                    <p class="ml-4">
+                        <a href="https://x.com/takoserver_com">
+                            SNS
+                        </a>
+                    </p>
+                    <p class="ml-4">
+                        <a href="https://line.me/ti/g2/Q0c8YJlkh5f_hkDuODxp39XF9A7BOCFqezaAHA?utm_source=invitation&utm_medium=link_copy&utm_campaign=default">
+                            コミュニティー
+                        </a>
+                    </p>
+                  </div>
+              </div>
+            </div>
+          </div>
           <div class="h-20"></div>
         </div>
         <div class="lg:w-[590px] hidden lg:block top-0 bottom-0 right-0 fixed">
@@ -151,16 +189,16 @@ function welcome() {
                 let iconPath = "";
                 switch (data.userName) {
                   case "tako":
-                    iconPath = "./static/tako.jpeg";
+                    iconPath = "/static/tako.jpeg";
                     break;
                   case "371tti":
-                    iconPath = "./static/371tti.jpg";
+                    iconPath = "/static/371tti.jpg";
                     break;
                   case "なん":
-                    iconPath = "./static/なん.jpeg";
+                    iconPath = "/static/なん.jpeg";
                     break;
                   default:
-                    iconPath = "./people.jpeg";
+                    iconPath = "/people.jpeg";
                     break;
                 }
                 if (data.img) {
diff --git a/islands/ChatTalkContent.tsx b/islands/ChatTalkContent.tsx
index 9810176c..626c6d86 100644
--- a/islands/ChatTalkContent.tsx
+++ b/islands/ChatTalkContent.tsx
@@ -2,6 +2,7 @@ import ChatDate from "../components/ChatDate.tsx";
 import ChatSendMessage from "../components/SendMessage.tsx";
 import ChatOtherMessage from "../components/OtherMessage.tsx";
 import { AppStateType } from "../util/types.ts";
+import { splitUserName } from "../util/takosClient.ts";
 interface Messages {
   messageid: string;
   userName: string;
@@ -9,6 +10,7 @@ interface Messages {
   timestamp: string;
   type: string;
 }
+
 function ChatTalkMain({ state }: { state: AppStateType }) {
   let SendPrimary = true;
   let OtherPrimary = true;
@@ -20,18 +22,16 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
         const isEncodeDate = new Date(DateState).toLocaleDateString() !==
           date.toLocaleDateString();
         DateState = data.timestamp;
-        if (data.type == "text") {
-          if (data.userName == state.userName) {
+
+        if (data.type === "text") {
+          console.log(splitUserName(data.userName).domain, window.location.host);
+          if (state.userName === splitUserName(data.userName).userName && splitUserName(data.userName).domain === window.location.host) {
             if (SendPrimary) {
               SendPrimary = false;
               OtherPrimary = true;
               return (
                 <>
-                  {isEncodeDate && (
-                    <ChatDate
-                      date={new Date(data.timestamp)}
-                    />
-                  )}
+                  {isEncodeDate && <ChatDate date={new Date(data.timestamp)} />}
                   <ChatSendMessage
                     isRead={data.isRead}
                     time={data.timestamp}
@@ -42,16 +42,13 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
                 </>
               );
             }
-            // 前のメッセージから1分以上経過のものはprimaryに
-            const prevDate = new Date(state.talkData.value[index - 1].time);
-            if (date.getTime() - prevDate.getTime() > 60000) {
+
+            // 前のメッセージから1時間以上経過のものはprimaryに
+            const prevDate = index > 0 ? new Date(state.talkData.value[index - 1].timestamp) : null;
+            if (prevDate && (date.getTime() - prevDate.getTime() > 3600000)) {
               return (
                 <>
-                  {isEncodeDate && (
-                    <ChatDate
-                      date={new Date(data.timestamp)}
-                    />
-                  )}
+                  {isEncodeDate && <ChatDate date={new Date(data.timestamp)} />}
                   <ChatSendMessage
                     isRead={data.isRead}
                     time={data.timestamp}
@@ -65,11 +62,7 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
 
             return (
               <>
-                {isEncodeDate && (
-                  <ChatDate
-                    date={new Date(data.timestamp)}
-                  />
-                )}
+                {isEncodeDate && <ChatDate date={new Date(data.timestamp)} />}
                 <ChatSendMessage
                   isRead={data.isRead}
                   time={data.timestamp}
@@ -83,16 +76,11 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
             if (OtherPrimary) {
               OtherPrimary = false;
               SendPrimary = true;
-              console.log(data);
               return (
                 <>
-                  {isEncodeDate && (
-                    <ChatDate
-                      date={new Date(data.time)}
-                    />
-                  )}
+                  {isEncodeDate && <ChatDate date={new Date(data.timestamp)} />}
                   <ChatOtherMessage
-                    time={data.time}
+                    time={data.timestamp}
                     message={data.message}
                     name={data.userName}
                     nickName={data.nickName}
@@ -101,38 +89,31 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
                 </>
               );
             }
-            // 前のメッセージから1分以上経過のものはprimaryに
-            const prevDate = new Date(state.talkData.value[index - 1].time);
-            if (date.getTime() - prevDate.getTime() > 60000) {
+
+            // 前のメッセージから1時間以上経過のものはprimaryに
+            const prevDate = index > 0 ? new Date(state.talkData.value[index - 1].timestamp) : null;
+            if (prevDate && (date.getTime() - prevDate.getTime() > 3600000)) {
               return (
                 <>
-                  {isEncodeDate && (
-                    <ChatDate
-                      date={new Date(data.time)}
-                    />
-                  )}
+                  {isEncodeDate && <ChatDate date={new Date(data.timestamp)} />}
                   <ChatOtherMessage
-                    time={data.time}
+                    time={data.timestamp}
                     message={data.message}
-                    name={data.nickName}
+                    name={data.userName}
                     nickName={data.nickName}
                     isPrimary={true}
                   />
                 </>
               );
             }
+
             return (
               <>
-                {isEncodeDate && (
-                  <ChatDate
-                    date={new Date(data.time)}
-                  />
-                )}
+                {isEncodeDate && <ChatDate date={new Date(data.timestamp)} />}
                 <ChatOtherMessage
-                  time={data.time}
+                  time={data.timestamp}
                   message={data.message}
-                  name={data.nickName}
-                  userName={data.userName}
+                  name={data.userName}
                   nickName={data.nickName}
                   isPrimary={false}
                 />
@@ -140,25 +121,27 @@ function ChatTalkMain({ state }: { state: AppStateType }) {
             );
           }
         } else {
-          return <ChatDate date={new Date(data.time)} />;
+          return <ChatDate date={new Date(data.timestamp)} />;
         }
       })}
     </>
   );
 }
+
 function ChatTalk({ state }: { state: AppStateType }) {
   if (state.isChoiceUser.value === true) {
     return (
-      <ul class="c-talk-chat-list">
+      <ul className="c-talk-chat-list">
         <ChatTalkMain state={state} />
       </ul>
     );
   } else {
     return (
-      <div class="flex w-full h-full">
-        <p class="m-auto">友達を選択してください</p>
+      <div className="flex w-full h-full">
+        <p className="m-auto">友達を選択してください</p>
       </div>
     );
   }
 }
+
 export default ChatTalk;
diff --git a/routes/api/v2/client/friends/list.ts b/routes/api/v2/client/friends/list.ts
index 7afc8342..cd8bb2f0 100644
--- a/routes/api/v2/client/friends/list.ts
+++ b/routes/api/v2/client/friends/list.ts
@@ -12,7 +12,7 @@ const env = await load();
 export const handler = {
   async GET(req: any, ctx: any) {
     if (!ctx.state.data.loggedIn) {
-      return ctx.json({ status: false, message: "You are not logged in" });
+      return new Response(JSON.stringify({ status: false, message: "Not Logged In" }));
     }
     const userid = ctx.state.data.userid;
     const roomsData = await rooms.find({ "users.userid": userid });
diff --git a/routes/api/v2/client/friends/request/list.ts b/routes/api/v2/client/friends/request/list.ts
index d1379c2c..6280641b 100644
--- a/routes/api/v2/client/friends/request/list.ts
+++ b/routes/api/v2/client/friends/request/list.ts
@@ -2,7 +2,7 @@ import requestAddFriend from "../../../../../../models/reqestAddFriend.ts";
 export const handler = {
   async GET(req: Request, ctx: any) {
     if (!ctx.state.data.loggedIn) {
-      return ctx.json({ status: false, message: "You are not logged in" });
+      return new Response(JSON.stringify({ status: false, message: "Not Logged In" }));
     }
     const sessionid = ctx.state.data.sessionid;
     const userid = ctx.state.data.userid;
diff --git a/routes/api/v2/client/settings/privacy.ts b/routes/api/v2/client/settings/privacy.ts
index be7d651a..63dd837c 100644
--- a/routes/api/v2/client/settings/privacy.ts
+++ b/routes/api/v2/client/settings/privacy.ts
@@ -7,13 +7,19 @@ import userConfig from "../../../../../models/userConfig.ts";
 export const handler = {
   async POST(req: Request, ctx: any) {
     if (!ctx.state.data.loggedIn) {
-      return ctx.json({ status: false, message: "You are not logged in" });
+      return new Response(JSON.stringify({ status: false, message: "Not Logged In" }), {
+        headers: { "Content-Type": "application/json" },
+        status: 400,
+      });
     }
     let body;
     try {
       body = await req.json();
     } catch (e) {
-      return ctx.json({ status: false, message: "Invalid JSON" });
+      return new Response(JSON.stringify({ status: false, message: "Invalid Body" }), {
+        headers: { "Content-Type": "application/json" },
+        status: 400,
+      });
     }
     const userid = ctx.state.data.userid;
     const setting = body.setting;
diff --git a/routes/api/v2/client/talks/friend/data.ts b/routes/api/v2/client/talks/friend/data.ts
index 997a8c85..31457ede 100644
--- a/routes/api/v2/client/talks/friend/data.ts
+++ b/routes/api/v2/client/talks/friend/data.ts
@@ -108,7 +108,7 @@ export const handler = {
         if (message.messageType === "text") {
           return {
             messageid: message.messageid,
-            userName: CacheUser.userName,
+            userName: CacheUser.userName + "@" + takos.splitUserName(message.userid).domain,
             nickName: CacheUser.nickName,
             message: message.message,
             timestamp: message.timestamp,
@@ -142,7 +142,7 @@ export const handler = {
       if (message.messageType === "text") {
         return {
           messageid: message.messageid,
-          userName: userInfo?.userName,
+          userName: userInfo?.userName + "@" + takos.splitUserName(message.userid).domain,
           nickName: userInfo?.nickName,
           message: message.message,
           timestamp: message.timestamp,
diff --git a/routes/api/v2/client/talks/friend/text.ts b/routes/api/v2/client/talks/friend/text.ts
index 39bf153c..e7c3ace6 100644
--- a/routes/api/v2/client/talks/friend/text.ts
+++ b/routes/api/v2/client/talks/friend/text.ts
@@ -17,7 +17,10 @@ export const handler = {
     try {
       body = await req.json();
     } catch (e) {
-      return ctx.json({ status: false, message: "Invalid JSON" });
+      return new Response(JSON.stringify({ status: false, message: "Invalid Body" }), {
+        headers: { "Content-Type": "application/json" },
+        status: 400,
+      });
     }
     const message = body.text;
     const sessionid = body.sessionid;
diff --git a/routes/api/v2/client/users/friendkey.ts b/routes/api/v2/client/users/friendkey.ts
index d95bbaf3..2e51f4f3 100644
--- a/routes/api/v2/client/users/friendkey.ts
+++ b/routes/api/v2/client/users/friendkey.ts
@@ -4,7 +4,10 @@ import { getCookies } from "$std/http/cookie.ts";
 export const handler = {
   async GET(req: Request, ctx: any) {
     if (!ctx.state.data.loggedIn) {
-      return ctx.json({ status: false, message: "You are not logged in" });
+      return new Response(JSON.stringify({ status: false, message: "Not Logged In" }), {
+        headers: { "Content-Type": "application/json" },
+        status: 400,
+      });
     }
     const userid = ctx.state.data.userid;
     const url = new URL(req.url);
diff --git a/routes/api/v2/client/users/icon.ts b/routes/api/v2/client/users/icon.ts
index 3dfe13bc..322f9076 100644
--- a/routes/api/v2/client/users/icon.ts
+++ b/routes/api/v2/client/users/icon.ts
@@ -5,7 +5,7 @@ import takos from "../../../../../util/takos.ts";
 export const handler = {
   async GET(req: Request, ctx: any) {
     if (!ctx.state.data.loggedIn) {
-      return ctx.json({ status: false, message: "You are not logged in" });
+      return new Response("Not Logged In", { status: 401 });
     }
     const userid = ctx.state.data.userid;
     try {
diff --git a/routes/api/v2/client/users/settings.ts b/routes/api/v2/client/users/settings.ts
index 6df69df1..d52df396 100644
--- a/routes/api/v2/client/users/settings.ts
+++ b/routes/api/v2/client/users/settings.ts
@@ -6,7 +6,10 @@ import userConfig from "../../../../../models/userConfig.ts";
 export const handler = {
   async GET(req: Request, ctx: any) {
     if (!ctx.state.data.loggedIn) {
-      return ctx.json({ status: false, message: "You are not logged in" });
+      return new Response(JSON.stringify({ status: false, message: "Not Logged In" }), {
+        headers: { "Content-Type": "application/json" },
+        status: 400,
+      });
     }
     const userid = ctx.state.data.userid;
     const config = await userConfig.findOne({ userid: userid });
diff --git a/routes/api/v2/server/information/users/changes.ts b/routes/api/v2/server/information/users/changes.ts
index 3f48d71a..cc580168 100644
--- a/routes/api/v2/server/information/users/changes.ts
+++ b/routes/api/v2/server/information/users/changes.ts
@@ -12,7 +12,10 @@ export const handler = {
     const publickey = await fetch(`https://${host}/api/v2/server/pubkey`).then((res) => res.json()).then((data) => data.publickey);
     const verify = await takos.verifySignature(publickey, body.signature, body.body);
     if (!verify) {
-      return ctx.json({ status: false });
+      return new Response(JSON.stringify({
+        status: false,
+        message: "Invalid Signature",
+      }));
     }
     const data = JSON.parse(body.body);
     // 配列の中身が何個あるかを取得
diff --git a/routes/api/v2/server/information/users/profile.ts b/routes/api/v2/server/information/users/profile.ts
index 72872e5a..f0160318 100644
--- a/routes/api/v2/server/information/users/profile.ts
+++ b/routes/api/v2/server/information/users/profile.ts
@@ -14,20 +14,32 @@ export const handler = {
     const publickey = await fetch(`https://${host}/api/v2/server/pubkey`).then((res) => res.json()).then((data) => data.publickey);
     const verify = await takos.verifySignature(publickey, body.signature, body.body);
     if (!verify) {
-      return ctx.json({ status: false });
+      return new Response(JSON.stringify({
+        status: false,
+        message: "Invalid Signature",
+      }));
     }
     const data = JSON.parse(body.body);
     const friend = await users.findOne({ uuid: data.friendid });
     if (friend === null) {
-      return ctx.json({ status: false });
+      return new Response(JSON.stringify({
+        status: false,
+        message: "Invalid Signature",
+      }));
     }
     const FriendFriendData = await friends.findOne({ user: data.friendid });
     if (FriendFriendData === null) {
-      return ctx.json({ status: false });
+      return new Response(JSON.stringify({
+        status: false,
+        message: "Invalid Signature",
+      }));
     }
     const isFriend = FriendFriendData.friends.find((friend: any) => friend.userid === data.userid);
     if (isFriend === undefined) {
-      return ctx.json({ status: false });
+      return new Response(JSON.stringify({
+        status: false,
+        message: "Invalid Signature",
+      }));
     }
     return new Response(JSON.stringify({
       status: true,
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..463cab2bdc0c408c7bb606b2a40f33dafcdcdb74
GIT binary patch
literal 4954
zcmeHLc~leE8V{mS5vXhHf;C13w<ME=Y$bvQFtG#>QxvG^WM&egBoi}%grEZYkWEmb
zPZW2h3gQY@DhSo0;)1wTMMaTf6{P|Ntxyr^O+du=dd@qZ^ZK8YGnu*H^83E;cfWg2
zZj$_cXFJ%9wj+^94id3v0C+wJH}4Z0@ICoXr5HTUnPdy}0kDCr)!_<NI7Ze-X)!Wp
zR4GU#<6X6XwL=-%{&m~%u~zORmZK!`hJ#?G!=|Z8rlCrLV>|M0{feLRR{ML%Z^;7e
zY^DU{1n-7-JDwx2w)K5Ex+bDFBGIQoT9b33BQwo?^{D+=i#)sd^W)LG5<7k?J5R5B
zL&^VDyQj|Eryy42Utc(DYS!UJw}XEW)vxl69#do0dAvR}U)r4L%$$p4q((W$Cv^<1
zT_WLlSC(9pKMK2hwQ~|@eGCyCOW$S}JR-kp%0?2&>R&36$X_B7k^Q?X0(ER%u|X&<
z^Kd%5Xx?{}5km$g^ZFm~jhs8AJm4&4!DMxO;8-78=PG9hNpi}b+F<SP$kB${x&wKu
z^T?m9jOBgFn^GiB>iWu#DtF^Gl@~{^D>lSl&4F${OYXN{F)G*SQ}H<P?5Sz}MtTfJ
zMy7Adb-A80%9wUIy1m`>`7c2=^>3V3%&9?R{U)X{?;lCzCMvnqZO>;cOZ@l5`1Y;F
z>pKSxb=NJ7{4<rf2FEGato2#4o##3Ivo9AkEe>SL>PFQa*}ddjI=V2Bhc649=6b8h
zB?g8LAIv`COAKE&eSF+R&+|FE*4j<?47(|2Y}nnoDIw-ei_3*c8F}{JX#-@tX6atn
z#{6C!QUD1bIS)WQ+EUapYpvrJ?hGnyY(}az+evSfwR4ts<T)&E%6MT488ptSv-;H8
zh>(o7*h^y<w@WhZFKl?tj-O>^bl-ztv|3&0(VSHsvUJ?OPd(NY1(#YmI>seYu*1<O
zi}w{2##}k}s>3Shxb7qeE^Gyz7pVdrwm|A5KyWn;MsYbtGpe<q^++T)ccT_YmSTFc
z98;<^LP~S-j})>B6;kHAN+GFMgoUZZCLK1<<SRo=OA$Uwai3x5W)uJbHKvEjMs>J`
z5Ez9N3$6gXo5ger*<zw!Dx@rs`jbVt4kNQ^Y#K!MGO8k(lo@tpHyx@F1bBM)K!A~u
z5~kN{1$4T>V4xXTG+d{oGx&Ty9b(d%Oe(OT5>XmGY@}+431*0H3{Q+ebSkZ0g=@%W
zOjwRb=!Fyt(39Whr`AfPz3>{MhXud~-3V*x3>rjNtLc3`2)$P%0O?8SZ#@VZSg7;>
zjKCvw2<8=uY4j8NLZC>mzcxY_ZYc*v=vX+W2Brjv%6Kp2Y>Cvr*TYPKQl-{fya3tn
zS?X1acVxYnn^|Kir*9&_y%+aA>$kOAjDeL@D)7XS2y=Q8Pa(w|Ux4C>3Kev}GGPVk
z%15a@CdQz$6)>O5W4kJ-Tn5ZVcnB9^FyTH>5)Gk;H3(*g0^l?iz=05$%SRLll@D_{
z0D_HCc^IEfWivT^1mVhgT(mEQpH2n35)SX1l^F^JP%M}OGf`KV3bC0GmCc2iRM?fx
zr$R7?!QgP&Y*)F$k`0Ooym6fx2Gglh!%B><)hI0rGvR`n{t_XDNrT=={KH|r0yuy*
zpwghYfq18qsnpm!J#6Na!DTX-Oo#(<AqLBp&3b1Pi0KH>i)K^?L}T$R8uP>mKskU~
z*xacAz#<3L2t+yz*5f)Ej)w~==A_7G&tA0@EGQJ#!=A7n1E3I-Er7TJ23N*p2wWlX
zJ`Lgvpg#6Es!~M#FKhGiA-i=?x>!Yk_)!*7_nMlAE$be255rZK#Y84smW2RDx=SG7
zNDQ^)39!0VNEob9VqpL1Y1p@N)!#IOT)~35Y>t8oK^z{H&F3(vFvdlwTsB{hLJUBy
zT>d^ffh+U|SclD20v-WZpg}EMktg>|)s*+`4Plsh9sp%jh)eB58HL_cEZw|gysg%a
z{$G5!Sq%DYF~F}|2DUD+6ViLP!XCcNo6bLY^~}RR7y&?k4Dvzzex&OoT_4222N{3t
zu8(wm5Cb1%{IR?KZ*<wcJ4|63@C(QQj!L5kHx+|pmW}+Y*`A~>^Jiztz6>B4s1*kh
zB$8v9`L-&@b5J0()k~yawohz_*fVWE6W0$Tk*uvHo-<{}yN&n!QhxRrS>Cd!E3tgQ
zmE?S-U#KD8u0wF9p!Rg}#X|@1Gluc9q?G6Y{}(v{xyoxbrrVq^zG+$ZWG_p#ck{#t
zpY~5zvsh8iep?xmNg&jJUSS#A%MFLbMc8qd^it<YCtF2lLUx;;dPFc+SK#Dw+q=4y
zv2YEoVOYOd)W(BpP2Oy^zJheY{_QBPX_V>peQA5>>6It4<CXV?66-6?YrZY6^yvBm
zk?tyyPOf^{*1EhUSDB#`Ro>ri${L)I)0%!M$YZSSh>c@fdCH9*(OUvFbC-`(=RUZX
zo!?QaGCGY^fIxAT6`TDoze>yAqUb2jembBd-ri*;|BvB8;=9~xmSl%pTZ!}2qC4BO
zOjX}k-HQ7Dr<a_A-|*|pN?G&WQm^7$$d22Iw1-(Vfftdz{zOI2uU%u;7T&12ap|&k
zrET5d8Rg1N4v^C3Y6Jf{=h>X1F~96CnD+GQpVb?Jx;A>;Ter2bEWN|m`k}wqa+mb&
zTN*P~HPfn&6;5_^Ne|uJ7@e*;#&%5I!AiK-b!oz7tRah)nJPNJ;;LJ~@^aU0%AnbG
zr=T&5EA3<X#K6egtwGn-S2}I#%chTOo+xBj8@8IpO+L7zZpE0v38lpJag*-1traB(
zrBt?5o`I_`oK)VbZ~gHB$Nm{9r0IOF!R6?TO#{xs^jRm=w>I;j3LCM4r1pIr_vRj_
zy%-(n^pGXVtY|%R3=f^RC46n@#KC)pziRyMXFp<})bFw~GsGzYeO%Er=x$m6v}+~w
zJDFXV8W<VMo2G>UPYS<oTc_T#F}W*Ln_N#X3*WhP`5`y=NhOho*6&%Bvbyt7M^<KM
z_|z`$rv0z0eiNNOTJfSwotNL3IwGOyqIz^)ZSMXZvy=YdDTjSg93Ffk!tLA-7xMDd
z$<}5lv0|r)P|SCJ+A?5A{A*c5<|^H-WsAlaJo4#xF^JdUJ8cPmfOq3-&7F1)B`>FD
gZ@E=(e~K^TGFN)lgh4aSf0mIXUcR1(W-VUz7s@$b-T(jq

literal 0
HcmV?d00001

diff --git a/util/takosClient.ts b/util/takosClient.ts
index 8702bc0b..9df1aac7 100644
--- a/util/takosClient.ts
+++ b/util/takosClient.ts
@@ -27,3 +27,10 @@ export function checkEmail(email: string) {
   const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
   return emailPattern.test(email);
 }
+export function splitUserName(userName: string) {
+  const split = userName.split("@");
+  return {
+    userName: split[0],
+    domain: split[1],
+  };
+}