fix: improve ip parsing result

Author: hsluoyz

util/ip.go

@@ -106,12 +106,21 @@ func GetDescFromIP(ip string) string {
 		return ""
 	}
 
-	res := info.Country + ", " + info.Region + ", " + info.City
-	if info.Isp != Null {
-		res += ", " + info.Isp
+	parts := []string{}
+	if info.Country != "" {
+		parts = append(parts, info.Country)
+	}
+	if info.Region != "" {
+		parts = append(parts, info.Region)
+	}
+	if info.City != "" {
+		parts = append(parts, info.City)
+	}
+	if info.Isp != Null && info.Isp != "" {
+		parts = append(parts, info.Isp)
 	}
 
-	return res
+	return strings.Join(parts, ", ")
 }
 
 func GetIPInfo(clientIP string) string {

web/src/ChatListPage.js

@@ -492,15 +492,22 @@ class ChatListPage extends BaseListPage {
             return null;
           }
 
+          const ipDesc = record.clientIpDesc
+            ? record.clientIpDesc.split(",").map(s => s.trim()).filter(s => s !== "").join(", ")
+            : "";
+
           return (
             <a target="_blank" rel="noreferrer" href={`https://db-ip.com/${text}`}>
               {
-                record.clientIpDesc === "" ? text : (
+                ipDesc === "" && record.userAgentDesc === "" && record.userAgent === "" ? text : (
                   <div>
                     {text}
-                    <br />
-                    {record.clientIpDesc}
-                    <br />
+                    {ipDesc !== "" && (
+                      <>
+                        <br />
+                        {ipDesc}
+                      </>
+                    )}
                     <br />
                     {
                       this.renderUserAgent(record)