From 3faa95616cb92c356a2c7c207a076a0a33a83389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=B4=BE=E5=A4=87=E6=A1=88?=
 <130886204+modiqi@users.noreply.github.com>
Date: Wed, 21 May 2025 01:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20WPAvatar=20=E8=90=A5?=
 =?UTF-8?q?=E9=94=80=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/admin.css            |  2 +-
 includes/marketing.php          | 49 +++++++++++++++++++++++++++------
 includes/multisite.php          |  2 +-
 includes/wpcy-compatibility.php |  2 +-
 wpavatar.php                    |  4 +--
 5 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/assets/css/admin.css b/assets/css/admin.css
index fb01efc..4e2abcc 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -312,7 +312,7 @@
 }
 
 .default-avatar-options input[type="radio"]:checked + img {
-    border: 2px solid #2271b1;
+    border: 3px solid #2271b1;
     border-radius: 50%;
 }
 
diff --git a/includes/marketing.php b/includes/marketing.php
index 9f540af..0480390 100644
--- a/includes/marketing.php
+++ b/includes/marketing.php
@@ -77,6 +77,15 @@ class Marketing {
             border: 3px solid #000;
             z-index: 10;
         }
+        .wpavatar-latest-commenters .comment-author-name {
+            font-size: 12px;
+            margin-top: 5px;
+            display: block;
+            max-width: 90px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
 
         /* 用户头像列表样式 */
         .wpavatar-latest-users,
@@ -124,6 +133,7 @@ class Marketing {
         $atts = shortcode_atts([
             'size' => $default_size,
             'number' => $default_count,
+            'show_names' => 'false' // 新增参数，默认不显示评论者名称
         ], $atts, 'wpavatar_latest_commenters');
 
         // 获取全部文章的最新评论，限制为指定的评论者数量
@@ -158,7 +168,15 @@ class Marketing {
             $avatar_with_link .= '</a>';
 
             // 添加头像到输出
-            $output .= '<div class="comment-avatar">' . $avatar_with_link . '</div>';
+            $output .= '<div class="comment-avatar">';
+            $output .= $avatar_with_link;
+
+            // 根据参数决定是否显示评论者名称
+            if ($atts['show_names'] === 'true') {
+                $output .= '<span class="comment-author-name">' . esc_html($comment->comment_author) . '</span>';
+            }
+
+            $output .= '</div>';
 
             // 记录该评论者，防止重复显示
             $seen_emails[] = $comment_email;
@@ -183,7 +201,8 @@ class Marketing {
 
         $atts = shortcode_atts([
             'number' => $default_count,
-            'size' => $default_size
+            'size' => $default_size,
+            'show_names' => 'true' // 新增参数，控制是否显示用户名
         ], $atts);
 
         $users = get_users([
@@ -200,7 +219,12 @@ class Marketing {
         foreach ($users as $user) {
             $output .= '<div class="wpavatar-latest-user">';
             $output .= get_avatar($user->ID, $atts['size'], '', $user->display_name);
-            $output .= '<div class="wpavatar-latest-user-name">' . esc_html($user->display_name) . '</div>';
+
+            // 根据参数决定是否显示用户名
+            if ($atts['show_names'] === 'true') {
+                $output .= '<div class="wpavatar-latest-user-name">' . esc_html($user->display_name) . '</div>';
+            }
+
             $output .= '</div>';
         }
         $output .= '</div>';
@@ -217,7 +241,8 @@ class Marketing {
 
         $atts = shortcode_atts([
             'number' => $default_count,
-            'size' => $default_size
+            'size' => $default_size,
+            'show_names' => 'true' // 新增参数，控制是否显示用户名
         ], $atts);
 
         $args = [
@@ -241,7 +266,12 @@ class Marketing {
         foreach ($users as $user) {
             $output .= '<div class="wpavatar-random-user">';
             $output .= get_avatar($user->ID, $atts['size'], '', $user->display_name);
-            $output .= '<div class="wpavatar-random-user-name">' . esc_html($user->display_name) . '</div>';
+
+            // 根据参数决定是否显示用户名
+            if ($atts['show_names'] === 'true') {
+                $output .= '<div class="wpavatar-random-user-name">' . esc_html($user->display_name) . '</div>';
+            }
+
             $output .= '</div>';
         }
         $output .= '</div>';
@@ -467,9 +497,10 @@ class Marketing {
                                     <ul>
                                         <li><code>number</code> - <?php _e('显示的评论者数量', 'wpavatar'); ?></li>
                                         <li><code>size</code> - <?php _e('头像大小（像素）', 'wpavatar'); ?></li>
+                                        <li><code>show_names</code> - <?php _e('是否显示用户名（true/false）', 'wpavatar'); ?></li>
                                     </ul>
                                 </td>
-                                <td><code>[wpavatar_latest_commenters number="10" size="50"]</code></td>
+                                <td><code>[wpavatar_latest_commenters number="10" size="50" show_names="true"]</code></td>
                             </tr>
                             <tr>
                                 <td><code>[wpavatar_latest_users]</code></td>
@@ -478,9 +509,10 @@ class Marketing {
                                     <ul>
                                         <li><code>number</code> - <?php _e('显示的用户数量', 'wpavatar'); ?></li>
                                         <li><code>size</code> - <?php _e('头像大小（像素）', 'wpavatar'); ?></li>
+                                        <li><code>show_names</code> - <?php _e('是否显示用户名（true/false）', 'wpavatar'); ?></li>
                                     </ul>
                                 </td>
-                                <td><code>[wpavatar_latest_users number="12" size="40"]</code></td>
+                                <td><code>[wpavatar_latest_users number="12" size="40" show_names="true"]</code></td>
                             </tr>
                             <tr>
                                 <td><code>[wpavatar_random_users]</code></td>
@@ -489,9 +521,10 @@ class Marketing {
                                     <ul>
                                         <li><code>number</code> - <?php _e('显示的用户数量', 'wpavatar'); ?></li>
                                         <li><code>size</code> - <?php _e('头像大小（像素）', 'wpavatar'); ?></li>
+                                        <li><code>show_names</code> - <?php _e('是否显示用户名（true/false）', 'wpavatar'); ?></li>
                                     </ul>
                                 </td>
-                                <td><code>[wpavatar_random_users number="12" size="40"]</code></td>
+                                <td><code>[wpavatar_random_users number="12" size="40" show_names="false"]</code></td>
                             </tr>
                             <tr>
                                 <td><code>[wpavatar_author]</code></td>
diff --git a/includes/multisite.php b/includes/multisite.php
index bca4e6f..64f3337 100644
--- a/includes/multisite.php
+++ b/includes/multisite.php
@@ -873,7 +873,7 @@ class Network {
             flex: 1;
             min-width: 200px;
             background: #f9f9f9;
-            padding: 10px 15px;
+            padding: 30px;
             border-radius: 5px;
         }
         .option-group h4 {
diff --git a/includes/wpcy-compatibility.php b/includes/wpcy-compatibility.php
index 92af1bf..eb693db 100644
--- a/includes/wpcy-compatibility.php
+++ b/includes/wpcy-compatibility.php
@@ -124,7 +124,7 @@ class Compatibility {
         $screen = get_current_screen();
         if ($screen && $screen->id === 'settings_page_wpavatar-settings') {
             echo '<div class="notice notice-info is-dismissible">';
-            echo '<p>检测到文派叶子（WPCY.COM）插件，WPAvatar 生态组件兼容补丁已生效，确保文派头像设置优先。</p>';
+            echo '<p>检测到文派叶子 🍃（WPCY.COM）插件，WPAvatar 生态组件兼容补丁已生效，确保文派头像设置优先。</p>';
             echo '</div>';
         }
     }
diff --git a/wpavatar.php b/wpavatar.php
index 2d5a0d6..7fbfecb 100644
--- a/wpavatar.php
+++ b/wpavatar.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Plugin Name: WPAvatar
- * Version: 1.9.2
+ * Version: 1.9.3
  * Plugin URI: https://wpavatar.com/download
  * Description: Replace Gravatar with Cravatar, a perfect replacement of Gravatar in China.
  * Author: WPfanyi
@@ -13,7 +13,7 @@
 
 defined('ABSPATH') || exit;
 
-define('WPAVATAR_VERSION', '1.9.2');
+define('WPAVATAR_VERSION', '1.9.3');
 define('WPAVATAR_PLUGIN_DIR', plugin_dir_path(__FILE__));
 define('WPAVATAR_PLUGIN_URL', plugin_dir_url(__FILE__));
 define('WPAVATAR_CACHE_DIR', WP_CONTENT_DIR . '/uploads/cravatar');