';
- $html .= '
';
- $html .= '
 . ')
';
- $html .= '
' . esc_html(sprintf(__('%s的徽章', 'aksrt'), $display));
- if ($wear !== '') {
- $map = self::get_dictionary_map();
- if (isset($map[$wear])) {
- $html .= '
' . esc_html(sprintf(__('佩戴：%s', 'aksrt'), (string) $map[$wear]['label'])) . '';
+ // Head slot: worn medal icon with tooltip, or an empty-state tag (zibll).
+ $wear_slot = '';
+ if ($wear !== '' && isset($map[$wear])) {
+ $wear_label = (string) ($map[$wear]['label'] ?? $wear);
+ $wear_icon = (string) ($map[$wear]['icon_url'] ?? '');
+ if ($wear_icon !== '') {
+ $wear_slot = '
 . ' "' . esc_attr(sprintf(__('当前佩戴：%s', 'aksrt'), $wear_label)) . '")
';
}
- } else {
- $html .= '
' . esc_html__('暂无徽章', 'aksrt') . '';
+ } elseif ((int) ($data['count'] ?? 0) === 0) {
+ $wear_slot = '
' . esc_html__('暂无徽章', 'aksrt') . '';
}
- $html .= '
';
+
+ $html = '
';
$html .= '
';
+ $html .= '
';
+ $html .= '
 $avatar) . ')
';
+ $html .= '
' . esc_html(sprintf(__('%s的徽章', 'aksrt'), $display)) . '' . $wear_slot . '
';
$html .= '
';
- $html .= '
';
+ $html .= '
';
+
+ // Footer: quick jump to my own badges while browsing someone else (zibll).
+ if (!$is_self && $current > 0) {
+ $my_url = add_query_arg(['action' => 'aksrt_user_badge_info_modal', 'id' => $current], admin_url('admin-ajax.php'));
+ $html .= '
';
+ }
+
+ $html .= '
';
return $html;
}
/**
- * Single badge card modal.
+ * Single medal card inside the list grid; deep-links to the detail modal.
+ *
+ * @param array{slug?:string,label?:string,icon_url?:string,owned?:bool,wear?:bool} $item
+ */
+ protected static function render_card_link(int $user_id, array $item): string {
+ $slug = (string) ($item['slug'] ?? '');
+ $label = (string) ($item['label'] ?? $slug);
+ $icon = (string) ($item['icon_url'] ?? '');
+ $owned = !empty($item['owned']);
+ $wear = !empty($item['wear']);
+ if ($slug === '') {
+ return '';
+ }
+
+ $icon_html = $icon !== ''
+ ? '
 . ')
'
+ : '
';
+
+ $card = '
';
+ $card .= $icon_html;
+ $card .= '
' . esc_html($label) . '
';
+ if ($wear) {
+ $card .= '
' . esc_html__('佩戴中', 'aksrt') . '
';
+ }
+ $card .= '
';
+
+ $url = add_query_arg(
+ ['action' => 'aksrt_single_badge_info_modal', 'name' => $slug, 'user_id' => $user_id],
+ admin_url('admin-ajax.php')
+ );
+
+ return '
' . $card . '';
+ }
+
+ /**
+ * Single badge detail modal (zibll zib_get_single_medal_info_modal parity).
+ *
+ * medal-background.svg backdrop + large icon + name + desc + obtain time,
+ * with wear action for the owner and a back link into the list modal.
*/
public static function render_single_modal_html(string $slug, int $user_id = 0): string {
- $map = self::get_dictionary_map();
+ $map = self::get_dictionary_map();
$slug = sanitize_key($slug);
if ($slug === '' || !isset($map[$slug])) {
- return '
' . esc_html__('徽章不存在', 'aksrt') . '
';
+ return '
' . esc_html__('徽章不存在', 'aksrt') . '
';
}
- $item = $map[$slug];
- $current = get_current_user_id();
- $is_self = $user_id > 0 && $current === $user_id;
- $owned = $user_id > 0 ? self::get_owned($user_id) : [];
- $has = in_array($slug, $owned, true);
- $wear = $user_id > 0 ? self::get_wear($user_id) : '';
- $is_wear = $has && $wear === $slug;
+ $item = $map[$slug];
+ $current = get_current_user_id();
+ $is_self = $user_id > 0 && $current === $user_id;
+ $owned_map = $user_id > 0 ? self::get_owned_map($user_id) : [];
+ $has = isset($owned_map[$slug]);
+ $is_wear = $has && self::get_wear($user_id) === $slug;
- $html = '
';
- $html .= '
';
- $html .= '
';
- if (!empty($item['icon_url'])) {
- $html .= '
 $item['icon_url']) . ')
';
- } else {
- $html .= '
';
- }
- $html .= '
' . esc_html((string) $item['label']) . '
';
+ $label = (string) ($item['label'] ?? $slug);
+ $desc = (string) ($item['desc'] ?? '');
+ $icon = (string) ($item['icon_url'] ?? '');
+ $bg = get_template_directory_uri() . '/assets/img/medal/medal-background.svg';
+
+ $icon_html = $icon !== ''
+ ? '
'
+ : '
';
+
+ // Obtain state line (self only, zibll).
+ $state = '';
if ($is_self) {
- $html .= $has
- ? '
' . esc_html__('已获得', 'aksrt') . '
'
- : '
' . esc_html__('暂未获得', 'aksrt') . '
';
+ $state = $has
+ ? '
' . esc_html(sprintf(__('%s 获得', 'aksrt'), (string) $owned_map[$slug])) . '
'
+ : '
' . esc_html__('暂未获得', 'aksrt') . '
';
}
- $html .= '
';
+
+ $html = '
';
+ $html .= '
';
+ $html .= '
';
+ $html .= '
';
+ $html .= '
' . $icon_html;
+ $html .= '
' . esc_html($label) . '
';
+ if ($desc !== '') {
+ $html .= '
' . esc_html($desc) . '
';
+ }
+ $html .= $state . '
';
+
if ($is_self && $has && !$is_wear) {
- $html .= '
';
+ $html .= '
';
} elseif ($is_self && $is_wear) {
- $html .= '
' . esc_html__('当前佩戴此徽章', 'aksrt') . '
';
+ $html .= '
' . esc_html__('当前佩戴此徽章', 'aksrt') . '
';
}
+
+ // Back to the full badge list modal.
+ if ($user_id > 0) {
+ $back_url = add_query_arg(['action' => 'aksrt_user_badge_info_modal', 'id' => $user_id], admin_url('admin-ajax.php'));
+ $html .= '
' . esc_html__('返回徽章列表', 'aksrt') . '';
+ }
+
$html .= '
';
return $html;
}
@@ -300,7 +371,7 @@ class Badges {
}
/**
- * @return list
+ * @return list
*/
public static function get_dictionary(): array {
if (!class_exists('\AKSRT\Settings\Settings')) {
@@ -318,6 +389,7 @@ class Badges {
'slug' => $slug,
'label' => (string) ($item['label'] ?? $slug),
'tone' => (string) ($item['tone'] ?? 'neutral'),
+ 'desc' => (string) ($item['desc'] ?? ''),
'icon_url' => (string) ($item['icon_url'] ?? ''),
];
}
@@ -325,7 +397,7 @@ class Badges {
}
/**
- * @return array
+ * @return array
*/
public static function get_dictionary_map(): array {
$map = [];
@@ -336,48 +408,64 @@ class Badges {
}
/**
- * @return list
+ * Owned badge map: slug => grant time (`Y-m-d H:i:s`), newest first.
+ *
+ * @return array
*/
- public static function get_owned(int $user_id): array {
+ public static function get_owned_map(int $user_id): array {
if ($user_id <= 0) {
return [];
}
$raw = get_user_meta($user_id, self::META_OWNED, true);
if (!is_array($raw)) {
- $raw = preg_split('/[\s,]+/', (string) $raw, -1, PREG_SPLIT_NO_EMPTY);
+ return [];
}
$map = self::get_dictionary_map();
$out = [];
- foreach ((array) $raw as $slug) {
+ foreach ($raw as $slug => $time) {
$slug = sanitize_key((string) $slug);
if ($slug === '' || !isset($map[$slug])) {
continue;
}
- $out[] = $slug;
+ $out[$slug] = is_string($time) ? $time : '';
}
- return array_values(array_unique($out));
+ return $out;
}
/**
+ * Owned badge slugs, newest first.
+ *
+ * @return list
+ */
+ public static function get_owned(int $user_id): array {
+ return array_keys(self::get_owned_map($user_id));
+ }
+
+ /**
+ * Replace the owned set; existing slugs keep their grant time, new slugs
+ * are stamped with the current time. Order follows the input list.
+ *
* @param list $slugs
*/
public static function set_owned(int $user_id, array $slugs): void {
if ($user_id <= 0) {
return;
}
- $map = self::get_dictionary_map();
- $clean = [];
+ $map = self::get_dictionary_map();
+ $existing = self::get_owned_map($user_id);
+ $now = current_time('Y-m-d H:i:s');
+ $clean = [];
foreach ($slugs as $slug) {
$slug = sanitize_key((string) $slug);
- if ($slug !== '' && isset($map[$slug])) {
- $clean[] = $slug;
+ if ($slug === '' || !isset($map[$slug]) || isset($clean[$slug])) {
+ continue;
}
+ $clean[$slug] = $existing[$slug] ?? $now;
}
- $clean = array_values(array_unique($clean));
update_user_meta($user_id, self::META_OWNED, $clean);
$wear = self::get_wear($user_id);
- if ($wear !== '' && !in_array($wear, $clean, true)) {
+ if ($wear !== '' && !isset($clean[$wear])) {
delete_user_meta($user_id, self::META_WEAR);
}
}
@@ -441,8 +529,8 @@ class Badges {
if (in_array($slug, $owned, true)) {
return true;
}
- $owned[] = $slug;
- self::set_owned($user_id, $owned);
+ // Newest first (zibll medal ordering); grant time stamped by set_owned.
+ self::set_owned($user_id, array_merge([$slug], $owned));
/**
* Fires after a badge is granted.
*
@@ -491,54 +579,98 @@ class Badges {
}
/**
- * Public DTO for REST / modals.
+ * Public DTO for REST / modals: catalog grouped by category with per-item
+ * ownership state. Unearned badges are only exposed to the owner (or to
+ * managers via $include_private), matching zibll visibility rules.
*
- * @return array{enabled:bool,public_display:bool,wear:string,items:list}
+ * @return array{enabled:bool,public_display:bool,is_self:bool,can_wear:bool,user_id:int,wear:string,count:int,show_unearned:bool,categories:list}>}
*/
public static function list_for_user(int $user_id, bool $include_private = false): array {
$enabled = self::enabled();
$public = self::public_display();
$viewer = get_current_user_id();
+ $is_self = $viewer > 0 && $viewer === $user_id;
$can_see = $include_private
|| $public
- || ($viewer > 0 && $viewer === $user_id)
+ || $is_self
|| self::can_manually_set($viewer);
if (!$enabled || !$can_see || $user_id <= 0) {
return [
'enabled' => $enabled,
'public_display' => $public,
+ 'is_self' => $is_self,
+ 'can_wear' => $is_self,
+ 'user_id' => $user_id,
'wear' => '',
- 'items' => [],
+ 'count' => 0,
+ 'show_unearned' => false,
+ 'categories' => [],
];
}
- $map = self::get_dictionary_map();
- $owned = self::get_owned($user_id);
- $wear = self::get_wear($user_id);
- // Prefer worn first (Zibll).
- if ($wear !== '') {
- $owned = array_values(array_unique(array_merge([$wear], $owned)));
- }
- $items = [];
- foreach ($owned as $slug) {
- if (!isset($map[$slug])) {
+ $settings = \AKSRT\Settings\Settings::get_user_identity_settings();
+ $medal = is_array($settings['medal'] ?? null) ? $settings['medal'] : [];
+ $catalog = is_array($medal['categories'] ?? null) ? $medal['categories'] : [];
+
+ $owned_map = self::get_owned_map($user_id);
+ $wear = self::get_wear($user_id);
+ $show_unearned = $include_private || $is_self || self::can_manually_set($viewer);
+
+ $categories = [];
+ foreach ($catalog as $cat) {
+ $cat_name = (string) ($cat['cat_name'] ?? '');
+ $rows = is_array($cat['items'] ?? null) ? $cat['items'] : [];
+ $has_rows = [];
+ $no_rows = [];
+ foreach ($rows as $row) {
+ if (!is_array($row)) {
+ continue;
+ }
+ $slug = sanitize_key((string) ($row['slug'] ?? ''));
+ if ($slug === '') {
+ continue;
+ }
+ $has = isset($owned_map[$slug]);
+ if (!$has && !$show_unearned) {
+ continue;
+ }
+ $item = [
+ 'slug' => $slug,
+ 'label' => (string) ($row['name'] ?? $slug),
+ 'desc' => (string) ($row['desc'] ?? ''),
+ 'icon_url' => (string) ($row['icon'] ?? ''),
+ 'owned' => $has,
+ 'wear' => $has && $slug === $wear,
+ 'time' => $has ? (string) $owned_map[$slug] : '',
+ ];
+ // Owned first within each category (zibll is-has / no-has order).
+ if ($has) {
+ $has_rows[] = $item;
+ } else {
+ $no_rows[] = $item;
+ }
+ }
+ $items = array_merge($has_rows, $no_rows);
+ if (!$items) {
continue;
}
- $items[] = [
- 'slug' => $slug,
- 'label' => $map[$slug]['label'],
- 'tone' => $map[$slug]['tone'],
- 'icon_url' => $map[$slug]['icon_url'],
- 'wear' => ($slug === $wear),
+ $categories[] = [
+ 'cat_name' => $cat_name,
+ 'items' => $items,
];
}
return [
'enabled' => true,
'public_display' => $public,
+ 'is_self' => $is_self,
+ 'can_wear' => $is_self,
+ 'user_id' => $user_id,
'wear' => $wear,
- 'items' => $items,
+ 'count' => count($owned_map),
+ 'show_unearned' => $show_unearned,
+ 'categories' => $categories,
];
}
diff --git a/src/User/Home.php b/src/User/Home.php
index 42fae765..db7bec43 100644
--- a/src/User/Home.php
+++ b/src/User/Home.php
@@ -166,20 +166,30 @@ class Home {
if (class_exists('AKSRT\\User\\Badges')) {
$list = Badges::list_for_user($user_id, true);
$badge_count = 0;
- foreach ((array) ($list['items'] ?? []) as $item) {
- if ($badge_count >= $limit) {
+ $done = false;
+ foreach ((array) ($list['categories'] ?? []) as $cat) {
+ foreach ((array) ($cat['items'] ?? []) as $item) {
+ if (empty($item['owned'])) {
+ continue;
+ }
+ if ($badge_count >= $limit) {
+ $done = true;
+ break;
+ }
+ $signals[] = [
+ 'type' => 'badge',
+ 'slug' => (string) ($item['slug'] ?? ''),
+ 'label' => (string) ($item['label'] ?? ''),
+ 'icon' => 'award',
+ 'tone' => 'info',
+ 'icon_url' => (string) ($item['icon_url'] ?? ''),
+ 'wear' => !empty($item['wear']),
+ ];
+ $badge_count++;
+ }
+ if ($done) {
break;
}
- $signals[] = [
- 'type' => 'badge',
- 'slug' => (string) ($item['slug'] ?? ''),
- 'label' => (string) ($item['label'] ?? ''),
- 'icon' => 'award',
- 'tone' => (string) ($item['tone'] ?? 'neutral'),
- 'icon_url' => (string) ($item['icon_url'] ?? ''),
- 'wear' => !empty($item['wear']),
- ];
- $badge_count++;
}
} else {
$badge_map = [];
@@ -189,9 +199,8 @@ class Home {
}
}
$assigned = get_user_meta($user_id, 'aksrt_user_badges', true);
- if (!is_array($assigned)) {
- $assigned = preg_split('/[\s,]+/', (string) $assigned, -1, PREG_SPLIT_NO_EMPTY);
- }
+ // Storage shape: associative map slug => grant time.
+ $assigned = is_array($assigned) ? array_keys($assigned) : [];
$wear = sanitize_key((string) get_user_meta($user_id, 'aksrt_wear_badge', true));
$assigned = array_values(array_filter(array_map(static function ($slug) {
return sanitize_key((string) $slug);