[pull] main from TryGhost:main

apps/admin-x-framework/src/api/comments.ts

@@ -12,6 +12,8 @@ export type Comment = {
     html: string | null;
     status: 'published' | 'hidden' | 'deleted';
     pinned: boolean;
+    liked?: boolean;
+    disliked?: boolean;
     created_at: string;
     updated_at: string;
     post_id: string;
@@ -32,6 +34,7 @@ export type Comment = {
         replies?: number;
         direct_replies?: number;
         likes?: number;
+        dislikes?: number;
         reports?: number;
     };
     // Optional nested replies for tree structures
@@ -51,6 +54,17 @@ export type CommentLike = {
     id: string;
     comment_id: string;
     member_id: string;
+    score: number;
+    created_at: string;
+    updated_at: string;
+    member?: Member;
+};
+
+export type CommentDislike = {
+    id: string;
+    comment_id: string;
+    member_id: string;
+    score: number;
     created_at: string;
     updated_at: string;
     member?: Member;
@@ -62,6 +76,42 @@ export interface CommentsResponseType {
 }
 
 const dataType = 'CommentsResponseType';
+const commentDislikeIncludes = 'count.dislikes';
+const commentDislikeMemberIncludes = 'count.dislikes,disliked';
+
+export const adminCommentIncludes = (dislikesEnabled: boolean) => [
+    'member',
+    'post',
+    'count.replies',
+    'count.direct_replies',
+    'count.likes',
+    ...(dislikesEnabled ? [commentDislikeIncludes] : []),
+    'count.reports',
+    'parent',
+    'in_reply_to'
+].join(',');
+
+export const memberCommentIncludes = (dislikesEnabled: boolean) => [
+    'member',
+    'post',
+    'count.replies',
+    'count.direct_replies',
+    'count.likes',
+    ...(dislikesEnabled ? [commentDislikeMemberIncludes] : []),
+    'parent',
+    'in_reply_to'
+].join(',');
+
+export const memberThreadCommentIncludes = (dislikesEnabled: boolean) => [
+    'member',
+    'post',
+    'count.direct_replies',
+    'count.likes',
+    ...(dislikesEnabled ? [commentDislikeIncludes] : []),
+    'count.reports',
+    'parent',
+    'in_reply_to'
+].join(',');
 
 const useBrowseCommentsQuery = createInfiniteQuery<CommentsResponseType>({
     dataType,
@@ -176,14 +226,25 @@ export const useCommentReplies = createQueryWithId<CommentsResponseType>({
     }
 });
 
-export const useReadComment = createQueryWithId<CommentsResponseType>({
+const useReadCommentQuery = createQueryWithId<CommentsResponseType>({
     dataType,
     path: (id: string) => `/comments/${id}/`,
     defaultSearchParams: {
-        include: 'member,post,count.replies,count.direct_replies,count.likes,count.reports,parent,in_reply_to'
+        include: adminCommentIncludes(false)
     }
 });
 
+export const useReadComment = (commentId: string, options?: Parameters<typeof useReadCommentQuery>[1] & {dislikesEnabled?: boolean}) => {
+    const {dislikesEnabled = false, searchParams, ...queryOptions} = options || {};
+    return useReadCommentQuery(commentId, {
+        ...queryOptions,
+        searchParams: {
+            include: adminCommentIncludes(dislikesEnabled),
+            ...searchParams
+        }
+    });
+};
+
 export interface CommentReportsResponseType {
     meta?: Meta;
     comment_reports: CommentReport[];
@@ -217,18 +278,39 @@ export const useBrowseCommentLikes = (commentId: string, options?: {enabled?: bo
     return useBrowseCommentLikesQuery(commentId, {...options});
 };
 
+export interface CommentDislikesResponseType {
+    meta?: Meta;
+    comment_dislikes: CommentDislike[];
+}
+
+const useBrowseCommentDislikesQuery = createQueryWithId<CommentDislikesResponseType>({
+    dataType: 'CommentDislikesResponseType',
+    path: id => `/comments/${id}/dislikes/`,
+    defaultSearchParams: {
+        include: 'member',
+        limit: '100',
+        order: 'created_at desc'
+    }
+});
+
+export const useBrowseCommentDislikes = (commentId: string, options?: {enabled?: boolean}) => {
+    return useBrowseCommentDislikesQuery(commentId, {...options});
+};
+
 /**
  * Fetches direct replies for a thread view.
  * - For top-level comments: returns comments where parent_id matches AND in_reply_to_id is null
  * - For nested comments: returns comments where in_reply_to_id matches
  */
-export const useThreadComments = (commentId: string, options?: {enabled?: boolean}) => {
+export const useThreadComments = (commentId: string, options?: {enabled?: boolean; dislikesEnabled?: boolean}) => {
+    const {dislikesEnabled = false, ...queryOptions} = options || {};
+
     return useBrowseComments({
-        ...options,
+        ...queryOptions,
         searchParams: {
             filter: `(parent_id:${commentId}+in_reply_to_id:null),in_reply_to_id:${commentId}`,
             order: 'created_at asc',
-            include: 'member,post,count.direct_replies,count.likes,count.reports,parent,in_reply_to',
+            include: memberThreadCommentIncludes(dislikesEnabled),
             limit: '100'
         }
     });

apps/admin-x-framework/src/utils/api/hooks.ts

@@ -8,6 +8,9 @@ import {useFramework} from '../../providers/framework-provider';
 import {RequestOptions, apiUrl, useFetchApi} from './fetch-api';
 
 export interface Meta {
+    capabilities?: {
+        dislikes?: boolean;
+    };
     pagination: {
         page: number;
         limit: number | 'all';

apps/comments-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/comments-ui",
-  "version": "1.4.20",
+  "version": "1.5.0",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",