diff --git a/.gitignore b/.gitignore index dbb8672e..646e6f81 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ !/tests/widget-system/user-features-contract.test.cjs !/tests/widget-system/notification-preferences-contract.test.cjs !/tests/widget-system/message-center-contract.test.cjs +!/tests/widget-system/message-center-url-harness.php !/tests/widget-system/asset-ledger-contract.test.cjs !/tests/widget-system/financial-flow-contract.test.cjs !/tests/widget-system/pay-orders-filter-contract.test.cjs diff --git a/assets/css/frontend/messages.css b/assets/css/frontend/messages.css index 0113e0d5..2812865f 100644 --- a/assets/css/frontend/messages.css +++ b/assets/css/frontend/messages.css @@ -273,14 +273,6 @@ button.message-item__title:hover { border-top: 1px solid var(--color-line); } -.message-detail__primary { - padding: 8px 16px; - border-radius: 6px; - background: var(--color-primary, #3b82f6); - color: #fff; - text-decoration: none; -} - html.dark .message-detail { background: var(--surface-1); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); @@ -425,7 +417,6 @@ html.dark .message-detail { flex-direction: column; } - .message-detail__primary, .message-detail__actions .message-item__action-btn { text-align: center; } diff --git a/inc/helpers/homepage/header-components.php b/inc/helpers/homepage/header-components.php index edd79388..02588fc8 100644 --- a/inc/helpers/homepage/header-components.php +++ b/inc/helpers/homepage/header-components.php @@ -51,6 +51,9 @@ if (!function_exists('aksrt_header_slide_current_page_type')) { * explicit theme surfaces must win before the home fallback is evaluated. */ function aksrt_header_slide_current_page_type(): string { + if ((string) get_query_var('aksrt_message_view') !== '') { + return 'page'; + } if (is_author() || (function_exists('aksrt_is_user_home_page') && aksrt_is_user_home_page())) { return 'author'; } diff --git a/inc/modules/message-center.php b/inc/modules/message-center.php index c584e1c7..501e1f35 100644 --- a/inc/modules/message-center.php +++ b/inc/modules/message-center.php @@ -227,7 +227,6 @@ function aksrt_render_message_center_list(int $user_id, string $view, int $page function aksrt_render_message_center_detail(array $item, string $view): void { $type = (string) ($item['type'] ?? 'notice'); - $target_url = (string) ($item['url'] ?? ''); ?>
@@ -238,7 +237,6 @@ function aksrt_render_message_center_detail(array $item, string $view): void {
diff --git a/inc/modules/user-parts/routing.php b/inc/modules/user-parts/routing.php index 2aa0d624..2347ee74 100644 --- a/inc/modules/user-parts/routing.php +++ b/inc/modules/user-parts/routing.php @@ -74,11 +74,12 @@ add_action('template_redirect', function () { add_action('init', function () { add_rewrite_tag('%aksrt_user_center%', '([^&]+)'); - add_rewrite_tag('%aksrt_user_center_tab%', '([^/]+)'); - add_rewrite_tag('%aksrt_author_identifier%', '([^/]+)'); + add_rewrite_tag('%aksrt_user_center_tab%', '([^/]+)'); + add_rewrite_tag('%aksrt_author_identifier%', '([^/]+)'); add_rewrite_tag('%aksrt_message_view%', '(unread|posts|like|system)'); - add_rewrite_rule('^message/?$', 'index.php?aksrt_message_view=unread', 'top'); - add_rewrite_rule('^message/(posts|like|system)/?$', 'index.php?aksrt_message_view=$matches[1]', 'top'); + $message_slug = preg_quote(aksrt_get_messages_rewrite_slug(), '#'); + add_rewrite_rule('^' . $message_slug . '/?$', 'index.php?aksrt_message_view=unread', 'top'); + add_rewrite_rule('^' . $message_slug . '/(posts|like|system)/?$', 'index.php?aksrt_message_view=$matches[1]', 'top'); add_rewrite_rule('^user/([a-z0-9_-]+)/?$', 'index.php?aksrt_user_center=1&aksrt_user_center_tab=$matches[1]', 'top'); add_rewrite_rule('^author/([^/]+)/?$', 'index.php?aksrt_author_identifier=$matches[1]', 'top'); }); @@ -188,7 +189,7 @@ add_action('init', function () { } // 统一 flush 检查 — bump when user-home rewrite / author override changes - $rewrite_version = AKSRT_VERSION . ':message-routing-v1'; + $rewrite_version = AKSRT_VERSION . ':message-routing:' . aksrt_get_messages_rewrite_slug(); $flushed = get_option('aksrt_user_rules_flushed'); $rules = get_option('rewrite_rules'); $need_flush = ($flushed !== $rewrite_version) diff --git a/inc/modules/user-parts/urls.php b/inc/modules/user-parts/urls.php index 642e28d3..c83c019b 100644 --- a/inc/modules/user-parts/urls.php +++ b/inc/modules/user-parts/urls.php @@ -54,20 +54,33 @@ function aksrt_get_new_post_url(int $edit_id = 0): string { } endif; +if (!function_exists('aksrt_get_messages_rewrite_slug')) : +/** 获取消息中心当前唯一的重写别名。 */ +function aksrt_get_messages_rewrite_slug(): string { + $settings = class_exists('\AKSRT\Settings\Settings') + ? \AKSRT\Settings\Settings::notification_settings() + : []; + $slug = sanitize_key((string) ($settings['slug'] ?? 'message')); + return $slug !== '' ? $slug : 'message'; +} +endif; + if (!function_exists('aksrt_get_messages_page_url')) : /** 消息中心 URL。 */ function aksrt_get_messages_page_url(string $view = 'unread'): string { - if (class_exists('\AKSRT\Settings\Settings') && !\AKSRT\Settings\Settings::message_enabled()) { - return ''; - } - $paths = [ - 'unread' => '/message/', - 'posts' => '/message/posts/', - 'like' => '/message/like/', - 'system' => '/message/system/', + if (class_exists('\AKSRT\Settings\Settings') && !\AKSRT\Settings\Settings::message_enabled()) { + return ''; + } + $suffixes = [ + 'unread' => '', + 'posts' => 'posts', + 'like' => 'like', + 'system' => 'system', ]; $view = sanitize_key($view); - return home_url($paths[$view] ?? $paths['unread']); + $suffix = $suffixes[$view] ?? $suffixes['unread']; + $path = '/' . aksrt_get_messages_rewrite_slug() . ($suffix !== '' ? '/' . $suffix : '') . '/'; + return home_url($path); } endif; diff --git a/tests/widget-system/message-center-contract.test.cjs b/tests/widget-system/message-center-contract.test.cjs index 9705461d..bdd795ca 100644 --- a/tests/widget-system/message-center-contract.test.cjs +++ b/tests/widget-system/message-center-contract.test.cjs @@ -1,32 +1,50 @@ const assert = require('node:assert/strict'); const fs = require('node:fs'); const path = require('node:path'); +const { spawnSync } = require('node:child_process'); const test = require('node:test'); const root = path.resolve(__dirname, '..', '..'); const read = (file) => fs.readFileSync(path.join(root, file), 'utf8'); -test('message center exposes only the four canonical parameter-free routes', () => { +test('message center exposes only the four configured-alias parameter-free routes', () => { const routing = read('inc/modules/user-parts/routing.php'); const urls = read('inc/modules/user-parts/urls.php'); const registry = read('inc/modules/user-parts/template-registry.php'); - assert.match(routing, /add_rewrite_rule\('\^message\/\?\$',[\s\S]*?aksrt_message_view=unread/); - assert.match(routing, /add_rewrite_rule\('\^message\/\(posts\|like\|system\)\/\?\$'/); + assert.match(urls, /function aksrt_get_messages_rewrite_slug[\s\S]*?Settings::notification_settings\(\)[\s\S]*?\['slug'\]/); + assert.match(routing, /\$message_slug = preg_quote\(aksrt_get_messages_rewrite_slug\(\), '#'\)/); + assert.match(routing, /add_rewrite_rule\('\^' \. \$message_slug \. '\/\?\$',[\s\S]*?aksrt_message_view=unread/); + assert.match(routing, /add_rewrite_rule\('\^' \. \$message_slug \. '\/\(posts\|like\|system\)\/\?\$'/); + assert.match(routing, /message-routing:' \. aksrt_get_messages_rewrite_slug\(\)/); + assert.doesNotMatch(routing, /add_rewrite_rule\('\^message/); assert.doesNotMatch(routing, /message\/\(\[0-9]|aksrt_message_id/); - for (const route of ['/message/', '/message/posts/', '/message/like/', '/message/system/']) { - assert.ok(urls.includes(route), `${route} should be canonical`); - } const messageUrlFunction = urls.slice( urls.indexOf('function aksrt_get_messages_page_url'), urls.indexOf('endif;', urls.indexOf('function aksrt_get_messages_page_url')), ); - assert.doesNotMatch(messageUrlFunction, /add_query_arg|\/messages\//); + assert.match(messageUrlFunction, /aksrt_get_messages_rewrite_slug\(\)/); + assert.doesNotMatch(messageUrlFunction, /add_query_arg|\/messages\/|\/message\//); assert.doesNotMatch(registry, /'messages'\s*=>/); assert.match(registry, /page-messages\.php'\)\s*\{[\s\S]*?return ''/); assert.match(routing, /get_page_template_slug[\s\S]*?page-messages\.php[\s\S]*?set_404/); }); +test('message center URL helper builds every view from the configured alias', () => { + const result = spawnSync(process.env.PHP_BINARY || 'php', [path.join(__dirname, 'message-center-url-harness.php')], { + cwd: root, + encoding: 'utf8', + }); + assert.equal(result.status, 0, result.stderr || result.stdout); + assert.deepEqual(JSON.parse(result.stdout), { + slug: 'inbox-center', + unread: 'https://example.test/inbox-center/', + posts: 'https://example.test/inbox-center/posts/', + like: 'https://example.test/inbox-center/like/', + system: 'https://example.test/inbox-center/system/', + }); +}); + test('tabs, pagination, actions, and detail all replace DOM fragments', () => { const center = read('inc/modules/message-center.php'); const script = read('assets/js/messages.js'); @@ -46,6 +64,16 @@ test('tabs, pagination, actions, and detail all replace DOM fragments', () => { assert.doesNotMatch(script, /pushState\([^\n]+detail/); }); +test('message detail does not expose a related-content button or target link', () => { + const center = read('inc/modules/message-center.php'); + const detailStart = center.indexOf('function aksrt_render_message_center_detail'); + const detailEnd = center.indexOf("add_action('wp_ajax_aksrt_load_message_center'", detailStart); + const detail = center.slice(detailStart, detailEnd); + + assert.doesNotMatch(detail, /查看相关内容|message-detail__primary|target_url|\['url'\]/); + assert.doesNotMatch(detail, / { const notifications = read('inc/modules/user-notifications.php'); const settings = read('src/Settings/Integration.php'); diff --git a/tests/widget-system/message-center-url-harness.php b/tests/widget-system/message-center-url-harness.php new file mode 100644 index 00000000..91101fb9 --- /dev/null +++ b/tests/widget-system/message-center-url-harness.php @@ -0,0 +1,42 @@ + 'inbox-center']; + } + + public static function message_enabled(): bool { + return true; + } + } +} + +namespace { + require_once dirname(__DIR__, 2) . '/inc/modules/user-parts/urls.php'; + + echo json_encode([ + 'slug' => aksrt_get_messages_rewrite_slug(), + 'unread' => aksrt_get_messages_page_url(), + 'posts' => aksrt_get_messages_page_url('posts'), + 'like' => aksrt_get_messages_page_url('like'), + 'system' => aksrt_get_messages_page_url('system'), + ], JSON_UNESCAPED_SLASHES); +} diff --git a/tests/widget-system/page-display-contract.test.cjs b/tests/widget-system/page-display-contract.test.cjs index 1f3cdbc2..ee38373d 100644 --- a/tests/widget-system/page-display-contract.test.cjs +++ b/tests/widget-system/page-display-contract.test.cjs @@ -369,6 +369,8 @@ test('save contract rejects invalid input and round-trips canonical nested value templated_public_user_home: true, templated_user_center: true, home_excludes_page: false, + message_uses_other_page: true, + message_excludes_home: false, home_excludes_public_home: false, home_excludes_user_center: false, }) diff --git a/tests/widget-system/page-display-save-harness.php b/tests/widget-system/page-display-save-harness.php index 84bc9416..cf7629cf 100644 --- a/tests/widget-system/page-display-save-harness.php +++ b/tests/widget-system/page-display-save-harness.php @@ -77,6 +77,13 @@ namespace { return array_key_exists($key, $GLOBALS['aksrt_test_options']) ? $GLOBALS['aksrt_test_options'][$key] : $default; } + function get_query_var(string $key) { + if ($key === 'aksrt_message_view' && $GLOBALS['aksrt_visibility_query'] === 'message') { + return 'unread'; + } + return ''; + } + function update_option($key, $value): bool { $GLOBALS['aksrt_test_options'][$key] = $value; return true; @@ -92,7 +99,7 @@ namespace { // Custom rewrites can leave WordPress's posts-page flag set even though // the theme resolves the request to another front-end surface. return in_array($GLOBALS['aksrt_visibility_query'], [ - 'home', 'page', 'user_home', 'user_center', 'user_home_page', 'user_center_page', + 'home', 'page', 'message', 'user_home', 'user_center', 'user_home_page', 'user_center_page', ], true); } function is_front_page(): bool { return $GLOBALS['aksrt_visibility_query'] === 'home'; } @@ -233,6 +240,8 @@ namespace { 'templated_public_user_home' => aksrt_visibility_case('user_home_page', ['user_home']), 'templated_user_center' => aksrt_visibility_case('user_center_page', ['user_center']), 'home_excludes_page' => aksrt_visibility_case('page', ['home']), + 'message_uses_other_page' => aksrt_visibility_case('message', ['page']), + 'message_excludes_home' => aksrt_visibility_case('message', ['home']), 'home_excludes_public_home' => aksrt_visibility_case('user_home', ['home']), 'home_excludes_user_center' => aksrt_visibility_case('user_center', ['home']), ];