fixed-api

src/graphql/query/im-chats.ts

@@ -4,7 +4,6 @@ export default gql`
   query GetChatsQuery {
     myChats {
       messages {
-        chatId
         id
         author
         body

src/graphql/query/im-load-messages.ts

@@ -0,0 +1,13 @@
+import { gql } from '@urql/core'
+
+export default gql`
+  query LoadMessagesQuery($chatId: String!, $offset: Int, $amount: Int) {
+    loadChat(chatId: $chatId, offset: $offset, amount: $amount) {
+      id
+      title
+      desc
+      slug
+      amount
+    }
+  }
+`

src/graphql/types.gen.ts

@@ -31,17 +31,23 @@ export type Author = {
 }
 
 export type Chat = {
-  createdAt: Scalars['DateTime']
+  createdAt: Scalars['Int']
   createdBy: User
   description?: Maybe<Scalars['String']>
   id: Scalars['Int']
   messages: Array<Maybe<Message>>
   title?: Maybe<Scalars['String']>
   unread?: Maybe<Scalars['Int']>
-  updatedAt: Scalars['DateTime']
+  updatedAt: Scalars['Int']
   users: Array<Maybe<User>>
 }
 
+export type ChatInput = {
+  description?: InputMaybe<Scalars['String']>
+  id: Scalars['String']
+  title?: InputMaybe<Scalars['String']>
+}
+
 export type ChatMember = {
   invitedAt?: Maybe<Scalars['DateTime']>
   invitedBy?: Maybe<Scalars['String']>
@@ -99,12 +105,11 @@ export enum FollowingEntity {
 export type Message = {
   author: Scalars['String']
   body: Scalars['String']
-  chatId: Scalars['Int']
+  chatId: Scalars['String']
-  createdAt: Scalars['DateTime']
+  createdAt: Scalars['Int']
   id: Scalars['Int']
   replyTo?: Maybe<Scalars['Int']>
-  updatedAt: Scalars['DateTime']
+  updatedAt?: Maybe<Scalars['Int']>
-  visibleForUsers?: Maybe<Array<Maybe<Scalars['Int']>>>
 }
 
 export enum MessageStatus {
@@ -115,7 +120,7 @@ export enum MessageStatus {
 
 export type Mutation = {
   confirmEmail: AuthResult
-  createChat: Chat
+  createChat: Result
   createCollection: Result
   createCommunity: Result
   createMessage: Result
@@ -128,6 +133,7 @@ export type Mutation = {
   deleteReaction: Result
   deleteShout: Result
   destroyTopic: Result
+  enterChat: Result
   follow: Result
   incrementView: Result
   inviteAuthor: Result
@@ -139,6 +145,7 @@ export type Mutation = {
   removeAuthor: Result
   sendLink: Result
   unfollow: Result
+  updateChat: Result
   updateCollection: Result
   updateCommunity: Result
   updateMessage: Result
@@ -153,7 +160,8 @@ export type MutationConfirmEmailArgs = {
 }
 
 export type MutationCreateChatArgs = {
-  description?: InputMaybe<Scalars['String']>
+  members: Array<InputMaybe<Scalars['String']>>
+  title?: InputMaybe<Scalars['String']>
 }
 
 export type MutationCreateCollectionArgs = {
@@ -207,6 +215,10 @@ export type MutationDestroyTopicArgs = {
   slug: Scalars['String']
 }
 
+export type MutationEnterChatArgs = {
+  chatId: Scalars['String']
+}
+
 export type MutationFollowArgs = {
   slug: Scalars['String']
   what: FollowingEntity
@@ -257,6 +269,10 @@ export type MutationUnfollowArgs = {
   what: FollowingEntity
 }
 
+export type MutationUpdateChatArgs = {
+  chat: ChatInput
+}
+
 export type MutationUpdateCollectionArgs = {
   collection: CollectionInput
 }
@@ -313,7 +329,6 @@ export type ProfileInput = {
 export type Query = {
   authorsAll: Array<Maybe<User>>
   collectionsAll: Array<Maybe<Collection>>
-  enterChat: Chat
   getCollabs: Array<Maybe<Collab>>
   getCommunities: Array<Maybe<Community>>
   getCommunity: Community
@@ -356,10 +371,6 @@ export type Query = {
   userReactedShouts: Array<Maybe<Shout>>
 }
 
-export type QueryEnterChatArgs = {
-  chatId: Scalars['String']
-}
-
 export type QueryGetCommunityArgs = {
   slug?: InputMaybe<Scalars['String']>
 }
@@ -385,9 +396,9 @@ export type QueryIsEmailUsedArgs = {
 }
 
 export type QueryLoadChatArgs = {
+  amount?: InputMaybe<Scalars['Int']>
   chatId: Scalars['String']
-  page: Scalars['Int']
+  offset?: InputMaybe<Scalars['Int']>
-  size: Scalars['Int']
 }
 
 export type QueryMarkdownBodyArgs = {
@@ -657,7 +668,7 @@ export type ShoutInput = {
   topic_slugs?: InputMaybe<Array<InputMaybe<Scalars['String']>>>
   versionOf?: InputMaybe<Scalars['String']>
   visibleForRoles?: InputMaybe<Array<InputMaybe<Scalars['String']>>>
-  visibleForUsers?: InputMaybe<Array<InputMaybe<Scalars['Int']>>>
+  visibleForUsers?: InputMaybe<Array<InputMaybe<Scalars['String']>>>
 }
 
 export type Stat = {
@@ -669,15 +680,15 @@ export type Stat = {
 }
 
 export type Subscription = {
-  chatUpdated: Result
+  newMessage: Message
   onlineUpdated: Array<User>
   reactionUpdated: ReactionUpdating
   shoutUpdated: Shout
   userUpdated: User
 }
 
-export type SubscriptionChatUpdatedArgs = {
+export type SubscriptionNewMessageArgs = {
-  chatId: Scalars['String']
+  chats?: InputMaybe<Array<Scalars['Int']>>
 }
 
 export type SubscriptionReactionUpdatedArgs = {

src/pages/inbox.astro

@@ -4,7 +4,7 @@ import { Root } from '../components/Root'
 import { apiClient } from '../utils/apiClient'
 import { initRouter } from '../stores/router'
 
-const chatrooms = await apiClient.getInboxes()
+const chatrooms = await apiClient.getChats()
 
 const { pathname, search } = Astro.url
 initRouter(pathname, search)

src/utils/apiClient.ts

@@ -27,7 +27,8 @@ import reactionDestroy from '../graphql/mutation/reaction-destroy'
 import reactionUpdate from '../graphql/mutation/reaction-update'
 import authorsBySlugs from '../graphql/query/authors-by-slugs'
 import incrementView from '../graphql/mutation/increment-view'
-import myChats from '../graphql/query/my-chats'
+import myChats from '../graphql/query/im-chats'
+import loadChat from '../graphql/query/im-load-messages'
 
 const FEED_SIZE = 50
 
@@ -325,8 +326,20 @@ export const apiClient = {
   incrementView: async ({ articleSlug }) => {
     await privateGraphQLClient.mutation(incrementView, { shout: articleSlug })
   },
-  getInboxes: async (payload = {}) => {
+  getChats: async (payload = {}) => {
     const resp = await privateGraphQLClient.query(myChats, payload).toPromise()
     return resp.data.myChats
+  },
+  getChatMessages: async ({
+    chatId,
+    offset = 0,
+    amount = 50
+  }: {
+    chatId: string
+    offset?: number
+    amount?: number
+  }) => {
+    const resp = await privateGraphQLClient.query(loadChat, { chatId, offset, amount }).toPromise()
+    return resp.data.loadChat
   }
 }