Refactor server domain variable names to use consistent casing

.env.example

@@ -1,13 +1,16 @@
+hostname=
+username=
+db=
+password=
 MONGO_URL=mongodb://localhost:27017/takos
-recaptcha_site_key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-rechapcha_seecret_key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+recaptcha_site_key=6LewIZspAAAAAEwZ8YaDMe8dxxs6F_N8KtSsukQY
+rechapcha_seecret_key=6LewIZspAAAAAGJE3RjUqM4dn8jgBCx_zdcXwkwx
 smtp_host=smtp.gmail.com
 smtp_port=587
-smtp_username=example@gmail.com
-smtp_password=xxxxxxxxxxxxxxx
-origin="http://example.com,https://takos.jp,http://localhost:8000"
-serverDomain=localhost:8000
-REDIS_URL=redis://localhost:6379
-PRIORITY_PROTOCOL=http
-REDIS_CH=takos
-MAX_MESSAGE_LENGTH=100
+smtp_username=
+smtp_password=
+origin="http://localhost:8000,https://takos.jp,"
+REACT_APP_RECAPTCHA_KEY=
+mailDomain=http://localhost:8000
+friendOrigin=http://localhost:8000?key=
+REDIS_URL=redis://localhost:6379

routes/_middleware.ts

@@ -4,14 +4,9 @@ import csrfToken from "../models/csrftoken.ts"
 import users from "../models/users.ts"
 import sessionID from "../models/sessionid.ts"
 import { load } from "$std/dotenv/mod.ts"
