Merge pull request 'feat(messages): 消息中心前台 1:1 导航/门控/资源加载' (#71) from worktree-messages-frontend-1to1 into main

Reviewed-on: CYL/wordpress-theme-aksrt#71

assets/css/frontend/messages.css

@@ -578,3 +578,42 @@ html.dark .aksrt-pm__item.is-unread,
 html.dark .aksrt-pm__item.is-unread {
     background: rgba(240, 68, 148, 0.08);
 }
+
+
+/* Page header */
+.messages-center__header {
+    margin: 8px 0 16px;
+}
+.messages-center__title {
+    margin: 0 0 6px;
+    font-size: 22px;
+    font-weight: 700;
+    color: var(--color-ink, #1f2937);
+}
+.messages-center__subtitle {
+    margin: 0;
+    font-size: 14px;
+    color: var(--color-ink-3, #6b7280);
+}
+
+.messages-center--disabled {
+    display: block;
+    min-height: 40vh;
+}
+
+/* PM thread uses hidden attribute instead of inline style */
+.aksrt-pm__thread[hidden] {
+    display: none !important;
+}
+
+.message-item__new-badge {
+    display: inline-block;
+    margin-left: 6px;
+    padding: 1px 6px;
+    border-radius: 999px;
+    background: var(--color-primary, #3b82f6);
+    color: #fff;
+    font-size: 11px;
+    font-weight: 600;
+    vertical-align: middle;
+}

assets/js/conversation.js

@@ -58,7 +58,7 @@
   // Back button
   if (backBtn) {
     backBtn.addEventListener('click', function () {
-      threadView.style.display = 'none';
+      threadView.hidden = true;
       listView.style.display = '';
     });
   }
@@ -99,7 +99,7 @@
     }).then(function (d) {
       if (d.success && d.data) {
         renderMessages(d.data.messages || []);
-        listView.style.display = 'none';
+        listView.hidden = true;
         threadView.style.display = '';
 
         // Mark as read

inc/classes/scripts-traits/trait-aksrt-scripts-part-1b.php

@@ -341,6 +341,39 @@ trait AKSRT_Scripts_Part_1b {
             );
         }
 
+        // 消息中心页
+        if (is_page_template('templates/pages/page-messages.php')) {
+            $messages_css = get_template_directory() . '/assets/css/frontend/messages.css';
+            if (file_exists($messages_css)) {
+                wp_enqueue_style(
+                    'aksrt-messages',
+                    $base_uri . '/assets/css/frontend/messages.css',
+                    ['aksrt-tokens'],
+                    (string) filemtime($messages_css)
+                );
+            }
+            $messages_js = get_template_directory() . '/assets/js/messages.js';
+            if (file_exists($messages_js)) {
+                wp_enqueue_script(
+                    'aksrt-messages',
+                    $base_uri . '/assets/js/messages.js',
+                    ['aksrt-script'],
+                    (string) filemtime($messages_js),
+                    true
+                );
+            }
+            $conversation_js = get_template_directory() . '/assets/js/conversation.js';
+            if (file_exists($conversation_js)) {
+                wp_enqueue_script(
+                    'aksrt-conversation',
+                    $base_uri . '/assets/js/conversation.js',
+                    ['aksrt-script'],
+                    (string) filemtime($conversation_js),
+                    true
+                );
+            }
+        }
+
         // Forum pages (home / plate / board tax / tag / topic / compose / plate-cat)
         $is_forum_surface = is_page_template('templates/pages/page-forums.php')
             || is_page_template('templates/forum/forum-compose.php')

templates/pages/page-messages.php

@@ -4,6 +4,7 @@
  * Template Post Type: page
  *
  * 独立消息中心页面 — 两栏布局（左侧导航 + 右侧消息列表）
+ * 对齐 Zibll msg-center：未读 / 评论 / 系统 / 私信（可开关）
  *
  * @package AKSRT
  */
@@ -18,26 +19,73 @@ if ( ! is_user_logged_in() ) {
 	exit;
 }
 
+$messages_enabled = !class_exists('AKSRT_Settings') || AKSRT_Settings::message_enabled();
+$pm_settings = class_exists('AKSRT_Settings') ? AKSRT_Settings::private_message_settings() : ['enabled' => false];
+$pm_enabled = !empty($pm_settings['enabled']);
+
+if (!$messages_enabled) :
+	?>
+	<main id="main-content" class="site-main content-shell" tabindex="-1">
+		<div class="container messages-center messages-center--disabled">
+			<div class="messages-empty">
+				<span class="messages-empty__icon"><i class="fas fa-bell-slash"></i></span>
+				<p class="messages-empty__text"><?php esc_html_e('站内消息功能未开启', 'aksrt'); ?></p>
+				<p class="messages-empty__hint"><?php esc_html_e('请联系管理员在后台「用户 → 消息通知」中启用。', 'aksrt'); ?></p>
+			</div>
+		</div>
+	</main>
+	<?php
+	get_footer();
+	return;
+endif;
+
 $user_id = get_current_user_id();
 
-// 获取所有通知（持久化 + 即时状态）
 $all_notifications = function_exists('aksrt_get_user_all_notifications')
 	? aksrt_get_user_all_notifications($user_id)
 	: [];
 
-// 筛选类型
+$current_type = isset($_GET['msg_type']) ? sanitize_key(wp_unslash((string) $_GET['msg_type'])) : 'unread';
-$current_type = isset( $_GET['msg_type'] ) ? sanitize_key( $_GET['msg_type'] ) : 'all';
+
+// 类型分组：对齐 Zibll 主 tab 语义，同时兼容历史 type 键。
+$type_groups = [
+	'unread' => null, // special: !read
+	'all'    => null, // special: all
+	'comment' => ['comment_reply', 'comment_approved', 'pending_comments'],
+	'credits' => ['credits_added', 'credits_deducted'],
+	'system'  => ['notice', 'download_ready', 'upload_moderation', 'verify_email'],
+	'conversation' => ['conversation'],
+];
+
+if ($current_type === 'conversation' && !$pm_enabled) {
+	$current_type = 'unread';
+}
+
+$allowed_types = array_keys($type_groups);
+if (!in_array($current_type, $allowed_types, true)) {
+	// 兼容旧 URL：msg_type=comment_reply 等
+	$mapped = 'all';
+	foreach ($type_groups as $group => $types) {
+		if (is_array($types) && in_array($current_type, $types, true)) {
+			$mapped = $group;
+			break;
+		}
+	}
+	$current_type = $mapped;
+}
 
-// 按类型过滤
 $filtered = $all_notifications;
 if ($current_type === 'unread') {
 	$filtered = array_filter($filtered, static fn($n) => empty($n['read']));
-} elseif ( $current_type !== 'all' ) {
+} elseif ($current_type !== 'all' && $current_type !== 'conversation') {
-	$filtered = array_filter( $filtered, static fn( $n ) => ( $n['type'] ?? '' ) === $current_type );
+	$types = $type_groups[$current_type] ?? [];
+	$filtered = array_filter($filtered, static function ($n) use ($types) {
+		$t = (string) ($n['type'] ?? 'notice');
+		return in_array($t, $types, true);
+	});
 }
 $filtered = array_values($filtered);
 
-// 分页
 $per_page     = 20;
 $current_page = max(1, (int) ($_GET['msg_page'] ?? 1));
 $total        = count($filtered);
@@ -45,31 +93,49 @@ $total_pages  = max( 1, (int) ceil( $total / $per_page ) );
 $offset       = ($current_page - 1) * $per_page;
 $paged_items  = array_slice($filtered, $offset, $per_page);
 
-// 统计各类型数量
+// 统计
-$type_counts = [ 'all' => count( $all_notifications ), 'unread' => 0 ];
+$type_counts = [
+	'all'    => count($all_notifications),
+	'unread' => 0,
+	'comment'=> 0,
+	'credits'=> 0,
+	'system' => 0,
+	'conversation' => 0,
+];
 foreach ($all_notifications as $n) {
-	$t = $n['type'] ?? 'notice';
+	$t = (string) ($n['type'] ?? 'notice');
-	$type_counts[ $t ] = ( $type_counts[ $t ] ?? 0 ) + 1;
 	if (empty($n['read'])) {
 		$type_counts['unread']++;
 	}
+	foreach (['comment', 'credits', 'system', 'conversation'] as $group) {
+		if (in_array($t, $type_groups[$group], true)) {
+			$type_counts[$group]++;
+		}
+	}
 }
 
-// 导航定义
+if ($pm_enabled && class_exists('AKSRT_Private_Message')) {
+	// conversation count prefers live PM conversations when available
+	$pm_tmp = AKSRT_Private_Message::get_instance();
+	if (method_exists($pm_tmp, 'get_conversations')) {
+		$convs = $pm_tmp->get_conversations($user_id, 100);
+		if (is_array($convs)) {
+			$type_counts['conversation'] = count($convs);
+		}
+	}
+}
+
 $nav_items = [
+	'unread'  => __('未读消息', 'aksrt'),
 	'all'     => __('全部消息', 'aksrt'),
-	'unread'           => __( '未读', 'aksrt' ),
+	'comment' => __('评论互动', 'aksrt'),
-	'conversation'     => __( '私信', 'aksrt' ),
+	'credits' => __('积分动态', 'aksrt'),
-	'comment_reply'    => __( '评论回复', 'aksrt' ),
+	'system'  => __('系统通知', 'aksrt'),
-	'comment_approved' => __( '评论审核', 'aksrt' ),
-	'credits_added'    => __( '积分增加', 'aksrt' ),
-	'credits_deducted' => __( '积分扣减', 'aksrt' ),
-	'download_ready'   => __( '下载就绪', 'aksrt' ),
-	'upload_moderation'=> __( '图片审核', 'aksrt' ),
-	'notice'           => __( '系统通知', 'aksrt' ),
 ];
+if ($pm_enabled) {
+	$nav_items['conversation'] = __('私信消息', 'aksrt');
+}
 
-// 图标映射
 $icon_map = [
 	'comment_reply'     => 'fas fa-comment-dots',
 	'comment_approved'  => 'fas fa-check-circle',
@@ -82,18 +148,36 @@ $icon_map = [
 	'conversation'      => 'fas fa-envelope',
 	'notice'            => 'fas fa-bell',
 ];
+
+$messages_base = function_exists('aksrt_get_messages_page_url') ? aksrt_get_messages_page_url() : get_permalink();
+if (!$messages_base) {
+	$messages_base = get_permalink();
+}
 ?>
 
-<div class="messages-center container">
+<main id="main-content" class="site-main content-shell" tabindex="-1">
-	<aside class="messages-center__nav">
+	<?php if (function_exists('aksrt_breadcrumbs')) { aksrt_breadcrumbs(); } ?>
+
+	<div class="container">
+		<header class="messages-center__header">
+			<h1 class="messages-center__title"><?php esc_html_e('消息中心', 'aksrt'); ?></h1>
+			<p class="messages-center__subtitle"><?php esc_html_e('查看站内通知与互动提醒', 'aksrt'); ?></p>
+		</header>
+
+		<div class="messages-center">
+			<aside class="messages-center__nav" aria-label="<?php esc_attr_e('消息分类', 'aksrt'); ?>">
 				<ul class="messages-nav__list">
 					<?php foreach ($nav_items as $key => $label) :
 						$count = (int) ($type_counts[$key] ?? 0);
-				if ( $key !== 'all' && $key !== 'unread' && $count < 1 ) continue;
+						// 始终显示核心 tab；其余无数据时可隐藏（保留 unread/all/system）
+						if (!in_array($key, ['unread', 'all', 'system', 'conversation'], true) && $count < 1) {
+							continue;
+						}
 						$is_active = $current_type === $key;
+						$tab_url = add_query_arg(['msg_type' => $key, 'msg_page' => 1], $messages_base);
 						?>
 						<li>
-					<a href="<?php echo esc_url( add_query_arg( [ 'msg_type' => $key, 'msg_page' => 1 ] ) ); ?>"
+							<a href="<?php echo esc_url($tab_url); ?>"
 							   class="messages-nav__item<?php echo $is_active ? ' is-active' : ''; ?>"
 							   data-type="<?php echo esc_attr($key); ?>">
 								<span><?php echo esc_html($label); ?></span>
@@ -110,11 +194,13 @@ $icon_map = [
 				</div>
 			</aside>
 
-	<main class="messages-center__content">
+			<section class="messages-center__content">
-		<?php if ( $current_type === 'conversation' ) :
+				<?php if ($current_type === 'conversation' && $pm_enabled) :
 					$pm = class_exists('AKSRT_Private_Message') ? AKSRT_Private_Message::get_instance() : null;
 					$conversations = $pm ? $pm->get_conversations($user_id, 30) : [];
 					$pm_nonce = wp_create_nonce('aksrt_pm');
+					$pm_placeholder = (string) ($pm_settings['placeholder'] ?? __('请输入消息...', 'aksrt'));
+					$pm_submit = (string) ($pm_settings['submit_text'] ?? __('发送', 'aksrt'));
 					?>
 					<div class="messages-conversations" id="aksrt-pm-conversations"
 						 data-ajax="<?php echo esc_url(admin_url('admin-ajax.php')); ?>"
@@ -122,20 +208,20 @@ $icon_map = [
 						<?php if (!empty($conversations)) : ?>
 							<div class="aksrt-pm__list">
 								<?php foreach ($conversations as $conv) : ?>
-							<div class="aksrt-pm__item<?php echo $conv['unread'] > 0 ? ' is-unread' : ''; ?>"
+									<div class="aksrt-pm__item<?php echo !empty($conv['unread']) ? ' is-unread' : ''; ?>"
-								 data-conv-id="<?php echo esc_attr( (string) $conv['id'] ); ?>"
+										 data-conv-id="<?php echo esc_attr((string) ($conv['id'] ?? '')); ?>"
-								 data-other-id="<?php echo esc_attr( (string) $conv['other_user_id'] ); ?>">
+										 data-other-id="<?php echo esc_attr((string) ($conv['other_user_id'] ?? '')); ?>">
-								<img class="aksrt-pm__avatar" src="<?php echo esc_url( $conv['other_avatar'] ); ?>" alt=""<?php echo function_exists('aksrt_lazy_loading') ? aksrt_lazy_loading('avatar') : ' loading="lazy"'; ?> />
+										<img class="aksrt-pm__avatar" src="<?php echo esc_url((string) ($conv['other_avatar'] ?? '')); ?>" alt=""<?php echo function_exists('aksrt_lazy_loading') ? aksrt_lazy_loading('avatar') : ' loading="lazy"'; ?> />
 										<div class="aksrt-pm__info">
 											<div class="aksrt-pm__name">
-										<?php echo esc_html( $conv['other_name'] ); ?>
+												<?php echo esc_html((string) ($conv['other_name'] ?? '')); ?>
-										<?php if ( $conv['unread'] > 0 ) : ?>
+												<?php if (!empty($conv['unread'])) : ?>
 													<span class="aksrt-pm__badge"><?php echo esc_html((string) $conv['unread']); ?></span>
 												<?php endif; ?>
 											</div>
-									<div class="aksrt-pm__preview"><?php echo esc_html( mb_substr( $conv['last_message'], 0, 50 ) ); ?></div>
+											<div class="aksrt-pm__preview"><?php echo esc_html(mb_substr((string) ($conv['last_message'] ?? ''), 0, 50)); ?></div>
 										</div>
-								<div class="aksrt-pm__time"><?php echo esc_html( $conv['last_message_at'] ? mysql2date( 'm-d H:i', $conv['last_message_at'] ) : '' ); ?></div>
+										<div class="aksrt-pm__time"><?php echo esc_html(!empty($conv['last_message_at']) ? mysql2date('m-d H:i', (string) $conv['last_message_at']) : ''); ?></div>
 									</div>
 								<?php endforeach; ?>
 							</div>
@@ -143,24 +229,23 @@ $icon_map = [
 							<div class="messages-empty">
 								<span class="messages-empty__icon"><i class="fas fa-envelope"></i></span>
 								<p class="messages-empty__text"><?php esc_html_e('暂无私信', 'aksrt'); ?></p>
-						<p class="messages-empty__hint"><?php esc_html_e( '你可以在用户主页发起私信。', 'aksrt' ); ?></p>
+								<p class="messages-empty__hint"><?php esc_html_e('你可以在用户主页或文章作者栏发起私信。', 'aksrt'); ?></p>
 							</div>
 						<?php endif; ?>
 					</div>
 
-			<div class="aksrt-pm__thread" id="aksrt-pm-thread" style="display:none;">
+					<div class="aksrt-pm__thread" id="aksrt-pm-thread" hidden>
 						<div class="aksrt-pm__thread-header">
 							<button type="button" class="aksrt-pm__back-btn" id="aksrt-pm-back"><i class="fas fa-arrow-left"></i> <?php esc_html_e('返回', 'aksrt'); ?></button>
 							<span class="aksrt-pm__thread-name" id="aksrt-pm-thread-name"></span>
 						</div>
 						<div class="aksrt-pm__messages" id="aksrt-pm-messages"></div>
 						<div class="aksrt-pm__compose">
-					<textarea id="aksrt-pm-input" rows="2" placeholder="<?php esc_attr_e( '输入消息...', 'aksrt' ); ?>"></textarea>
+							<textarea id="aksrt-pm-input" rows="2" placeholder="<?php echo esc_attr($pm_placeholder); ?>"></textarea>
-					<button type="button" id="aksrt-pm-send" class="aksrt-pm__send-btn"><i class="fas fa-paper-plane"></i></button>
+							<button type="button" id="aksrt-pm-send" class="aksrt-pm__send-btn" aria-label="<?php echo esc_attr($pm_submit); ?>"><i class="fas fa-paper-plane"></i></button>
 						</div>
 					</div>
 
-			<?php /* conversation.js is enqueued via AKSRT_Scripts */ ?>
 				<?php elseif (!empty($paged_items)) : ?>
 					<div class="messages-list">
 						<?php foreach ($paged_items as $notice) :
@@ -177,7 +262,7 @@ $icon_map = [
 								: ($created !== '' ? get_date_from_gmt($created, 'Y-m-d H:i') : '');
 							$icon_cls = $icon_map[$n_type] ?? 'fas fa-bell';
 							?>
-					<div class="message-item<?php echo ! $is_read ? ' is-unread' : ''; ?>" data-notification-id="<?php echo esc_attr( $n_id ); ?>">
+							<article class="message-item<?php echo !$is_read ? ' is-unread' : ''; ?>" data-notification-id="<?php echo esc_attr($n_id); ?>">
 								<span class="message-item__icon">
 									<i class="<?php echo esc_attr($icon_cls); ?>" aria-hidden="true"></i>
 								</span>
@@ -185,7 +270,7 @@ $icon_map = [
 									<div class="message-item__title">
 										<?php echo esc_html($n_title); ?>
 										<?php if (!$is_read && !$is_state) : ?>
-									<span class="message-item__new-badge">NEW</span>
+											<span class="message-item__new-badge"><?php esc_html_e('新', 'aksrt'); ?></span>
 										<?php endif; ?>
 									</div>
 									<?php if ($n_desc !== '') : ?>
@@ -206,14 +291,14 @@ $icon_map = [
 										<button type="button" class="message-item__action-btn message-item__action-btn--danger js-msg-delete" data-id="<?php echo esc_attr($n_id); ?>"><?php esc_html_e('删除', 'aksrt'); ?></button>
 									<?php endif; ?>
 								</div>
-					</div>
+							</article>
 						<?php endforeach; ?>
 					</div>
 
 					<?php if ($total_pages > 1) : ?>
-				<div class="messages-pagination">
+						<nav class="messages-pagination" aria-label="<?php esc_attr_e('消息分页', 'aksrt'); ?>">
 							<?php for ($i = 1; $i <= $total_pages; $i++) :
-						$page_url = add_query_arg( [ 'msg_type' => $current_type, 'msg_page' => $i ] );
+								$page_url = add_query_arg(['msg_type' => $current_type, 'msg_page' => $i], $messages_base);
 								?>
 								<?php if ($i === $current_page) : ?>
 									<span class="profile-status-chip is-active"><?php echo esc_html((string) $i); ?></span>
@@ -221,7 +306,7 @@ $icon_map = [
 									<a href="<?php echo esc_url($page_url); ?>" class="profile-status-chip"><?php echo esc_html((string) $i); ?></a>
 								<?php endif; ?>
 							<?php endfor; ?>
-				</div>
+						</nav>
 					<?php endif; ?>
 
 				<?php else : ?>
@@ -230,7 +315,9 @@ $icon_map = [
 						<p class="messages-empty__text"><?php esc_html_e('暂无消息', 'aksrt'); ?></p>
 					</div>
 				<?php endif; ?>
-	</main>
+			</section>
 		</div>
+	</div>
+</main>
 
 <?php get_footer(); ?>

templates/parts/single-author-bar.php

@@ -63,9 +63,12 @@ $classes = trim('article-avatar ' . $extra_class . ($show_actions ? ' article-av
 					<i class="far fa-heart" aria-hidden="true"></i>
 					<span><?php esc_html_e('关注', 'aksrt'); ?></span>
 				</button>
-				<?php // 私信为“停用候选”兼容能力：默认不在前台暴露，仅在站点显式开启时显示。 ?>
+				<?php
-				<?php if (is_user_logged_in()) : ?>
+				$aksrt_pm_on = class_exists('AKSRT_Settings') && !empty(AKSRT_Settings::private_message_settings()['enabled']);
-					<a href="<?php echo esc_url(add_query_arg('msg_type', 'conversation', function_exists('aksrt_get_messages_page_url') ? aksrt_get_messages_page_url() : home_url('/'))); ?>" class="author-action-btn author-action-btn--ghost">
+				$aksrt_msg_url = function_exists('aksrt_get_messages_page_url') ? aksrt_get_messages_page_url() : '';
+				if ($aksrt_pm_on && $aksrt_msg_url !== '') :
+				?>
+					<a href="<?php echo esc_url(add_query_arg('msg_type', 'conversation', $aksrt_msg_url)); ?>" class="author-action-btn author-action-btn--ghost">
 						<i class="far fa-comment-dots" aria-hidden="true"></i>
 						<span><?php esc_html_e('私信', 'aksrt'); ?></span>
 					</a>