discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

inbox fixes

Browse Source
This commit is contained in:
tonyrewin 2022-10-04 02:25:11 +03:00
parent 5af72afe40
commit 5c056525ed
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
resolvers/inbox.py
View File

@ -74,13 +74,22 @@ async def add_user_to_chat(user_slug, chat_id, chat=None):
await redis.execute("SET", f"chats/{chat_id}", json.dumps(chat)) await redis.execute("SET", f"chats/{chat_id}", json.dumps(chat))
@mutation.query("inviteChat")
async def invite_to_chat(_, info, invited, chat_id):
user = info.context["request"].user
chat = await redis.execute("GET", f"chats/{chat_id}")
if user.slug in chat['users']:
add_user_to_chat(invited, chat_id, chat)
@mutation.field("createChat") @mutation.field("createChat")
@login_required @login_required
async def create_chat(_, info, description): async def create_chat(_, info, description, title=""):
user = info.context["request"].user user = info.context["request"].user
chat_id = uuid.uuid4() chat_id = uuid.uuid4()
chat = { chat = {
"title": title,
"description": description, "description": description,
"createdAt": str(datetime.now), "createdAt": str(datetime.now),
"createdBy": user.slug, "createdBy": user.slug,
@ -110,7 +119,7 @@ async def load_messages(chatId, size, page):
return messages return messages
@query.field("userChats") @query.field("myChats")
@login_required @login_required
async def user_chats(_, info): async def user_chats(_, info):
user = info.context["request"].user user = info.context["request"].user
@ -120,25 +129,23 @@ async def user_chats(_, info):
chats = list() chats = list()
else: else:
chats = list(json.loads(chats)) chats = list(json.loads(chats))
for c in chats:
return {"chats": chats} c['messages'] = await load_messages(c['id'], 50, 1)
return chats
@query.field("enterChat") @query.field("enterChat")
@login_required @login_required
async def enter_chat(_, info, chatId, size): async def enter_chat(_, info, chatId):
user = info.context["request"].user user = info.context["request"].user
chat = await redis.execute("GET", f"chats/{chatId}") chat = await redis.execute("GET", f"chats/{chatId}")
if not chat: if not chat:
return {"error": "chat not exist"} return {"error": "chat not exist"}
chat = json.loads(chat) chat = json.loads(chat)
messages = await load_messages(chatId, size, 1)
await add_user_to_chat(user.slug, chatId, chat) await add_user_to_chat(user.slug, chatId, chat)
chat['messages'] = await load_messages(chatId, 50, 1)
return {"chat": chat, "messages": messages} return chat
@mutation.field("createMessage") @mutation.field("createMessage")
@ -181,7 +188,7 @@ async def create_message(_, info, chatId, body, replyTo=None):
return {"message": new_message} return {"message": new_message}
@query.field("getMessages") @query.field("loadChat")
@login_required @login_required
async def get_messages(_, info, chatId, size, page): async def get_messages(_, info, chatId, size, page):
chat = await redis.execute("GET", f"chats/{chatId}") chat = await redis.execute("GET", f"chats/{chatId}")

21
schema.graphql
View File

@ -30,9 +30,13 @@ type EnterChatResult {
error: String error: String
} }
type UserChatsResult { type ChatResult {
error: String error: String
chats: [String] members: [User]!
createdAt: DateTime!
createdBy: User
messages: [Message]
title: String
} }
type SessionInfo { type SessionInfo {
@ -203,9 +207,10 @@ type Mutation {
type Query { type Query {
# inbox # inbox
userChats: UserChatsResult! myChats: [ChatResult]!
enterChat(chatId: String!, size: Int = 50): EnterChatResult! enterChat(chatId: String!): ChatResult!
getMessages(chatId: String!, size: Int!, page: Int!): [Message]! loadChat(chatId: String!, size: Int!, page: Int!): [Message]!
inviteChat(chatId: String!, userslug: String!): Result!
# auth # auth
isEmailUsed(email: String!): Boolean! isEmailUsed(email: String!): Boolean!
@ -496,6 +501,10 @@ type Message {
type Chat { type Chat {
id: Int! id: Int!
createdAt: DateTime! createdAt: DateTime!
createdBy: User!
updatedAt: DateTime! updatedAt: DateTime!
title: string
description: String description: String
users: [User]!
messages: [Message]
} }