-const env = await load()
-
 export async function handler(req: Request, ctx: MiddlewareHandlerContext) {
     const cookies = getCookies(req.headers)
     const sessionid = cookies.sessionid
-    ctx.state.settings = {
-        maxMessageLength: env["MAX_MESSAGE_LENGTH"],
-    }
     if (sessionid === undefined) {
         ctx.state.data = { loggedIn: false }
         const resp = await ctx.next()

routes/api/v1/chats/friendList.ts

@@ -119,8 +119,7 @@ export const handler = {
                             roomID: room.uuid,
                             latestMessageTime: latestmessage?.timestamp,
                             roomIcon: `/api/v1/friends/${
-                                friendName?.userName + "@" +
-                                env["serverDomain"]
+                                friendName?.userName + "@" + env["serverDomain"]
                             }/icon`,
                             type: "localfriend",
                             userName: friendName?.userName + "@" +

routes/api/v1/chats/talkdata.ts

@@ -117,8 +117,7 @@ export const handler = {
                             (read) => read.userid === friendId[0],
                         ) !== -1
                         return {
-                            sender: sender.userName + "@" +
-                                env["serverDomain"],
+                            sender: sender.userName + "@" + env["serverDomain"],
                             senderNickName: sender.nickName,
                             message: message.message,
                             timestamp: message.timestamp,
@@ -204,7 +203,7 @@ export const handler = {
                     ).join("")
                     takostoken.create({
                         token: takosToken,
-                        origin: friendDomain,
+                        origin: friendDomain
                     })
                     const reuslt = await takosfetch(
                         `${friendDomain}/api/v1/server/talk/read`,

routes/api/v1/friends/request.ts

@@ -116,10 +116,7 @@ export const handler = {
                     randomarray,
                     (byte) => byte.toString(16).padStart(2, "0"),
                 ).join("")
-                takostoken.create({
-                    token: takosToken,
-                    origin: splitFriendName?.domain,
-                })
+                takostoken.create({ token: takosToken, origin: splitFriendName?.domain })
                 const requestResult = await takosfetch(
                     `${splitFriendName?.domain}/api/v1/server/friends/request`,
                     {
@@ -421,7 +418,7 @@ export const handler = {
                             },
                         )
                     }
-                    if (friendInfo.uuid === userid) {
+                    if(friendInfo.uuid === userid){
                         console.log("friendInfo.uuid === userid")
                         return new Response(
                             JSON.stringify({ status: "error" }),
@@ -432,13 +429,13 @@ export const handler = {
                         )
                     }
                     const myFriendInfo = await Friends.findOne({ user: userid })
-                    if (!myFriendInfo) {
+                    if(!myFriendInfo){
                         await Friends.create({ user: userid })
                     }
                     const isAlredyFriend = myFriendInfo?.friends.some((
                         friend: any,
                     ) => friend.userid === friendInfo.uuid)
-                    if (isAlredyFriend) {
+                    if(isAlredyFriend){
                         console.log("isAlredyFriend")
                         return new Response(
                             JSON.stringify({ status: "error" }),
@@ -514,7 +511,7 @@ export const handler = {
                     const frienduuidres = await takosfetch(
                         `${serverDomain}/api/v1/server/users/${friendName}/uuid`,
                     )
-                    if (!frienduuidres) {
+                    if(!frienduuidres){
                         console.log("frienduuidres is null")
                         return new Response(
                             JSON.stringify({ status: "error" }),
@@ -524,7 +521,7 @@ export const handler = {
                             },
                         )
                     }
-                    if (frienduuidres.status !== 200) {
+                    if(frienduuidres.status !== 200){
                         console.log("frienduuidres is not 200")
                         return new Response(
                             JSON.stringify({ status: "error" }),

routes/api/v1/main.ts

@@ -16,7 +16,7 @@ import { takosfetch } from "../../../util/takosfetch.ts"
 subClient.on("error", (err: any) => console.error("Sub Client Error", err))
 
 await subClient.connect()
-const MESSAGE_MIMIT = Number(env["MESSAGE_MIMIT"])
+
 async function subscribeMessage(channel: string | string[]) {
     await subClient.subscribe(channel, async (message) => {
         const data = JSON.parse(message)
@@ -59,7 +59,7 @@ export const handler = {
             socket.onmessage = async function (event) {
                 const data = JSON.parse(event.data)
                 const { type } = data
-                if (!type) return
+                if(!type) return
                 switch (type) {
                     case "joinRoom":
                         joinRoom(data.sessionid, data.roomid, socket)
@@ -195,15 +195,6 @@ async function sendMessage(
     ws: WebSocket,
     MessageType: string,
 ) {
-    if(message.length > MESSAGE_MIMIT){
-        ws.send(
-            JSON.stringify({
-                status: false,
-                explain: "Message is too long",
-            }),
-        )
-        return
-    }
     const session = sessions.get(sessionid)
     if (!session) {
         ws.send(
@@ -224,15 +215,6 @@ async function sendMessage(
         return
     }
     if (session.roomType === "friend") {
-        if(message.length > MESSAGE_MIMIT){
-            ws.send(
-                JSON.stringify({
-                    status: false,
-                    explain: "Message is too long",
-                }),
-            )
-            return
-        }
         const result = await messages.create({
             userid: session.uuid,
             roomid: roomID,

routes/api/v1/server/friends/[ID]/icon.ts

@@ -15,22 +15,20 @@ export const handler = {
                 status: 400,
             })
         }
-        const userserverDomain = splitUserName(reqUser).domain
+        const userServerDomain = splitUserName(reqUser).domain
         const userName = splitUserName(reqUser).userName
-        if (!userserverDomain || !userName) {
+        if (!userServerDomain || !userName) {
             return new Response(JSON.stringify({ "status": false }), {
                 status: 400,
             })
         }
-        if (userserverDomain == env["serverDomain"]) {
+        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["serverDomain"]
-            }`,
+            `${userServerDomain}/api/v1/server/token?token=${token}&origin=${env["serverDomain"]}`,
         )
         //userが存在するか確認
         const user = await users.findOne({
@@ -42,7 +40,7 @@ export const handler = {
             })
         }
         const serverInfo = await remoteservers.findOne({
-            serverDomain: userserverDomain,
+            serverDomain: userServerDomain,
             friends: { $elemMatch: { userid: reqUser } },
         })
         if (!serverInfo) {

routes/api/v1/server/friends/[ID]/profile.ts

@@ -40,9 +40,7 @@ export const handler = {
                     })
                 }
                 const isTrueToken = await takosfetch(
-                    `${serverDomain}/api/v1/server/token?token=${token}&origin=${
-                        env["serverDomain"]
-                    }`,
+                    `${serverDomain}/api/v1/server/token?token=${token}&origin=${env["serverDomain"]}`,
                 )
                 if (!isTrueToken) {
                     return new Response(JSON.stringify({ "status": false }), {

routes/api/v1/server/friends/request.ts

@@ -47,8 +47,7 @@ export const handler = {
                 })
             }
             const isTrueToken = await takosfetch(
-                `${userDomain}/api/v1/server/token?token=` + token +
-                    "&origin=" + env["serverDomain"],
+                `${userDomain}/api/v1/server/token?token=` + token + "&origin=" + env["serverDomain"],
             )
             if (!isTrueToken) {
                 console.log("isTrueToken")
@@ -234,8 +233,7 @@ export const handler = {
             console.log(userDomain, env["serverDomain"], friendDomain)
             console.log("3")
             const isTrueToken = await takosfetch(
-                `${userDomain}/api/v1/server/token?token=` + token +
-                    "&origin=" + env["serverDomain"],
+                `${userDomain}/api/v1/server/token?token=` + token + "&origin=" + env["serverDomain"],
             )
             if (!isTrueToken) {
                 return new Response(JSON.stringify({ status: false }), {

routes/api/v1/server/talk/read.ts

@@ -32,8 +32,7 @@ export const handler = {
             })
         }
         const isTrueToken = await takosfetch(
-            `${domain}/api/v1/server/token?token=` + token + "&origin=" +
-                env["serverDomain"],
+            `${domain}/api/v1/server/token?token=` + token + "&origin=" + env["serverDomain"],
         )
         if (isTrueToken === null || isTrueToken === undefined) {
             return new Response(JSON.stringify({ status: false }), {

routes/api/v1/server/talk/send.ts

@@ -5,7 +5,6 @@ import { takosfetch } from "../../../../../util/takosfetch.ts"
 import { load } from "$std/dotenv/mod.ts"
 const env = await load()
 const redisch = env["REDIS_CH"]
-const MESSAGE_MIMIT = Number(env["MESSAGE_MIMIT"])
 export const handler = {
     async POST(req: Request, ctx: any) {
         const data = await req.json()
@@ -27,8 +26,7 @@ export const handler = {
         }
         const { domain, userName } = splitUserName(sender)
         const isTrueToken = await takosfetch(
-            `${domain}/api/v1/server/token?token=` + token + "&origin=" +
-                env["serverDomain"],
+            `${domain}/api/v1/server/token?token=` + token + "&origin=" + env["serverDomain"],
         )
         if (isTrueToken === null || isTrueToken === undefined) {
             return new Response(JSON.stringify({ status: false }), {
@@ -64,11 +62,6 @@ export const handler = {
                 status: 400,
             })
         }
-        if(message.length > MESSAGE_MIMIT){
-            return new Response(JSON.stringify({ status: false }), {
-                status: 400,
-            })
-        }
         const result = await messages.create({
             userid: uuid,
             roomid,

routes/api/v1/server/token.ts

@@ -9,7 +9,7 @@ export const handler = {
                 status: 400,
             })
         }
-        const tokenInfo = await takostoken.findOne({ token, origin })
+        const tokenInfo = await takostoken.findOne({ token, origin})
         if (tokenInfo === null || tokenInfo === undefined) {
             return new Response(JSON.stringify({ "status": false }), {
                 status: 400,

routes/api/v1/setting/index.ts

@@ -78,7 +78,7 @@ export const handler = {
           })
         }
         await Deno.writeFile(`./files/userIcons/${userid}.webp`, result)
-
+        
             }
 
             return new Response(JSON.stringify({ status: true }), {

static/style.css

@@ -594,7 +594,6 @@ html, body {
     font-size: 15px;
     line-height: 20px;
     width: fit-content;
-
 }
 
 .c-talk-chat-msg p {