From 7b3ab334813ed2fd6f4db2c5edb0b3bdd1502611 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Thu, 30 Nov 2023 11:07:31 +0300
Subject: [PATCH] schema-updates

---
 src/components/Article/CommentRatingControl.tsx  | 12 ++++++------
 src/components/Article/CommentsTree.tsx          |  4 ++--
 src/components/Article/FullArticle.tsx           |  4 ++--
 src/components/Article/ShoutRatingControl.tsx    |  6 +++---
 src/components/Editor/Editor.tsx                 |  6 +++---
 src/components/Feed/ArticleCard/ArticleCard.tsx  |  5 +++--
 src/components/Nav/Header/Header.tsx             |  8 +-------
 src/context/reactions.tsx                        | 14 ++++++++++++--
 src/graphql/client/core.ts                       |  4 ++--
 src/graphql/query/core/article-load.ts           | 16 +++++++++++++++-
 src/graphql/query/core/articles-load-by.ts       |  9 +++++++--
 src/graphql/query/core/articles-load-drafts.ts   |  8 +++++++-
 src/graphql/query/core/articles-load-feed.ts     |  8 +++++++-
 src/graphql/query/core/articles-load-followed.ts |  8 +++++++-
 src/graphql/query/core/articles-load-search.ts   |  7 +++++++
 15 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/src/components/Article/CommentRatingControl.tsx b/src/components/Article/CommentRatingControl.tsx
