--- lbbs/src/user_info_display.c	2025/10/23 11:17:18	1.3
+++ lbbs/src/user_info_display.c	2025/10/23 14:17:09	1.10
@@ -22,6 +22,7 @@
 #include "user_list.h"
 #include "user_info_display.h"
 #include "user_priv.h"
+#include <ctype.h>
 #include <string.h>
 #include <time.h>
 #include <sys/param.h>
@@ -29,7 +30,98 @@
 #define BBS_max_sessions_per_user 10
 #define LAST_LOGIN_DT_MAX_LEN 50
 
-static int display_user_intro_key_handler(int *p_key, DISPLAY_CTX *p_ctx)
+static const int astro_dates[] = {
+	21, 20, 21, 21, 22, 22, 23, 24, 24, 24, 23, 22};
+
+static const char *astro_names[] = {
+	"摩羯", "水瓶", "双鱼", "白羊", "金牛", "双子", "巨蟹", "狮子", "处女", "天秤", "天蝎", "射手", "摩羯"};
+
+const char *get_astro_name(time_t birthday)
+{
+	struct tm tm_birth;
+
+	gmtime_r(&birthday, &tm_birth);
+
+	if (tm_birth.tm_mday < astro_dates[tm_birth.tm_mon])
+	{
+		return astro_names[tm_birth.tm_mon];
+	}
+
+	return astro_names[tm_birth.tm_mon + 1];
+}
+
+static const int user_level_points[] = {
+	INT_MIN, // 0
+	50,		 // 1
+	200,	 // 2
+	500,	 // 3
+	1000,	 // 4
+	2000,	 // 5
+	5000,	 // 6
+	10000,	 // 7
+	20000,	 // 8
+	30000,	 // 9
+	50000,	 // 10
+	60000,	 // 11
+	70000,	 // 12
+	80000,	 // 13
+	90000,	 // 14
+	100000,	 // 15
+	INT_MAX, // 16
+};
+
+static const char *user_level_names[] = {
+	"新手上路", // 0
+	"初来乍练", // 1
+	"白手起家", // 2
+	"略懂一二", // 3
+	"小有作为", // 4
+	"对答如流", // 5
+	"精于此道", // 6
+	"博大精深", // 7
+	"登峰造极", // 8
+	"论坛砥柱", // 9
+	"☆☆☆☆☆",	// 10
+	"★☆☆☆☆",	// 11
+	"★★☆☆☆",	// 12
+	"★★★☆☆",	// 13
+	"★★★★☆",	// 14
+	"★★★★★",	// 15
+};
+
+static const int user_level_cnt = sizeof(user_level_names) / sizeof(const char *);
+
+static const char *get_user_level_name(int point)
+{
+	int left;
+	int right;
+	int mid;
+
+	left = 0;
+	right = user_level_cnt - 1;
+
+	while (left < right)
+	{
+		mid = (left + right) / 2;
+		if (point < user_level_points[mid + 1])
+		{
+			right = mid;
+		}
+		else if (point > user_level_points[mid + 1])
+		{
+			left = mid + 1;
+		}
+		else // if (point == user_level_points[mid])
+		{
+			left = mid + 1;
+			break;
+		}
+	}
+
+	return user_level_names[left];
+}
+
+static int display_user_info_key_handler(int *p_key, DISPLAY_CTX *p_ctx)
 {
 	return 0;
 }
