Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Updated hidden/removed comment copy on API side (#21796)

Browse source 
REF
https://linear.app/ghost/issue/PLG-295/change-copy-for-replied-to-[hiddenremoved]
- Updated the copy from hidden/removed to removed on API side and in
i18n context.json for consistency
This commit is contained in:
Sanne de Vries 2024-12-03 20:05:42 +01:00 • committed by GitHub
parent 8dc1c8e74d
commit 0757f270eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/comments-ui/test/e2e/content.test.ts
View file

@ -41,7 +41,7 @@ test.describe('Deleted and Hidden Content', async () => {
await expect(comments).toHaveCount(3);
});
test('hide and deleted comment shows with hidden/deleted text when it has replies', async ({page}) => {
test('hide and deleted comment shows with removed text when it has replies', async ({page}) => {
const mockedApi = new MockedApi({});
mockedApi.addComment({
html: '<p>This is comment 1</p>'

2
ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/comments.js
View file

@ -52,7 +52,7 @@ const commentMapper = (model, frame) => {
if (jsonModel.inReplyTo && (jsonModel.inReplyTo.status === 'published' || (!isPublicRequest && jsonModel.inReplyTo.status === 'hidden'))) {
jsonModel.in_reply_to_snippet = htmlToPlaintext.commentSnippet(jsonModel.inReplyTo.html);
} else if (jsonModel.inReplyTo && jsonModel.inReplyTo.status !== 'published') {
jsonModel.in_reply_to_snippet = '[hidden/removed]';
jsonModel.in_reply_to_snippet = '[removed]';
} else {
jsonModel.in_reply_to_snippet = null;
}

8
ghost/core/test/e2e-api/members-comments/__snapshots__/comments.test.js.snap
View file

@ -2125,7 +2125,7 @@ Object {
"html": "<p>This is a comment</p>",
"id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
"in_reply_to_id": Nullable<StringMatching>,
"in_reply_to_snippet": "[hidden/removed]",
"in_reply_to_snippet": "[removed]",
"liked": Any<Boolean>,
"member": Object {
"avatar_image": null,
@ -2145,7 +2145,7 @@ exports[`Comments API when commenting enabled for all when authenticated replies
Object {
"access-control-allow-origin": "*",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "442",
"content-length": "435",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"vary": "Accept-Encoding",
@ -2166,7 +2166,7 @@ Object {
"html": "<p>This is a comment</p>",
"id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
"in_reply_to_id": Nullable<StringMatching>,
"in_reply_to_snippet": "[hidden/removed]",
"in_reply_to_snippet": "[removed]",
"liked": Any<Boolean>,
"member": Object {
"avatar_image": null,
@ -2186,7 +2186,7 @@ exports[`Comments API when commenting enabled for all when authenticated replies
Object {
"access-control-allow-origin": "*",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "442",
"content-length": "435",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"vary": "Accept-Encoding",

2
ghost/core/test/e2e-api/members-comments/comments.test.js
View file

@ -1518,7 +1518,7 @@ describe('Comments API', function () {
const {body: {comments: [comment]}} = await testGetComments(`/api/comments/${newComment.id}`, [labsCommentMatcher]);
comment.in_reply_to_snippet.should.eql('[hidden/removed]');
comment.in_reply_to_snippet.should.eql('[removed]');
});
});
});

1
ghost/i18n/locales/context.json
View file

@ -307,7 +307,6 @@
"complimentary": "",
"edited": "",
"free": "",
"hidden/removed": "",
"jamie@example.com": "Placeholder for email input field",
"month": "the subscription interval (monthly), following the /",
"paid": "",