diff --git a/docs/article.puml b/docs/article.puml index c74dce1c..3730f2fb 100644 --- a/docs/article.puml +++ b/docs/article.puml @@ -50,7 +50,7 @@ Solid -> Store: loadArticleComments activate Store Store -> apiClient: getArticleComments activate apiClient -apiClient -> DB: query: articleReactions +apiClient -> DB: query: getReactionsForShouts activate DB DB --> apiClient: response deactivate DB diff --git a/src/graphql/publicGraphQLClient.ts b/src/graphql/publicGraphQLClient.ts index 7bb5d2c1..2d421737 100644 --- a/src/graphql/publicGraphQLClient.ts +++ b/src/graphql/publicGraphQLClient.ts @@ -2,8 +2,8 @@ import { ClientOptions, dedupExchange, fetchExchange, createClient, Exchange } f import { devtoolsExchange } from '@urql/devtools' import { isDev } from '../utils/config' -export const baseUrl = 'https://newapi.discours.io' -// export const baseUrl = 'http://localhost:8000' +// export const baseUrl = 'https://newapi.discours.io' +export const baseUrl = 'http://localhost:8000' const exchanges: Exchange[] = [dedupExchange, fetchExchange] diff --git a/src/graphql/query/article-reactions.ts b/src/graphql/query/article-reactions.ts deleted file mode 100644 index c04d6bc8..00000000 --- a/src/graphql/query/article-reactions.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { gql } from '@urql/core' - -export default gql` - query ReactionsByShoutQuery($slug: String!, $limit: Int!, $offset: Int!) { - reactionsByShout(slug: $slug, limit: $limit, offset: $offset) { - id - body - createdAt - createdBy { - _id: slug - name - slug - userpic - } - updatedAt - replyTo { - id - } - kind - range - stat { - _id: viewed - viewed - reacted - rating - } - } - } -` diff --git a/src/graphql/types.gen.ts b/src/graphql/types.gen.ts index 3ef4b19c..59b0f1b2 100644 --- a/src/graphql/types.gen.ts +++ b/src/graphql/types.gen.ts @@ -347,7 +347,6 @@ export type Query = { markdownBody: Scalars['String'] myChats: Array> reactionsByAuthor: Array> - reactionsByShout: Array> reactionsForShouts: Array> recentAll: Array> recentCandidates: Array> @@ -422,12 +421,6 @@ export type QueryReactionsByAuthorArgs = { slug: Scalars['String'] } -export type QueryReactionsByShoutArgs = { - limit: Scalars['Int'] - offset: Scalars['Int'] - slug: Scalars['String'] -} - export type QueryReactionsForShoutsArgs = { limit: Scalars['Int'] offset: Scalars['Int'] diff --git a/src/stores/zine/reactions.ts b/src/stores/zine/reactions.ts index 93018c66..63273a09 100644 --- a/src/stores/zine/reactions.ts +++ b/src/stores/zine/reactions.ts @@ -26,7 +26,7 @@ export const loadArticleReactions = async ({ limit?: number offset?: number }): Promise => { - const data = await apiClient.getArticleReactions({ articleSlug, limit, offset }) + const data = await apiClient.getReactionsForShouts({ shoutSlugs: [articleSlug], limit, offset }) // TODO: const [data, provider] = roomConnect(articleSlug, username, "reactions") reactionsOrdered.set(data) } diff --git a/src/utils/apiClient.ts b/src/utils/apiClient.ts index 02b3903d..8a74452c 100644 --- a/src/utils/apiClient.ts +++ b/src/utils/apiClient.ts @@ -2,7 +2,6 @@ import type { Reaction, Shout, FollowingEntity, AuthResult } from '../graphql/ty import { publicGraphQLClient } from '../graphql/publicGraphQLClient' import { privateGraphQLClient } from '../graphql/privateGraphQLClient' import articleBySlug from '../graphql/query/article-by-slug' -import articleReactions from '../graphql/query/article-reactions' import articlesRecentAll from '../graphql/query/articles-recent-all' import articlesRecentPublished from '../graphql/query/articles-recent-published' import topicsAll from '../graphql/query/topics-all' @@ -187,13 +186,13 @@ export const apiClient = { limit: number offset?: number }): Promise => { - const response = await publicGraphQLClient - .query(articlesForAuthors, { - slugs: authorSlugs, - limit, - offset - }) - .toPromise() + const vars = { + slugs: authorSlugs, + limit, + offset + } + console.debug(vars) + const response = await publicGraphQLClient.query(articlesForAuthors, vars).toPromise() if (response.error) { console.error('[api-client] getArticlesForAuthors', response.error) @@ -271,25 +270,6 @@ export const apiClient = { return response.data.reactionsForShouts }, - getArticleReactions: async ({ - articleSlug, - limit = REACTIONS_PAGE_SIZE, - offset = 0 - }: { - articleSlug: string - limit: number - offset: number - }): Promise => { - const response = await publicGraphQLClient - .query(articleReactions, { - slug: articleSlug, - limit, - offset - }) - .toPromise() - - return response.data?.reactionsByShout - }, getAuthorsBySlugs: async ({ slugs }) => { const response = await publicGraphQLClient.query(authorsBySlugs, { slugs }).toPromise() return response.data.getUsersBySlugs