index 7c189b47..4fb906c1 100644
--- a/src/components/Article/CommentRatingControl.tsx
+++ b/src/components/Article/CommentRatingControl.tsx
@@ -18,7 +18,7 @@ type Props = {
 
 export const CommentRatingControl = (props: Props) => {
   const { t } = useLocalize()
-  const { user } = useSession()
+  const { author } = useSession()
   const {
     actions: { showSnackbar },
   } = useSnackbar()
@@ -31,13 +31,13 @@ export const CommentRatingControl = (props: Props) => {
     Object.values(reactionEntities).some(
       (r) =>
         r.kind === reactionKind &&
-        r.created_by.slug === user()?.slug &&
+        r.created_by.slug === author()?.slug &&
         r.shout.id === props.comment.shout.id &&
         r.reply_to === props.comment.id,
     )
   const isUpvoted = createMemo(() => checkReaction(ReactionKind.Like))
   const isDownvoted = createMemo(() => checkReaction(ReactionKind.Dislike))
-  const canVote = createMemo(() => user()?.slug !== props.comment.created_by.slug)
+  const canVote = createMemo(() => author()?.slug !== props.comment.created_by.slug)
 
   const commentRatingReactions = createMemo(() =>
     Object.values(reactionEntities).filter(
@@ -52,7 +52,7 @@ export const CommentRatingControl = (props: Props) => {
     const reactionToDelete = Object.values(reactionEntities).find(
       (r) =>
         r.kind === reactionKind &&
-        r.created_by.slug === user()?.slug &&
+        r.created_by.slug === author()?.slug &&
         r.shout.id === props.comment.shout.id &&
         r.reply_to === props.comment.id,
     )
@@ -86,7 +86,7 @@ export const CommentRatingControl = (props: Props) => {
     <div class={styles.commentRating}>
       <button
         role="button"
-        disabled={!canVote() || !user()}
+        disabled={!canVote() || !author()}
         onClick={() => handleRatingChange(true)}
         class={clsx(styles.commentRatingControl, styles.commentRatingControlUp, {
           [styles.voted]: isUpvoted(),
@@ -112,7 +112,7 @@ export const CommentRatingControl = (props: Props) => {
       </Popup>
       <button
         role="button"
-        disabled={!canVote() || !user()}
+        disabled={!canVote() || !author()}
         onClick={() => handleRatingChange(false)}
         class={clsx(styles.commentRatingControl, styles.commentRatingControlDown, {
           [styles.voted]: isDownvoted(),
diff --git a/src/components/Article/CommentsTree.tsx b/src/components/Article/CommentsTree.tsx
index 3185affc..8c3b4240 100644
--- a/src/components/Article/CommentsTree.tsx
+++ b/src/components/Article/CommentsTree.tsx
@@ -43,7 +43,7 @@ type Props = {
 }
 
 export const CommentsTree = (props: Props) => {
-  const { session } = useSession()
+  const { author } = useSession()
   const { t } = useLocalize()
   const [commentsOrder, setCommentsOrder] = createSignal<CommentsOrder>('createdAt')
   const [newReactions, setNewReactions] = createSignal<Reaction[]>([])
@@ -85,7 +85,7 @@ export const CommentsTree = (props: Props) => {
       setCookie()
     } else if (currentDate.getTime() > dateFromLocalStorage) {
       const newComments = comments().filter((c) => {
-        if (c.reply_to || c.created_by.slug === session()?.user.slug) {
+        if (c.reply_to || c.created_by.slug === author()?.slug) {
           return
         }
         const created = c.created_at
diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx
index 2f1e8b0f..2fbdd2b8 100644
--- a/src/components/Article/FullArticle.tsx
+++ b/src/components/Article/FullArticle.tsx
@@ -61,7 +61,7 @@ export const FullArticle = (props: Props) => {
 
   const { t, formatDate } = useLocalize()
   const {
-    user,
+    author,
     isAuthenticated,
     actions: { requireAuthentication },
   } = useSession()
@@ -72,7 +72,7 @@ export const FullArticle = (props: Props) => {
 
   const mainTopic = createMemo(() => (props.article.topics.length > 0 ? props.article.topics[0] : null))
 
-  const canEdit = () => props.article.authors?.some((a) => a.slug === user()?.slug)
+  const canEdit = () => props.article.authors?.some((a) => a.slug === author()?.slug)
 
   const handleBookmarkButtonClick = (ev) => {
     requireAuthentication(() => {
diff --git a/src/components/Article/ShoutRatingControl.tsx b/src/components/Article/ShoutRatingControl.tsx
index 08027f36..bdf07548 100644
--- a/src/components/Article/ShoutRatingControl.tsx
+++ b/src/components/Article/ShoutRatingControl.tsx
@@ -20,7 +20,7 @@ interface ShoutRatingControlProps {
 export const ShoutRatingControl = (props: ShoutRatingControlProps) => {
   const { t } = useLocalize()
   const {
-    user,
+    author,
     actions: { requireAuthentication },
   } = useSession()
 
@@ -33,7 +33,7 @@ export const ShoutRatingControl = (props: ShoutRatingControlProps) => {
     Object.values(reactionEntities).some(
       (r) =>
         r.kind === reactionKind &&
-        r.created_by.slug === user()?.slug &&
+        r.created_by.slug === author()?.slug &&
         r.shout.id === props.shout.id &&
         !r.reply_to,
     )
@@ -55,7 +55,7 @@ export const ShoutRatingControl = (props: ShoutRatingControlProps) => {
     const reactionToDelete = Object.values(reactionEntities).find(
       (r) =>
         r.kind === reactionKind &&
-        r.created_by.slug === user()?.slug &&
+        r.created_by.slug === author()?.slug &&
         r.shout.id === props.shout.id &&
         !r.reply_to,
     )
diff --git a/src/components/Editor/Editor.tsx b/src/components/Editor/Editor.tsx
index 5720c807..a740a960 100644
--- a/src/components/Editor/Editor.tsx
+++ b/src/components/Editor/Editor.tsx
@@ -73,7 +73,7 @@ const providers: Record<string, HocuspocusProvider> = {}
 
 export const Editor = (props: Props) => {
   const { t } = useLocalize()
-  const { user } = useSession()
+  const { author } = useSession()
 
   const [isCommonMarkup, setIsCommonMarkup] = createSignal(false)
   const [shouldShowTextBubbleMenu, setShouldShowTextBubbleMenu] = createSignal(false)
@@ -234,8 +234,8 @@ export const Editor = (props: Props) => {
       CollaborationCursor.configure({
         provider: providers[docName],
         user: {
-          name: user().name,
-          color: uniqolor(user().slug).color,
+          name: author().name,
+          color: uniqolor(author().slug).color,
         },
       }),
       Placeholder.configure({
diff --git a/src/components/Feed/ArticleCard/ArticleCard.tsx b/src/components/Feed/ArticleCard/ArticleCard.tsx
index 9a1bce65..d33eb1fc 100644
--- a/src/components/Feed/ArticleCard/ArticleCard.tsx
+++ b/src/components/Feed/ArticleCard/ArticleCard.tsx
@@ -85,7 +85,7 @@ const getTitleAndSubtitle = (
 
 export const ArticleCard = (props: ArticleCardProps) => {
   const { t, lang, formatDate } = useLocalize()
-  const { user } = useSession()
+  const { author } = useSession()
   const mainTopic = props.article.topics[0]
 
   const formattedDate = createMemo<string>(() => {
@@ -94,7 +94,8 @@ export const ArticleCard = (props: ArticleCardProps) => {
 
   const { title, subtitle } = getTitleAndSubtitle(props.article)
 
-  const canEdit = () => props.article.authors?.some((a) => a.slug === user()?.slug)
+  const canEdit = () =>
+    props.article.authors?.some((a) => a.slug === author()?.slug) || props.article.created_by == author().id
 
   const { changeSearchParam } = useRouter()
   const scrollToComments = (event) => {
diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx
index 85c95fd1..58b505eb 100644
--- a/src/components/Nav/Header/Header.tsx
+++ b/src/components/Nav/Header/Header.tsx
@@ -19,15 +19,9 @@ import { ConfirmModal } from '../ConfirmModal'
 import { HeaderAuth } from '../HeaderAuth'
 import { Modal } from '../Modal'
 import { Snackbar } from '../Snackbar'
-
 import { Link } from './Link'
-
-import styles from './Header.module.scss'
-import { apiClient } from '../../../utils/apiClient'
-import { RANDOM_TOPICS_COUNT } from '../../Views/Home'
-import { Link } from './Link'
-import { Subscribe } from '../../_shared/Subscribe'
 import { SearchModal } from '../SearchModal/SearchModal'
+import styles from './Header.module.scss'
 
 type Props = {
   title?: string
diff --git a/src/context/reactions.tsx b/src/context/reactions.tsx
index 0230102f..8588e413 100644
--- a/src/context/reactions.tsx
+++ b/src/context/reactions.tsx
@@ -9,7 +9,15 @@ import { Reaction, ReactionBy, ReactionInput, ReactionKind } from '../graphql/sc
 type ReactionsContextType = {
   reactionEntities: Record<number, Reaction>
   actions: {
-    loadReactionsBy: ({ by, limit }: { by: ReactionBy; limit?: number }) => Promise<Reaction[]>
+    loadReactionsBy: ({
+      by,
+      limit,
+      offset,
+    }: {
+      by: ReactionBy
+      limit?: number
+      offset?: number
+    }) => Promise<Reaction[]>
     createReaction: (reaction: ReactionInput) => Promise<void>
     updateReaction: (id: number, reaction: ReactionInput) => Promise<void>
     deleteReaction: (id: number) => Promise<void>
@@ -28,11 +36,13 @@ export const ReactionsProvider = (props: { children: JSX.Element }) => {
   const loadReactionsBy = async ({
     by,
     limit,
+    offset,
   }: {
     by: ReactionBy
     limit?: number
+    offset?: number
   }): Promise<Reaction[]> => {
-    const reactions = await apiClient.getReactionsBy({ by, limit })
+    const reactions = await apiClient.getReactionsBy({ by, limit, offset })
     const newReactionEntities = reactions.reduce((acc, reaction) => {
       acc[reaction.id] = reaction
       return acc
diff --git a/src/graphql/client/core.ts b/src/graphql/client/core.ts
index 9289dafc..8b8510ef 100644
--- a/src/graphql/client/core.ts
+++ b/src/graphql/client/core.ts
@@ -183,9 +183,9 @@ export const apiClient = {
     return resp.data.load_shouts_feed
   },
 
-  getReactionsBy: async ({ by, limit }: { by: ReactionBy; limit?: number }) => {
+  getReactionsBy: async ({ by, limit, offset }: { by: ReactionBy; limit?: number; offset?: number }) => {
     const resp = await publicGraphQLClient
-      .query(reactionsLoadBy, { by, limit: limit ?? 1000, offset: 0 })
+      .query(reactionsLoadBy, { by, limit: limit ?? 1000, offset: offset ?? 0 })
       .toPromise()
     return resp.data.load_reactions_by
   },
diff --git a/src/graphql/query/core/article-load.ts b/src/graphql/query/core/article-load.ts
index f42378ff..2b43804d 100644
--- a/src/graphql/query/core/article-load.ts
+++ b/src/graphql/query/core/article-load.ts
@@ -14,8 +14,21 @@ export default gql`
       cover
       body
       media
+      created_by {
+        id
+        name
+        slug
+        pic
+        created_at
+      }
+      updated_by {
+        id
+        name
+        slug
+        pic
+        created_at
+      }
       # community
-      # mainTopic
       topics {
         id
         title
@@ -35,6 +48,7 @@ export default gql`
         created_at
       }
       created_at
+      updated_at
       published_at
       stat {
         viewed
diff --git a/src/graphql/query/core/articles-load-by.ts b/src/graphql/query/core/articles-load-by.ts
index 00ffe908..feb4a3ea 100644
--- a/src/graphql/query/core/articles-load-by.ts
+++ b/src/graphql/query/core/articles-load-by.ts
@@ -12,8 +12,13 @@ export default gql`
       layout
       cover
       lead
-      # community
-      # mainTopic
+      created_by {
+        id
+        name
+        slug
+        pic
+        created_at
+      }
       topics {
         id
         title
diff --git a/src/graphql/query/core/articles-load-drafts.ts b/src/graphql/query/core/articles-load-drafts.ts
index 1555932a..388ad3ef 100644
--- a/src/graphql/query/core/articles-load-drafts.ts
+++ b/src/graphql/query/core/articles-load-drafts.ts
@@ -10,7 +10,13 @@ export default gql`
       layout
       cover
       # community
-      # mainTopic
+      created_by {
+        id
+        name
+        slug
+        pic
+        created_at
+      }
       media
       topics {
         id
diff --git a/src/graphql/query/core/articles-load-feed.ts b/src/graphql/query/core/articles-load-feed.ts
index f038cb92..a23d30ff 100644
--- a/src/graphql/query/core/articles-load-feed.ts
+++ b/src/graphql/query/core/articles-load-feed.ts
@@ -10,7 +10,13 @@ export default gql`
       layout
       cover
       # community
-      # mainTopic
+      created_by {
+        id
+        name
+        slug
+        pic
+        created_at
+      }
       topics {
         id
         title
diff --git a/src/graphql/query/core/articles-load-followed.ts b/src/graphql/query/core/articles-load-followed.ts
index 5fb7834f..53c31db1 100644
--- a/src/graphql/query/core/articles-load-followed.ts
+++ b/src/graphql/query/core/articles-load-followed.ts
@@ -9,7 +9,13 @@ export default gql`
       slug
       cover
       # community
-      # mainTopic
+      created_by {
+        id
+        name
+        slug
+        pic
+        created_at
+      }
       topics {
         # id
         title
diff --git a/src/graphql/query/core/articles-load-search.ts b/src/graphql/query/core/articles-load-search.ts
index 14bd825d..bf6d071b 100644
--- a/src/graphql/query/core/articles-load-search.ts
+++ b/src/graphql/query/core/articles-load-search.ts
@@ -15,6 +15,13 @@ export default gql`
         body
         slug
       }
+      created_by {
+        id
+        name
+        slug
+        pic
+        created_at
+      }
       authors {
         id
         name