From c9dab725a86a72c7d7863b37288260d7872fa232 Mon Sep 17 00:00:00 2001
From: hackrobot <xiaoshuang.eric@gmail.com>
Date: Thu, 11 Apr 2024 13:00:55 +0800
Subject: [PATCH] sdfaga

---
 main.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/main.py b/main.py
index 411de2e..7d6e672 100644
--- a/main.py
+++ b/main.py
@@ -35,18 +35,20 @@ models.Base.metadata.create_all(bind=engine)
 
 app = FastAPI()
 
-oldEmoji = "异度世界🤖"
-original_string = WXBotService.emoji_to_unicode(oldEmoji)
-print("original_string", original_string)
-# 全局替换 \\u 为 @emoji=
-converted_string = original_string.replace('\\u', '[@emoji=')
+# 转换emoji字符串为[]
+def transOldemoji(oldEmoji=None):
+    # oldEmoji = "异度世界🤖"
+    original_string = WXBotService.emoji_to_unicode(oldEmoji)
+    print("original_string", original_string)
+    # 全局替换 \\u 为 @emoji=
+    converted_string = original_string.replace('\\u', '@emoji=')
+    # 在 Unicode 编码后添加 ']'
+    converted_string = converted_string[:-1] + ']'
+    # 输出转换后的字符串
+    print(converted_string)
+    return converted_string
 
-# 在 Unicode 编码后添加 ']'
-converted_string = converted_string[:-1] + ']'
 
-# 输出转换后的字符串
-print(converted_string)
-print("original_string", converted_string)
 # Dependency
 def get_db():
     db = SessionLocal()
@@ -151,6 +153,8 @@ def h5group(nickname, db: Session = Depends(get_db)):
     newtext = unquote(nickname, 'utf-8')
     pattern = r'收到(\w+)的在看'
     print(newtext)
+    # 处理emoji转为[@emoji=1f916] 格式
+    newtext=transOldemoji(newtext)
     matches = re.findall(pattern, newtext)
     print("matches", matches)
     matchesString = None