@@ -39,13 +131,17 @@ int user_info_display(USER_INFO *p_user_
 	USER_ONLINE_INFO sessions[BBS_max_sessions_per_user];
 	int session_cnt = BBS_max_sessions_per_user;
 	int article_cnt;
+	const char *astro_name;
+	char astro_str[LINE_BUFFER_LEN];
 	struct tm tm_last_login;
 	char str_last_login_dt[LAST_LOGIN_DT_MAX_LEN + 1];
 	struct tm tm_last_logout;
 	char str_last_logout_dt[LAST_LOGIN_DT_MAX_LEN + 1];
 	char login_ip[IP_ADDR_LEN];
 	int ip_mask_level;
+	const char *p_action_title;
 	char action_str[LINE_BUFFER_LEN];
+	const char *user_level_name;
 	char intro_f[BBS_user_intro_max_len];
 	int intro_len;
 	char user_info_f[BUFSIZ];
@@ -58,9 +154,29 @@ int user_info_display(USER_INFO *p_user_
 
 	article_cnt = get_user_article_cnt(p_user_info->uid);
 
+	astro_name = get_astro_name(p_user_info->birthday);
+	if (p_user_info->gender_pub && toupper(p_user_info->gender) == 'M')
+	{
+		snprintf(astro_str, sizeof(astro_str),
+				 "\033[1;36m%s座\033[m",
+				 astro_name);
+	}
+	else if (p_user_info->gender_pub && toupper(p_user_info->gender) == 'F')
+	{
+		snprintf(astro_str, sizeof(astro_str),
+				 "\033[1;35m%s座\033[m",
+				 astro_name);
+	}
+	else
+	{
+		snprintf(astro_str, sizeof(astro_str),
+				 "\033[1;33m%s座\033[m",
+				 astro_name);
+	}
+
 	localtime_r(&(p_user_info->last_login_dt), &tm_last_login);
 	strftime(str_last_login_dt, sizeof(str_last_login_dt), "%c", &tm_last_login);
-	if (p_user_info->last_logout_dt < p_user_info->last_login_dt)
+	if (p_user_info->last_logout_dt <= p_user_info->last_login_dt)
 	{
 		strncpy(str_last_logout_dt, str_last_login_dt, sizeof(str_last_logout_dt) - 1);
 		str_last_logout_dt[sizeof(str_last_logout_dt) - 1] = '\0';
@@ -84,13 +200,17 @@ int user_info_display(USER_INFO *p_user_
 	p = action_str;
 	for (i = 0; i < session_cnt; i++)
 	{
-		if (p + strlen(sessions[i].current_action_title) + 4 >= action_str + sizeof(action_str)) // buffer overflow
+		p_action_title = (sessions[i].current_action_title != NULL
+							  ? sessions[i].current_action_title
+							  : sessions[i].current_action);
+
+		if (p + strlen(p_action_title) + 4 >= action_str + sizeof(action_str)) // buffer overflow
 		{
 			log_error("action_str of user(uid=%d) truncated at i=%d\n", p_user_info->uid, i);
 			break;
 		}
 		*p++ = '[';
-		for (q = sessions[i].current_action_title; *q != '\0';)
+		for (q = p_action_title; *q != '\0';)
 		{
 			*p++ = *q++;
 		}
@@ -113,17 +233,19 @@ int user_info_display(USER_INFO *p_user_
 		login_ip[0] = '\0';
 	}
 
+	user_level_name = get_user_level_name(p_user_info->exp);
+
 	intro_len = lml_render(p_user_info->intro, intro_f, sizeof(intro_f), 0);
 
 	snprintf(user_info_f, sizeof(user_info_f),
 			 "\n%s (%s) 上站 [%d] 发文 [%d]\n"
 			 "上次在 [%s] 从 [%s] 访问本站 经验值 [%d]\n"
-			 "离线于 [%s] 等级 [%s]\n"
+			 "离线于 [%s] 等级 [%s] 星座 [%s]\n"
 			 "%s\033[1m%s\033[m"
 			 "%s\n%s\n",
 			 p_user_info->username, p_user_info->nickname, p_user_info->visit_count, article_cnt,
 			 str_last_login_dt, (session_cnt > 0 ? login_ip : "未知"), p_user_info->exp,
-			 (session_cnt > 0 ? "在线或因断线不详" : str_last_logout_dt), "?",
+			 (session_cnt > 0 ? "在线或因断线不详" : str_last_logout_dt), user_level_name, astro_str,
 			 (session_cnt > 0 ? "目前在线，状态如下：\n" : ""), (session_cnt > 0 ? action_str : ""),
 			 (intro_len > 0 ? "\033[0;36m个人说明档如下：\033[m" : "\033[0;36m没有个人说明档\033[m"),
 			 intro_f);
@@ -131,7 +253,7 @@ int user_info_display(USER_INFO *p_user_
 	lines = split_data_lines(user_info_f, SCREEN_COLS, line_offsets, MIN(SCREEN_ROWS - 1, BBS_user_intro_max_line + 8), 1, NULL);
 
 	clearscr();
-	display_data(user_info_f, lines, line_offsets, 1, display_user_intro_key_handler, DATA_READ_HELP);
+	display_data(user_info_f, lines, line_offsets, 1, display_user_info_key_handler, DATA_READ_HELP);
 
 	return 0;
 }