diff --git a/islands/Chats/Chat.tsx b/islands/Chats/Chat.tsx index 6be54ebc..dd66d1a3 100644 --- a/islands/Chats/Chat.tsx +++ b/islands/Chats/Chat.tsx @@ -275,7 +275,8 @@ export default function Home( class="p-talk-chat-send__file" onClick={() => { if (Message) { - if (Message.length > 100) { + if (messages.length > 100) { + return } const data = { diff --git a/routes/addFriend/[roomid].tsx b/routes/addFriend/[roomid].tsx index 7ffce36f..78bef570 100644 --- a/routes/addFriend/[roomid].tsx +++ b/routes/addFriend/[roomid].tsx @@ -102,7 +102,7 @@ export default function Home({ data }: { data: any }) { roomid={data.roomid} settings={settings} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > diff --git a/routes/addFriend/index.tsx b/routes/addFriend/index.tsx index 108f31ac..aaef6e3f 100644 --- a/routes/addFriend/index.tsx +++ b/routes/addFriend/index.tsx @@ -85,7 +85,7 @@ export default function Home({ data }: { data: any }) { page={2} isAddFriendForm={false} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > diff --git a/routes/api/v1/chats/friendList.ts b/routes/api/v1/chats/friendList.ts index ef1e18c7..026b425d 100644 --- a/routes/api/v1/chats/friendList.ts +++ b/routes/api/v1/chats/friendList.ts @@ -120,11 +120,11 @@ export const handler = { latestMessageTime: latestmessage?.timestamp, roomIcon: `/api/v1/friends/${ friendName?.userName + "@" + - env["SERVER_DOMAIN"] + env["serverDomain"] }/icon`, type: "localfriend", userName: friendName?.userName + "@" + - env["SERVER_DOMAIN"], + env["serverDomain"], isNewMessage: isNewMessage === undefined, } return friendResult @@ -157,11 +157,9 @@ export const handler = { `${OtherServerUserDomain}/api/v1/server/friends/${ OtherServerUser[0].userid }/profile?token=${takosToken}&serverDomain=${ - env["SERVER_DOMAIN"] - }&type=id&reqUser=${ctx.state.data.userid}`, + env["serverDomain"] + }&type=id&requser&reqUser=${ctx.state.data.userid}`, ) - console.log(OtherServerUserInfo.url) - console.log("") if (!OtherServerUserInfo) { const remoteErrorResult = { roomName: "remote server error", diff --git a/routes/api/v1/chats/talkdata.ts b/routes/api/v1/chats/talkdata.ts index 1acb8ffc..70cfaab5 100644 --- a/routes/api/v1/chats/talkdata.ts +++ b/routes/api/v1/chats/talkdata.ts @@ -118,7 +118,7 @@ export const handler = { ) !== -1 return { sender: sender.userName + "@" + - env["SERVER_DOMAIN"], + env["serverDomain"], senderNickName: sender.nickName, message: message.message, timestamp: message.timestamp, @@ -265,7 +265,7 @@ export const handler = { `${OtherServerUserDomain}/api/v1/server/friends/${ friendId[0] }/profile?token=${takosToken}&serverDomain=${ - env["SERVER_DOMAIN"] + env["serverDomain"] }&type=id&reqUser=${ctx.state.data.userid}`, ) if (!OtherServerUserInfo) { @@ -310,7 +310,7 @@ export const handler = { if (message.userid === ctx.state.data.userid) { sender = { userName: userName.userName + "@" + - env["SERVER_DOMAIN"], + env["serverDomain"], nickName: userName.nickName, } } else { diff --git a/routes/api/v1/friends/[ID]/icon.ts b/routes/api/v1/friends/[ID]/icon.ts index 8d96be45..55fdfe5a 100644 --- a/routes/api/v1/friends/[ID]/icon.ts +++ b/routes/api/v1/friends/[ID]/icon.ts @@ -151,7 +151,7 @@ export const handler = { }) } - if (friendDomain === env["SERVER_DOMAIN"]) { + if (friendDomain === env["serverDomain"]) { const friend: Friend | null = await friends.findOne({ user: ctx.state.data.userid, }) diff --git a/routes/api/v1/friends/reqLists.ts b/routes/api/v1/friends/reqLists.ts index 5b214121..0307abac 100644 --- a/routes/api/v1/friends/reqLists.ts +++ b/routes/api/v1/friends/reqLists.ts @@ -41,7 +41,7 @@ export const handler = { } return { userName: userInfo.userName + "@" + - env["SERVER_DOMAIN"], + env["serverDomain"], icon: `/api/v1/friends/${userInfo.userName}/icon?isRequestList=true`, timestamp: obj.timestamp, diff --git a/routes/api/v1/friends/request.ts b/routes/api/v1/friends/request.ts index 3e439f45..1a3ba5ce 100644 --- a/routes/api/v1/friends/request.ts +++ b/routes/api/v1/friends/request.ts @@ -86,7 +86,7 @@ export const handler = { const splitFriendName = splitUserName(friendName) if ( !splitFriendName || - splitFriendName.domain !== env["SERVER_DOMAIN"] + splitFriendName.domain !== env["serverDomain"] ) { const ApplientedUserInfo = await requestAddFriend.findOne({ userID: ctx.state.data.userid, @@ -129,7 +129,7 @@ export const handler = { }, body: JSON.stringify({ requesterUserName: ctx.state.data.userName + "@" + - env["SERVER_DOMAIN"], + env["serverDomain"], requesterUserUUID: ctx.state.data.userid, requirement: "acceptReqFriend", recipientUserName: friendName, @@ -171,9 +171,9 @@ export const handler = { { username: ctx.state.data.userName, userid: userid, - host: env["SERVER_DOMAIN"], + host: env["serverDomain"], type: "local", - domain: env["SERVER_DOMAIN"], + domain: env["serverDomain"], }, { username: splitFriendName?.name, @@ -287,7 +287,7 @@ export const handler = { userid: userid, host: "local", type: "local", - domain: env["SERVER_DOMAIN"], + domain: env["serverDomain"], }, { username: friendInfo.userName, @@ -353,7 +353,7 @@ export const handler = { Applicant: [{ userID: userid, userName: ApplcienterInfo.userName, - host: env["SERVER_DOMAIN"], + host: env["serverDomain"], type: "local", }], }) @@ -363,7 +363,7 @@ export const handler = { AppliedUser: [{ userID: addFriendUserInfo.uuid, userName: addFriendUserInfo.userName, - host: env["SERVER_DOMAIN"], + host: env["serverDomain"], type: "local", }], }) @@ -408,7 +408,7 @@ export const handler = { }) } try { - if (friendDomain == env["SERVER_DOMAIN"]) { + if (friendDomain == env["serverDomain"]) { const friendInfo = await users.findOne({ userName: splitUserName(friendName)?.name, }) @@ -582,7 +582,7 @@ export const handler = { body: JSON.stringify({ requesterUserName: ctx.state.data.userName + "@" + - env["SERVER_DOMAIN"], + env["serverDomain"], requesterUserUUID: ctx.state.data.userid, requirement: "reqFriend", recipientUserName: friendName, diff --git a/routes/api/v1/logins/register.js b/routes/api/v1/logins/register.js index ff29cb7c..8dd1245c 100644 --- a/routes/api/v1/logins/register.js +++ b/routes/api/v1/logins/register.js @@ -220,7 +220,7 @@ export const handler = { (byte) => byte.toString(16).padStart(2, "0"), ).join("") //ユーザーを登録 - const uuid = crypto.randomUUID() + "@" + env["SERVER_DOMAIN"] + const uuid = crypto.randomUUID() + "@" + env["serverDomain"] const result = await users.create({ uuid: uuid, userName, diff --git a/routes/api/v1/main.ts b/routes/api/v1/main.ts index 8cb38a7d..9c83795c 100644 --- a/routes/api/v1/main.ts +++ b/routes/api/v1/main.ts @@ -393,7 +393,7 @@ async function sendConecctingUserMessage( sessions.forEach(async (session, key) => { if (session.talkingRoom === roomid) { isFindUser = true - if (splitUserName(sender).domain !== env["SERVER_DOMAIN"]) { + if (splitUserName(sender).domain !== env["serverDomain"]) { const takosTokenArray = new Uint8Array(16) const randomarray = crypto.getRandomValues(takosTokenArray) const takosToken = Array.from( @@ -404,7 +404,7 @@ async function sendConecctingUserMessage( `${ splitUserName(sender).domain }/api/v1/server/friends/${sender}/profile?token=${takosToken}&serverDomain=${ - env["SERVER_DOMAIN"] + env["serverDomain"] }&type=id&reqUser=${session.uuid}`, ) if (!remoteFriendInfo) { @@ -473,7 +473,7 @@ async function sendConecctingUserMessage( JSON.stringify({ type: "message", message: message, - sender: userInfo?.userName + "@" + env["SERVER_DOMAIN"] || + sender: userInfo?.userName + "@" + env["serverDomain"] || "unknown", senderNickName: userInfo?.nickName || "unknown", time: time, @@ -562,7 +562,7 @@ async function readMessage(messageids: [string], sender: string) { }), ) //送信元サーバーにreadしたことを送信 - if (splitUserName(sender).domain !== env["SERVER_DOMAIN"]) { + if (splitUserName(sender).domain !== env["serverDomain"]) { const takosTokenArray = new Uint8Array(16) const randomarray = crypto.getRandomValues(takosTokenArray) const takosToken = Array.from( diff --git a/routes/api/v1/server/friends/[ID]/icon.ts b/routes/api/v1/server/friends/[ID]/icon.ts index f1270dbe..9f577545 100644 --- a/routes/api/v1/server/friends/[ID]/icon.ts +++ b/routes/api/v1/server/friends/[ID]/icon.ts @@ -22,14 +22,14 @@ export const handler = { status: 400, }) } - if (userserverDomain == env["SERVER_DOMAIN"]) { + if (userserverDomain == env["serverDomain"]) { return new Response(JSON.stringify({ "status": false }), { status: 400, }) } const isTrueToken = await takosfetch( `${userserverDomain}/api/v1/server/token?token=${token}&origin=${ - env["SERVER_DOMAIN"] + env["serverDomain"] }`, ) //userが存在するか確認 diff --git a/routes/api/v1/server/friends/[ID]/profile.ts b/routes/api/v1/server/friends/[ID]/profile.ts index 7bb67641..d11c188f 100644 --- a/routes/api/v1/server/friends/[ID]/profile.ts +++ b/routes/api/v1/server/friends/[ID]/profile.ts @@ -18,7 +18,6 @@ export const handler = { serverDomain === null || serverDomain === undefined ) { - console.log("ID: ", ID) return new Response(JSON.stringify({ "status": false }), { status: 400, }) @@ -30,7 +29,7 @@ export const handler = { status: 400, }) } - if (serverDomain == env["SERVER_DOMAIN"]) { + if (serverDomain == env["serverDomain"]) { return new Response(JSON.stringify({ "status": false }), { status: 400, }) @@ -42,7 +41,7 @@ export const handler = { } const isTrueToken = await takosfetch( `${serverDomain}/api/v1/server/token?token=${token}&origin=${ - env["SERVER_DOMAIN"] + env["serverDomain"] }`, ) if (!isTrueToken) { @@ -83,7 +82,7 @@ export const handler = { } const result = { userName: friendUserInfo.userName + "@" + - env["SERVER_DOMAIN"], + env["serverDomain"], nickName: friendUserInfo.nickName, } return new Response( @@ -98,7 +97,7 @@ export const handler = { }) } const result = { - userName: userInfo.userName + "@" + env["SERVER_DOMAIN"], + userName: userInfo.userName + "@" + env["serverDomain"], nickName: userInfo.nickName, } return new Response( diff --git a/routes/api/v1/server/friends/request.ts b/routes/api/v1/server/friends/request.ts index 4813df5f..920026c7 100644 --- a/routes/api/v1/server/friends/request.ts +++ b/routes/api/v1/server/friends/request.ts @@ -39,7 +39,7 @@ export const handler = { const friendDomain = splitUserName(recipientUserName).domain const userDomain = splitUserName(requesterUserName).domain if ( - userDomain == env["SERVER_DOMAIN"] || friendDomain == userDomain + userDomain == env["serverDomain"] || friendDomain == userDomain ) { console.log("userDomain" + userDomain) return new Response(JSON.stringify({ status: false }), { @@ -48,7 +48,7 @@ export const handler = { } const isTrueToken = await takosfetch( `${userDomain}/api/v1/server/token?token=` + token + - "&origin=" + env["SERVER_DOMAIN"], + "&origin=" + env["serverDomain"], ) if (!isTrueToken) { console.log("isTrueToken") @@ -220,22 +220,22 @@ export const handler = { const friendDomain = splitUserName(recipientUserName).domain const userDomain = splitUserName(requesterUserUUID).domain if ( - userDomain == env["SERVER_DOMAIN"] || friendDomain == userDomain + userDomain == env["serverDomain"] || friendDomain == userDomain ) { console.log( "reci" + recipientUserName, "uuid" + requesterUserUUID, ) - console.log(userDomain, env["SERVER_DOMAIN"], friendDomain) + console.log(userDomain, env["serverDomain"], friendDomain) return new Response(JSON.stringify({ status: false }), { status: 400, }) } - console.log(userDomain, env["SERVER_DOMAIN"], friendDomain) + console.log(userDomain, env["serverDomain"], friendDomain) console.log("3") const isTrueToken = await takosfetch( `${userDomain}/api/v1/server/token?token=` + token + - "&origin=" + env["SERVER_DOMAIN"], + "&origin=" + env["serverDomain"], ) if (!isTrueToken) { return new Response(JSON.stringify({ status: false }), { diff --git a/routes/api/v1/server/talk/read.ts b/routes/api/v1/server/talk/read.ts index ff387d5e..64f328ed 100644 --- a/routes/api/v1/server/talk/read.ts +++ b/routes/api/v1/server/talk/read.ts @@ -26,14 +26,14 @@ export const handler = { }) } const { domain, userName } = splitUserName(reader) - if (domain == env["SERVER_DOMAIN"]) { + if (domain == env["serverDomain"]) { return new Response(JSON.stringify({ status: false }), { status: 400, }) } const isTrueToken = await takosfetch( `${domain}/api/v1/server/token?token=` + token + "&origin=" + - env["SERVER_DOMAIN"], + env["serverDomain"], ) if (isTrueToken === null || isTrueToken === undefined) { return new Response(JSON.stringify({ status: false }), { diff --git a/routes/api/v1/server/talk/send.ts b/routes/api/v1/server/talk/send.ts index 68557a2d..391fb120 100644 --- a/routes/api/v1/server/talk/send.ts +++ b/routes/api/v1/server/talk/send.ts @@ -28,7 +28,7 @@ export const handler = { const { domain, userName } = splitUserName(sender) const isTrueToken = await takosfetch( `${domain}/api/v1/server/token?token=` + token + "&origin=" + - env["SERVER_DOMAIN"], + env["serverDomain"], ) if (isTrueToken === null || isTrueToken === undefined) { return new Response(JSON.stringify({ status: false }), { diff --git a/routes/api/v1/server/users/[ID]/name.ts b/routes/api/v1/server/users/[ID]/name.ts index e2d492f8..681e6283 100644 --- a/routes/api/v1/server/users/[ID]/name.ts +++ b/routes/api/v1/server/users/[ID]/name.ts @@ -14,7 +14,7 @@ export const handler = { return new Response( JSON.stringify({ "status": true, - "userName": user.userName + "@" + env["SERVER_DOMAIN"], + "userName": user.userName + "@" + env["serverDomain"], }), { status: 200, diff --git a/routes/api/v1/server/users/[ID]/uuid.ts b/routes/api/v1/server/users/[ID]/uuid.ts index c53a424c..0320cd11 100644 --- a/routes/api/v1/server/users/[ID]/uuid.ts +++ b/routes/api/v1/server/users/[ID]/uuid.ts @@ -10,7 +10,7 @@ export const handler = { status: 400, }) } - if (splitUserName(ID).domain !== env["SERVER_DOMAIN"]) { + if (splitUserName(ID).domain !== env["serverDomain"]) { return new Response(JSON.stringify({ "status": false }), { status: 400, }) diff --git a/routes/home/[roomid].tsx b/routes/home/[roomid].tsx index 77e87c22..4cc30ae4 100644 --- a/routes/home/[roomid].tsx +++ b/routes/home/[roomid].tsx @@ -102,7 +102,7 @@ export default function Home({ data }: { data: any }) { roomid={data.roomid} settings={settings} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > diff --git a/routes/home/index.tsx b/routes/home/index.tsx index 5c11b185..de9ccc4d 100644 --- a/routes/home/index.tsx +++ b/routes/home/index.tsx @@ -85,7 +85,7 @@ export default function Home({ data }: { data: any }) { page={0} isAddFriendForm={false} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > diff --git a/routes/index.tsx b/routes/index.tsx index c74064c8..cdd2c10b 100644 --- a/routes/index.tsx +++ b/routes/index.tsx @@ -88,7 +88,7 @@ export default function Home({ data }: { data: any }) { isAddFriendForm={true} AddFriendKey={data.key} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > ) @@ -98,7 +98,7 @@ export default function Home({ data }: { data: any }) { isAddFriendForm={false} index={true} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > )} diff --git a/routes/setting/[roomid].tsx b/routes/setting/[roomid].tsx index 722d7fac..d03fd32d 100644 --- a/routes/setting/[roomid].tsx +++ b/routes/setting/[roomid].tsx @@ -102,7 +102,7 @@ export default function Home({ data }: { data: any }) { roomid={data.roomid} settings={settings} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > diff --git a/routes/setting/index.tsx b/routes/setting/index.tsx index d5f0d182..7df14e7c 100644 --- a/routes/setting/index.tsx +++ b/routes/setting/index.tsx @@ -84,7 +84,7 @@ export default function Home({ data }: { data: any }) { page={3} isAddFriendForm={false} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > diff --git a/routes/talk/[roomid].tsx b/routes/talk/[roomid].tsx index 8604d1c2..47ce6465 100644 --- a/routes/talk/[roomid].tsx +++ b/routes/talk/[roomid].tsx @@ -102,7 +102,7 @@ export default function Home({ data }: { data: any }) { roomid={data.roomid} settings={settings} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} > diff --git a/routes/talk/index.tsx b/routes/talk/index.tsx index 8604d1c2..47ce6465 100644 --- a/routes/talk/index.tsx +++ b/routes/talk/index.tsx @@ -102,7 +102,7 @@ export default function Home({ data }: { data: any }) { roomid={data.roomid} settings={settings} userNickName={data.nickName} - userName={data.userName + "@" + env["SERVER_DOMAIN"]} + userName={data.userName + "@" + env["serverDomain"]} >