diff --git a/inbox.graphql b/inbox.graphql index ea6c60e..58f306f 100644 --- a/inbox.graphql +++ b/inbox.graphql @@ -13,7 +13,7 @@ type ChatMember { slug: String! name: String! userpic: String - lastSeen: Int! + last_seen: Int! online: Boolean # invitedAt: DateTime # invitedBy: String # user slug @@ -72,18 +72,18 @@ type Message { author: Int! chatId: String! body: String! - createdAt: Int! + created_at: Int! id: Int! replyTo: Int - updatedAt: Int + updated_at: Int seen: Boolean } type Chat { id: String! - createdAt: Int! - createdBy: Int! - updatedAt: Int! + created_at: Int! + created_by: Int! + updated_at: Int! title: String description: String users: [Int] diff --git a/resolvers/load.py b/resolvers/load.py index 6e81ec9..bd7b548 100644 --- a/resolvers/load.py +++ b/resolvers/load.py @@ -104,8 +104,8 @@ async def load_messages_by(_, info, by, limit: int = 10, offset: int = 0): messages = await load_messages(by_chat, limit, offset) return { "messages": sorted( - [m for m in messages if m.get("createdAt")], - key=lambda m: m.get("createdAt"), + [m for m in messages if m.get("created_at")], + key=lambda m: m.get("created_at"), ), "error": None, } diff --git a/resolvers/search.py b/resolvers/search.py index cd3901d..1ca877a 100644 --- a/resolvers/search.py +++ b/resolvers/search.py @@ -67,7 +67,7 @@ async def search_in_chats( if days_ago: mmm = list( filter( - lambda msg: int(datetime.now(tz=timezone.utc)) - int(msg["createdAt"]) + lambda msg: int(datetime.now(tz=timezone.utc)) - int(msg["created_at"]) < int(timedelta(days=days_ago)), mmm, ) diff --git a/validators/chat.py b/validators/chat.py index af8a0d6..6f1fe87 100644 --- a/validators/chat.py +++ b/validators/chat.py @@ -9,9 +9,9 @@ class Chat(TypedDict): members: List[int] admins: List[int] title: str - updatedAt: Optional[int] - createdAt: int - createdBy: int + updated_at: Optional[int] + created_at: int + created_by: int description: Optional[str] @@ -20,9 +20,9 @@ class ChatPayload(TypedDict): members: List[int | ChatMember] admins: List[int] title: str - updatedAt: Optional[int] - createdAt: int - createdBy: int + updated_at: Optional[int] + created_at: int + created_by: int description: Optional[str] messages: Optional[List[Message]] unread: Optional[List[int]] diff --git a/validators/member.py b/validators/member.py index 40160b2..bdf40fa 100644 --- a/validators/member.py +++ b/validators/member.py @@ -6,5 +6,5 @@ class ChatMember(TypedDict): slug: str name: str userpic: Optional[str] - lastSeen: int + last_seen: int online: Optional[bool] diff --git a/validators/message.py b/validators/message.py index afcf5c7..a4e80ca 100644 --- a/validators/message.py +++ b/validators/message.py @@ -6,7 +6,7 @@ class Message(TypedDict): chat: str author: int body: str - createdAt: int - replyTo: Optional[int] - createdAt: int - updatedAt: Optional[int] + created_at: int + reply_to: Optional[int] + created_at: int + updated_at: Optional[int]