fix(user-home): align profile comments with reference theme

2026-10-04 19:11:27 +08:00
parent 00817766a6
commit 56bbb63afd
8 changed files with 261 additions and 131 deletions
@@ -1,6 +1,6 @@
 <?php
 /**
- * Profile Comment List Item — image-less comment row for user center.
+ * Shared public profile / user center comment row.
 *
 * 通过 get_template_part() 的 $args 接收（保留 query var 兼容）：
 *   - aksrt_profile_comment: WP_Comment 对象
@@ -20,31 +20,56 @@ if (!$post) {
 	return;
 }

-$snippet      = wp_trim_words(wp_strip_all_tags($comment->comment_content), 30, '…');
+$content = get_comment_text($comment);
+$content = preg_replace_callback(
+	'/\[link=([^\]\s]+)(?:\s+target=_blank)?\](.*?)\[\/link\]/is',
+	static function (array $matches): string {
+		$url   = esc_url(trim($matches[1]));
+		$label = wp_kses_post($matches[2]);
+		if ($url === '') {
+			return $label;
+		}
+
+		$target = stripos($matches[0], 'target=_blank') !== false ? ' target="_blank" rel="noopener noreferrer"' : '';
+		return '<a href="' . $url . '"' . $target . '>' . $label . '</a>';
+	},
+	(string) $content
+);
+$content = preg_replace('/<img\b[^>]*>/i', '[图片]', (string) $content);
+$content = preg_replace('/\[img=[^\]]*\]/i', '[图片]', (string) $content);
+$content = preg_replace('/\[code\][\s\S]*?\[\/code\]/i', '[代码]', (string) $content);
+$content = wp_kses_post((string) $content);
+
 $post_title   = get_the_title($post);
 $comment_link = get_comment_link($comment);
 $post_link    = get_permalink($post);
 $date_iso     = get_comment_date('c', $comment);
-$date_label   = get_comment_date('Y-m-d', $comment);
-$time_diff    = human_time_diff(strtotime($comment->comment_date), current_time('timestamp'));
+$date_label   = get_comment_date('Y-m-d H:i:s', $comment);
+$time_diff    = human_time_diff((int) get_comment_time('U', false, false, $comment), current_time('timestamp'));
+$parent       = $comment->comment_parent ? get_comment((int) $comment->comment_parent) : null;
 ?>
-<article class="profile-comment-item">
-	<a href="<?php echo esc_url($comment_link); ?>" class="profile-comment-item__quote-link" aria-label="<?php esc_attr_e('查看评论', 'aksrt'); ?>">
-		<span class="profile-comment-item__quote-mark" aria-hidden="true">&ldquo;</span>
-		<span class="profile-comment-item__quote-text"><?php echo esc_html($snippet); ?></span>
-	</a>
-	<div class="profile-comment-item__meta">
-		<span class="profile-comment-item__meta-item profile-comment-item__meta-item--post">
-			<i class="fa fas fa-file-alt" aria-hidden="true"></i>
-			<?php esc_html_e('在', 'aksrt'); ?>
-			<a href="<?php echo esc_url($post_link); ?>" class="profile-comment-item__post-link"><?php echo esc_html($post_title); ?></a>
-		</span>
-		<span class="profile-comment-item__meta-sep" aria-hidden="true">·</span>
-		<time class="profile-comment-item__meta-item" datetime="<?php echo esc_attr($date_iso); ?>" title="<?php echo esc_attr($date_label); ?>">
+	<article class="profile-comment-item">
+		<time class="profile-comment-item__time" datetime="<?php echo esc_attr($date_iso); ?>" title="<?php echo esc_attr($date_label); ?>">
 			<?php
 			/* translators: %s: human time diff */
 			printf(esc_html__('%s前', 'aksrt'), esc_html($time_diff));
 			?>
 		</time>
