Skip to content

create-conversation-after-sending-message #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bucketttttt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

create-conversation-after-sending-message #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 53 additions & 29 deletions packages/web/src/components/Message/MessageBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { useEffect, useState } from "react";
import { Message, ListMessagesQuery, CreateMessageMutation, UpdateConversationMutation } from "API";
import { Message, ListMessagesQuery, CreateMessageMutation, UpdateConversationMutation, ListConversationsQuery, CreateConversationMutation } from "API";
import GraphQLAPI, { graphqlOperation } from "@aws-amplify/api-graphql";
import { GraphQLSubscription } from '@aws-amplify/api';
import { listMessages } from "graphql/amplify/queries";
import { createMessage, updateConversation } from "graphql/amplify/mutations";
import { listConversations, listMessages } from "graphql/amplify/queries";
import { createConversation, createMessage, updateConversation } from "graphql/amplify/mutations";
import { onCreateMessageByConversationId } from "graphql/amplify/subscriptions";

import { useAccount } from "wagmi";
Expand Down Expand Up @@ -45,43 +45,67 @@ const MessageBox = ({ conversationId, peerAddress, messages }: Props) => {
}, [conversationId, messages]);
useEffect(() => {
setStateMessages([...messages])
}, [conversationId])
}, [conversationId, messages])

const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setMessage(e.target.value);
};
const handleSend = async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
if (message.trim() === '') return;
try {
const { data } = (await GraphQLAPI.graphql({
query: createMessage,
variables: {
input: {
conversationId: conversationId,
body: message,
sender: address,
receiver: peerAddress,
},
},
})) as { data: CreateMessageMutation };
const { update } = (await GraphQLAPI.graphql({
query: updateConversation,
const { data: query } = await GraphQLAPI.graphql({
query: listConversations,
variables: {
filter: {
conversationId: { eq: conversationId }
}
}
}) as { data: ListConversationsQuery }
if (query.listConversations?.items.length === 0) {
const list = conversationId.split('-')
const opponentAddress = list.find((item: string) => item !== address)
const { data: mutation } = await GraphQLAPI.graphql({
query: createConversation,
variables: {
input: {
conversationId: conversationId,
lastMessage: message,
},
},
})) as { update: UpdateConversationMutation }
console.log(data)
} catch (e) {
console.log(e);
} finally {
setMessage("");
participants: [address, opponentAddress]
}
}
}) as { data: CreateConversationMutation }
if (mutation.createConversation?.conversationId) {
try {
const { data } = (await GraphQLAPI.graphql({
query: createMessage,
variables: {
input: {
conversationId: conversationId,
body: message,
sender: address,
receiver: peerAddress,
},
},
})) as { data: CreateMessageMutation };
const { update } = (await GraphQLAPI.graphql({
query: updateConversation,
variables: {
input: {
conversationId: conversationId,
lastMessage: message,
},
},
})) as { update: UpdateConversationMutation }
console.log(data)
} catch (e) {
console.log(e);
} finally {
setMessage("");
}
return false
};
}
return false
};
}

return (
<div className="h-full py-4 flex flex-col justify-end ">
<div className="h-[700px] flex flex-col overflow-y-auto gap-2 py-4">
Expand Down
23 changes: 6 additions & 17 deletions packages/web/src/components/Message/NewMessageModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,37 +48,26 @@ const NewMessageModal = (props: Props) => {
let opponentAddress = profile?.ownedBy
console.log(opponentAddress)
if (opponentAddress && address) {
let converstaionId = (BigInt(address) > BigInt(opponentAddress)) ? `${address}-${opponentAddress}` : `${opponentAddress}-${address}`
console.log(converstaionId)
let conversationId = (BigInt(address) > BigInt(opponentAddress)) ? `${address}-${opponentAddress}` : `${opponentAddress}-${address}`
console.log(conversationId)
try {
setLoading(true)
const { data: query } = await GraphQLAPI.graphql({
query: listConversations,
variables: {
filter: {
conversationId: { eq: converstaionId }
conversationId: { eq: conversationId }
}
}
}) as { data: ListConversationsQuery }
console.log(query.listConversations?.items.length)
if (query.listConversations?.items.length !== 0) {
closeModal()
router.push(`/messages/${converstaionId}`)
router.push(`/messages/${conversationId}`)
}
if (query.listConversations?.items.length === 0) {
const { data: mutation } = await GraphQLAPI.graphql({
query: createConversation,
variables: {
input: {
conversationId: converstaionId,
participants: [address, opponentAddress]
}
}
}) as { data: CreateConversationMutation }
if (mutation.createConversation?.conversationId) {
closeModal()
router.push(`/messages/${converstaionId}`)
}
closeModal()
router.push(`/messages/${conversationId}`)
}
} catch (e) {
toast.error("Something went wrong")
Expand Down