Skip to content

Commit

Permalink
Refactor server domain variable names to use consistent casing
Browse files Browse the repository at this point in the history
  • Loading branch information
@tako0614
tako0614 committed Jun 17, 2024
1 parent 42f8365 commit 11a6e8e
Show file tree
Hide file tree
Showing 13 changed files with 214 additions and 121 deletions.
210 changes: 114 additions & 96 deletions islands/Chats/Chat.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,107 +245,125 @@ export default function Home(
roomName={roomName}
talkData={talkData}
/>
{isChoiceUser && (<>
<div class="p-talk-chat-send">
<form class="p-talk-chat-send__form">
<div class="p-talk-chat-send__msg">
<div
class="p-talk-chat-send__dummy"
aria-hidden="true"
>
</div>
<label>
<textarea
class="p-talk-chat-send__textarea"
placeholder="メッセージを入力"
value={Message}
onChange={(e) => {
if (e.target) {
setMessage(
(e.target as HTMLTextAreaElement)
.value,
)
}
}}
>
</textarea>
</label>
</div>
<div
class="p-talk-chat-send__file"
onClick={() => {
if (Message) {
if (Message.length > 100) {
alert(
"100文字以内で入力してください",
)
return
}
const data = {
type: "message",
message: Message,
roomid: roomid,
sessionid: sessionid,
messageType: "text",
}
ws?.send(JSON.stringify(data))
setMessage("")
// deno-lint-ignore no-explicit-any
setFriendList((prev: any) => {
// deno-lint-ignore prefer-const
let temp = prev
// deno-lint-ignore no-explicit-any
temp.map((data: any) => {
{isChoiceUser && (
<>
<div class="p-talk-chat-send">
<form class="p-talk-chat-send__form">
<div class="p-talk-chat-send__msg">
<div
class="p-talk-chat-send__dummy"
aria-hidden="true"
>
</div>
<label>
<textarea
class="p-talk-chat-send__textarea"
placeholder="メッセージを入力"
value={Message}
onChange={(e) => {
if (e.target) {
setMessage(
(e.target as HTMLTextAreaElement)
.value,
)
}
}}
>
</textarea>
</label>
</div>
<div
class="p-talk-chat-send__file"
onClick={() => {
if (Message) {
if (
data.roomid ==
roomid
Message.length > 100
) {
data.lastMessage =
Message
data.latestMessageTime =
new Date()
.toString()
data.isNewMessage =
false
alert(
"100文字以内で入力してください",
)
return
}
})
temp.sort(
(
a: {
latestMessageTime:
number
},
b: {
latestMessageTime:
number
const data = {
type: "message",
message: Message,
roomid: roomid,
sessionid:
sessionid,
messageType: "text",
}
ws?.send(
JSON.stringify(
data,
),
)
setMessage("")
// deno-lint-ignore no-explicit-any
setFriendList(
(prev: any) => {
// deno-lint-ignore prefer-const
let temp = prev
// deno-lint-ignore no-explicit-any
temp.map(
(
data:
any,
) => {
if (
data.roomid ==
roomid
) {
data.lastMessage =
Message
data.latestMessageTime =
new Date()
.toString()
data.isNewMessage =
false
}
},
)
temp.sort(
(
a: {
latestMessageTime:
number
},
b: {
latestMessageTime:
number
},
) => {
if (
a.latestMessageTime <
b.latestMessageTime
) {
return 1
}
if (
a.latestMessageTime >
b.latestMessageTime
) {
return -1
}
return 0
},
)
return temp
},
) => {
if (
a.latestMessageTime <
b.latestMessageTime
) {
return 1
}
if (
a.latestMessageTime >
b.latestMessageTime
) {
return -1
}
return 0
},
)
return temp
})
}
}}
>
<img src="/ei-send.svg" alt="file" />
)
}
}}
>
<img
src="/ei-send.svg"
alt="file"
/>
</div>
</form>
</div>
</form>
</div>

</>)}
</>
)}
</div>
</div>
</main>
Expand Down
6 changes: 4 additions & 2 deletions islands/Chats/ChatTalk.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,10 @@ function TalkArea(props: any) {
<div class="p-talk-chat-main" id="chat-area">
<ul class="p-talk-chat-main__ul">
{props.talkData.map((data: any) => {
const isEncodeDate = new Date(DateState).toLocaleDateString() !== new Date(data.time).toLocaleDateString();
DateState = data.time;
const isEncodeDate =
new Date(DateState).toLocaleDateString() !==
new Date(data.time).toLocaleDateString()
DateState = data.time
if (data.type == "message") {
if (data.sender == props.userName) {
if (SendPrimary) {
Expand Down
2 changes: 1 addition & 1 deletion routes/api/v1/chats/talkdata.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,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`,
Expand Down
15 changes: 9 additions & 6 deletions routes/api/v1/friends/request.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ 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`,
{
Expand Down Expand Up @@ -418,7 +421,7 @@ export const handler = {
},
)
}
if(friendInfo.uuid === userid){
if (friendInfo.uuid === userid) {
console.log("friendInfo.uuid === userid")
return new Response(
JSON.stringify({ status: "error" }),
Expand All @@ -429,13 +432,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" }),
Expand Down Expand Up @@ -511,7 +514,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" }),
Expand All @@ -521,7 +524,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" }),
Expand Down
Loading

0 comments on commit 11a6e8e

Please sign in to comment.