diff --git a/src/parser/classes/comments/Comment.ts b/src/parser/classes/comments/Comment.ts deleted file mode 100644 index 5be67e906..000000000 --- a/src/parser/classes/comments/Comment.ts +++ /dev/null @@ -1,179 +0,0 @@ -import { Parser } from '../../index.js'; - -import Author from '../misc/Author.js'; -import Text from '../misc/Text.js'; -import Thumbnail from '../misc/Thumbnail.js'; - -import Menu from '../menus/Menu.js'; -import AuthorCommentBadge from './AuthorCommentBadge.js'; -import CommentActionButtons from './CommentActionButtons.js'; -import CommentReplyDialog from './CommentReplyDialog.js'; -import PdgCommentChip from './PdgCommentChip.js'; -import SponsorCommentBadge from './SponsorCommentBadge.js'; - -import * as ProtoUtils from '../../../utils/ProtoUtils.js'; -import { InnertubeError } from '../../../utils/Utils.js'; -import { YTNode } from '../../helpers.js'; - -import type Actions from '../../../core/Actions.js'; -import type { ApiResponse } from '../../../core/Actions.js'; -import type { RawNode } from '../../index.js'; - -export default class Comment extends YTNode { - static type = 'Comment'; - - #actions?: Actions; - - content: Text; - published: Text; - author_is_channel_owner: boolean; - current_user_reply_thumbnail: Thumbnail[]; - sponsor_comment_badge: SponsorCommentBadge | null; - paid_comment_chip: PdgCommentChip | null; - author_badge: AuthorCommentBadge | null; - author: Author; - action_menu: Menu | null; - action_buttons: CommentActionButtons | null; - comment_id: string; - vote_status: string; - vote_count: string; - reply_count: number; - is_liked: boolean; - is_disliked: boolean; - is_hearted: boolean; - is_pinned: boolean; - is_member: boolean; - - constructor(data: RawNode) { - super(); - this.content = new Text(data.contentText); - this.published = new Text(data.publishedTimeText); - this.author_is_channel_owner = data.authorIsChannelOwner; - this.current_user_reply_thumbnail = Thumbnail.fromResponse(data.currentUserReplyThumbnail); - this.sponsor_comment_badge = Parser.parseItem(data.sponsorCommentBadge, SponsorCommentBadge); - this.paid_comment_chip = Parser.parseItem(data.paidCommentChipRenderer, PdgCommentChip); - this.author_badge = Parser.parseItem(data.authorCommentBadge, AuthorCommentBadge); - - this.author = new Author({ - ...data.authorText, - navigationEndpoint: data.authorEndpoint - }, this.author_badge ? [ { - metadataBadgeRenderer: this.author_badge?.orig_badge - } ] : null, data.authorThumbnail); - - this.action_menu = Parser.parseItem(data.actionMenu, Menu); - this.action_buttons = Parser.parseItem(data.actionButtons, CommentActionButtons); - this.comment_id = data.commentId; - this.vote_status = data.voteStatus; - - this.vote_count = data.voteCount ? new Text(data.voteCount).toString() : '0'; - - this.reply_count = data.replyCount || 0; - this.is_liked = !!this.action_buttons?.like_button?.is_toggled; - this.is_disliked = !!this.action_buttons?.dislike_button?.is_toggled; - this.is_hearted = !!this.action_buttons?.creator_heart?.is_hearted; - this.is_pinned = !!data.pinnedCommentBadge; - this.is_member = !!data.sponsorCommentBadge; - } - - /** - * Likes the comment. - */ - async like(): Promise { - if (!this.#actions) - throw new InnertubeError('An active caller must be provide to perform this operation.'); - - const button = this.action_buttons?.like_button; - - if (!button) - throw new InnertubeError('Like button was not found.', { comment_id: this.comment_id }); - - if (button.is_toggled) - throw new InnertubeError('This comment is already liked', { comment_id: this.comment_id }); - - const response = await button.endpoint.call(this.#actions, { parse: false }); - - return response; - } - /** - * Dislikes the comment. - */ - async dislike(): Promise { - if (!this.#actions) - throw new InnertubeError('An active caller must be provide to perform this operation.'); - - const button = this.action_buttons?.dislike_button; - - if (!button) - throw new InnertubeError('Dislike button was not found.', { comment_id: this.comment_id }); - - if (button.is_toggled) - throw new InnertubeError('This comment is already disliked', { comment_id: this.comment_id }); - - const response = await button.endpoint.call(this.#actions, { parse: false }); - - return response; - } - - /** - * Creates a reply to the comment. - */ - async reply(text: string): Promise { - if (!this.#actions) - throw new InnertubeError('An active caller must be provide to perform this operation.'); - - if (!this.action_buttons?.reply_button) - throw new InnertubeError('Cannot reply to another reply. Try mentioning the user instead.', { comment_id: this.comment_id }); - - const button = this.action_buttons?.reply_button; - - if (!button.endpoint?.dialog) - throw new InnertubeError('Reply button endpoint did not have a dialog.'); - - const dialog = button.endpoint.dialog.as(CommentReplyDialog); - const dialog_button = dialog.reply_button; - - if (!dialog_button) - throw new InnertubeError('Reply button was not found in the dialog.', { comment_id: this.comment_id }); - - if (!dialog_button.endpoint) - throw new InnertubeError('Reply button endpoint was not found.', { comment_id: this.comment_id }); - - const response = await dialog_button.endpoint.call(this.#actions, { commentText: text }); - - return response; - } - - /** - * Translates the comment to a given language. - * @param target_language - Ex; en, ja - */ - async translate(target_language: string): Promise { - if (!this.#actions) - throw new InnertubeError('An active caller must be provide to perform this operation.'); - - // Emojis must be removed otherwise InnerTube throws a 400 status code at us. - const text = this.content.toString().replace(/[^\p{L}\p{N}\p{P}\p{Z}]/gu, ''); - - const payload = { - text, - target_language, - comment_id: this.comment_id - }; - - const action = ProtoUtils.encodeCommentActionParams(22, payload); - const response = await this.#actions.execute('comment/perform_comment_action', { action }); - - // XXX: Should move this to Parser#parseResponse - const mutations = response.data.frameworkUpdates?.entityBatchUpdate?.mutations; - const content = mutations?.[0]?.payload?.commentEntityPayload?.translatedContent?.content; - - return { ...response, content }; - } - - setActions(actions: Actions | undefined) { - this.#actions = actions; - } -} \ No newline at end of file diff --git a/src/parser/classes/comments/CommentThread.ts b/src/parser/classes/comments/CommentThread.ts index 3cc9b2665..4a55e1a9e 100644 --- a/src/parser/classes/comments/CommentThread.ts +++ b/src/parser/classes/comments/CommentThread.ts @@ -1,7 +1,6 @@ import { Parser } from '../../index.js'; import Button from '../Button.js'; import ContinuationItem from '../ContinuationItem.js'; -import Comment from './Comment.js'; import CommentView from './CommentView.js'; import CommentReplies from './CommentReplies.js'; @@ -9,7 +8,7 @@ import { InnertubeError } from '../../../utils/Utils.js'; import { observe, YTNode } from '../../helpers.js'; import type Actions from '../../../core/Actions.js'; -import type { ObservedArray } from '../../helpers.js'; +import type { ObservedArray, Memo } from '../../helpers.js'; import type { RawNode } from '../../index.js'; export default class CommentThread extends YTNode { @@ -18,20 +17,15 @@ export default class CommentThread extends YTNode { #actions?: Actions; #continuation?: ContinuationItem; - comment: Comment | CommentView | null; - replies?: ObservedArray; - comment_replies_data: CommentReplies | null; - is_moderated_elq_comment: boolean; - has_replies: boolean; + public comment: CommentView | null; + public replies?: ObservedArray; + public comment_replies_data: CommentReplies | null; + public is_moderated_elq_comment: boolean; + public has_replies: boolean; constructor(data: RawNode) { super(); - - if (Reflect.has(data, 'commentViewModel')) { - this.comment = Parser.parseItem(data.commentViewModel, CommentView); - } else { - this.comment = Parser.parseItem(data.comment, Comment); - } + this.comment = Parser.parseItem(data.commentViewModel, CommentView); this.comment_replies_data = Parser.parseItem(data.replies, CommentReplies); this.is_moderated_elq_comment = data.isModeratedElqComment; this.has_replies = !!this.comment_replies_data; @@ -57,12 +51,8 @@ export default class CommentThread extends YTNode { if (!response.on_response_received_endpoints_memo) throw new InnertubeError('Unexpected response.', response); - this.replies = observe(response.on_response_received_endpoints_memo.getType(Comment, CommentView).map((comment) => { - comment.setActions(this.#actions); - return comment; - })); - - this.#continuation = response?.on_response_received_endpoints_memo.getType(ContinuationItem).first(); + this.replies = this.#getPatchedReplies(response.on_response_received_endpoints_memo); + this.#continuation = response.on_response_received_endpoints_memo.getType(ContinuationItem).first(); return this; } @@ -90,16 +80,19 @@ export default class CommentThread extends YTNode { if (!response.on_response_received_endpoints_memo) throw new InnertubeError('Unexpected response.', response); - this.replies = observe(response.on_response_received_endpoints_memo.getType(Comment, CommentView).map((comment) => { - comment.setActions(this.#actions); - return comment; - })); - + this.replies = this.#getPatchedReplies(response.on_response_received_endpoints_memo); this.#continuation = response.on_response_received_endpoints_memo.getType(ContinuationItem).first(); return this; } - + + #getPatchedReplies(data: Memo): ObservedArray { + return observe(data.getType(CommentView).map((comment) => { + comment.setActions(this.#actions); + return comment; + })); + } + get has_continuation(): boolean { if (!this.replies) throw new InnertubeError('Cannot determine if there is a continuation because this thread\'s replies have not been loaded.'); diff --git a/src/parser/nodes.ts b/src/parser/nodes.ts index a2ae3770b..4e63fbb33 100644 --- a/src/parser/nodes.ts +++ b/src/parser/nodes.ts @@ -80,7 +80,6 @@ export { default as ContinuationCommand } from './classes/commands/ContinuationC export { default as GetKidsBlocklistPickerCommand } from './classes/commands/GetKidsBlocklistPickerCommand.js'; export { default as ShowDialogCommand } from './classes/commands/ShowDialogCommand.js'; export { default as AuthorCommentBadge } from './classes/comments/AuthorCommentBadge.js'; -export { default as Comment } from './classes/comments/Comment.js'; export { default as CommentActionButtons } from './classes/comments/CommentActionButtons.js'; export { default as CommentDialog } from './classes/comments/CommentDialog.js'; export { default as CommentReplies } from './classes/comments/CommentReplies.js';