-	</div>
-</article>
+		<div class="profile-comment-item__body">
+			<div class="profile-comment-item__content-wrap">
+				<a class="profile-comment-item__content text-ellipsis-5" href="<?php echo esc_url($comment_link); ?>">
+					<?php if ($comment->comment_approved === '0') : ?>
+						<span class="profile-comment-item__pending badg c-red badg-sm"><?php esc_html_e('待审核', 'aksrt'); ?></span>
+					<?php endif; ?>
+					<?php echo $content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- filtered and restricted with wp_kses_post(). ?>
+				</a>
+			</div>
+			<div class="profile-comment-item__source muted-2-color em09 text-ellipsis">
+				<?php if ($parent instanceof WP_Comment) : ?>
+					<span class="profile-comment-item__parent">@<?php echo esc_html(get_comment_author($parent)); ?></span>
+				<?php endif; ?>
+				<span class="muted-3-color"><?php esc_html_e('评论于：', 'aksrt'); ?></span>
+				<a class="profile-comment-item__post-link muted-color" href="<?php echo esc_url($post_link); ?>"><?php echo esc_html($post_title); ?></a>
+			</div>
+		</div>
+	</article>
@@ -3,8 +3,8 @@
 * Public user home — comments tab panel body.
 *
 * Rendered inside the #panel-comments wrapper on the public user home and via
- * the aksrt/v1 user-home panel REST fragment. Pagination is button-driven
- * (aksrt_render_user_home_pagination) and never touches the URL.
+ * the aksrt/v1 user-home panel REST fragment. Later pages append through the
+ * existing REST route and never touch the URL.
 *
 * @package AKSRT
 */
@@ -14,26 +14,47 @@ defined('ABSPATH') || exit;
 $args = is_array($args ?? null) ? $args : [];
 extract($args, EXTR_SKIP); // phpcs:ignore WordPress.PHP.DontExtract.extract_extract

-$user_comments = get_comments([
-	'user_id'                   => $user_id,
-	'status'                    => 'approve',
-	'number'                    => $per_page,
-	'offset'                    => ($comments_page - 1) * $per_page,
+$is_own_profile = !empty($is_own_profile);
+$comments_page  = max(1, (int) $comments_page);
+$per_page       = max(1, (int) $per_page);
+$comment_offset = ($comments_page - 1) * $per_page;
+$comment_status = $is_own_profile ? 'all' : 'approve';
+$comment_args   = [
+	'user_id'                   => (int) $user_id,
+	'status'                    => $comment_status,
 	'type'                      => 'comment',
+	'post_type'                 => ['post'],
+	'orderby'                   => 'comment_date_gmt',
+	'order'                     => 'DESC',
 	'update_comment_meta_cache' => false,
-]);
+];
+$user_comments = get_comments(array_merge($comment_args, [
+	'number' => $per_page,
+	'offset' => $comment_offset,
+]));
+$comments_total = (int) get_comments(array_merge($comment_args, ['count' => true]));
+$has_more       = $comments_total > ($comment_offset + count($user_comments));

 if ($user_comments) :
 	?>
 	<div class="profile-comment-list">
 		<?php foreach ($user_comments as $c) : ?>
 			<?php
-			get_template_part('templates/parts/content', 'profile-comment-item', ['comment' => $c]);
+			get_template_part('templates/parts/content', 'profile-comment-item', [
+				'comment' => $c,
+			]);
 			?>
 		<?php endforeach; ?>
 	</div>
-	<?php
-	aksrt_render_user_home_pagination((int) ceil($comment_count / max(1, $per_page)), (int) $comments_page);
-else :
-	aksrt_render_profile_empty($svg_empty_comment, __('TA 还没有发表评论', 'aksrt'));
-endif;
+	<?php if ($has_more) : ?>
+		<div class="profile-comment-more text-center theme-pagination ajax-pag">
+			<div class="next-page ajax-next">
+				<button type="button" data-uh-comments-next="<?php echo esc_attr((string) ($comments_page + 1)); ?>">
+					<?php esc_html_e('加载更多', 'aksrt'); ?>
+				</button>
+			</div>
+		</div>
+	<?php endif; ?>
+<?php else : ?>
+	<?php aksrt_render_profile_empty($svg_empty_comment, __('TA 还没有发表评论', 'aksrt')); ?>
+<?php endif; ?>