From 027830b0d69325b99c48a24c78a81c695f327066 Mon Sep 17 00:00:00 2001
From: hubian <908234780@qq.com>
Date: Sun, 12 Apr 2026 00:07:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Matrix=E7=94=A8=E6=88=B7=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=90=8C=E6=AD=A5=E5=88=B0=E7=BD=91=E9=A1=B5=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 user_message action 回调
- handle_matrix_message 处理 user_message 通知
- 网页端 WebSocket 接收用户消息
---
 ai_chat.db                                    | Bin 73728 -> 77824 bytes
 main.py                                       |  26 +++++++++++++++++-
 ...x.tphai.com_MIPPYHRVAS.blacklisted_devices |   0
 ...atrix.tphai.com_MIPPYHRVAS.ignored_devices |   0
 ...atrix.tphai.com_MIPPYHRVAS.trusted_devices |   4 +++
 .../matrix_service.cpython-310.pyc            | Bin 9440 -> 9539 bytes
 services/matrix_service.py                    |  11 ++++++++
 7 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.blacklisted_devices
 create mode 100644 matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.ignored_devices
 create mode 100644 matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.trusted_devices

diff --git a/ai_chat.db b/ai_chat.db
index e6c3e50b99b4f5377a0f9fb2b95f2d3eeaba4267..93f1bb33f6fc339413eb53ef6d6d40f95d449f9a 100644
GIT binary patch
delta 4750
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
Rk~8d08l6dRE|6-}{{W)Gs?z`f

delta 201
zcmZp8z|wGlWr7qN2Ok3igV00;J0=dkjS0`B_)M)#EUb)8^o$Hl&CHB8he&S-;bY}<
zXW(DYAIkTSZy}%iW<v#2zRB)&emq9TRtAQ8Cg#Q##zvbL)+ICYvGPA*;Qzz_jsFAx
zEB+^&6&GCMpZr8$fsK`aG6VnQ%{&td`6n)rm|Q!bbMl<|89Yq<-+<OL2=V{s|F&81
zz)OBUK{+5_fSU_QD)2i^X5ZilwC)$*W~cp!0yvoXq8a#g_@aSA{(Re`<rtST0sywO
BI(`5E

diff --git a/main.py b/main.py
index 8ed6166..519b23a 100644
--- a/main.py
+++ b/main.py
@@ -422,7 +422,7 @@ async def update_config(data: dict, db: Session = Depends(get_db)):
 
 # ==================== Matrix消息处理回调 ====================
 
-async def handle_matrix_message(action: str, conversation_id: str = None, user_message: str = None, room_id: str = None, message_id: int = None):
+async def handle_matrix_message(action: str, conversation_id: str = None, user_message: str = None, room_id: str = None, message_id: int = None, sender: str = None):
     """处理从Matrix收到的消息"""
     
     if action == "new_conversation":
@@ -433,6 +433,30 @@ async def handle_matrix_message(action: str, conversation_id: str = None, user_m
         })
         return
     
+    if action == "user_message":
+        # 用户消息 - 同步到网页端
+        db = SessionLocal()
+        try:
+            conv_service = ConversationService(db)
+            conversation = conv_service.get_conversation(conversation_id)
+            if conversation:
+                # 发送用户消息通知到网页端
+                await manager.send_to_user(MAIN_USER_ID, {
+                    "type": "user_message",
+                    "conversation_id": conversation_id,
+                    "message": {
+                        "id": message_id,
+                        "role": "user",
+                        "content": user_message,
+                        "source": "matrix",
+                        "sender": sender,
+                        "created_at": datetime.now().isoformat()
+                    }
+                })
+        finally:
+            db.close()
+        return
+    
     if action == "chat":
         db = SessionLocal()
         try:
diff --git a/matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.blacklisted_devices b/matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.blacklisted_devices
new file mode 100644
index 0000000..e69de29
diff --git a/matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.ignored_devices b/matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.ignored_devices
new file mode 100644
index 0000000..e69de29
diff --git a/matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.trusted_devices b/matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.trusted_devices
new file mode 100644
index 0000000..3f32624
--- /dev/null
+++ b/matrix_store/@tester:matrix.tphai.com_MIPPYHRVAS.trusted_devices
@@ -0,0 +1,4 @@
+@huangzhuang_bro:matrix.tphai.com BQHGFLQEPR matrix-ed25519 IrEHmvqotfHKLyx1JRJp4RthUVyBT8qQX72qBifRRyQ
+@tester:matrix.tphai.com AJFVRTHLJY matrix-ed25519 4mRjLhM8xbwjkwQP2T/iB3UZJoaADgP6cCVUiB8AtSk
+@tester:matrix.tphai.com GVSFGGYNJL matrix-ed25519 8qV2own4G3m2nki+izFDBOrAxtbGl8RoneM3qUPkThU
+@tester:matrix.tphai.com IMEQIQPXTR matrix-ed25519 6Yd4lmhP6jdkkNvh1rIw6TRK331ZUyiAt5G5hPeYqSE
diff --git a/services/__pycache__/matrix_service.cpython-310.pyc b/services/__pycache__/matrix_service.cpython-310.pyc
index e4f2e781f380ba6252f1d93101ecb844eff56bad..6fe022cb941ad0a661b68a17ba69b860536a7e9e 100644
GIT binary patch
delta 493
zcmZ8d!Ab&A6n*!NjWW%QrZc89l?@dkQ7xjPTDS_VO;AA?fmu(?i4sR$7!w82QV<@k
zBB*7wl4+I8Rt5fmoBD*-t$Gtm*n@ZA-gD1Ahx@tqx-J(aNkHuF7u)&g<%T?~V1c6v
zWv(w*hciE|C^6WhH_9Sx)0VOX$JDDX?ApkbE$Si(*gjLTIU7vQ7EHm$WT3{cA%c?#
z(3#9;f@a8NNsxqUxXbLIQ_X|QO0@~-yx*NH!@WurT2NQLsx1+TglSWqm>m44(p^;@
zs@@)5gz1bF%Toty=r>oiHy6=reO+(nBodu@U@~-#qv#gh;RgW3G9^3Pi=FK&Y&J@U
z=|wmWBlIzBa4ZjPg|{H)7=r@Lx5Y{+Yo$-JrBWuBjq_H99n(5+A?LydgSOD2(|Ka8
zvj&}tT>1Za>xlK7RwM!Jypr}b@WN_*DR2SsfRE#`kG^T++@{!|Uz(=yk_Rwj-0!0J
gjRh*|qY!YW^#%`y^I^;Y98!6#2^HskOa(~&0G&W{1ONa4

delta 391
zcmX@?^}v%apO=@50SN4JZ)HBP*vO|Z!gP;mvb~5gb70l4$>k#QjM0;)i<mP8Pd+bV
z$(S{nQ`F3;im!$tODIdYhB1pdMIc46m&ubMg~@|~ks+KRPl|=1M5J;VBSS4WBSRHm
z3F89M6rst6Vv3V@iK?&**YKwBrie^_Dypg~idE-F6rEx~o$A4CK>PSo#A`URcx#wJ
zw$^ZEaivJ~vcl{I+QO3}2{fB2MXHral3_N(T&9JLVE1@{+%ti(G8$^GHBhZ&iuB~w
zVw#LHldp;?G6UT)`KMSgqwHp1aW2NmJrd3Gw|Gj6Q;XtrQ;Ule(^HH5fdO=j3(AYn
zOxY|aY0t=*IXO;hwcrY%98&`qvj8ItBL_1Z6We4dX%%L7o;{NtrKOmdcqiveD=_kH
fo*=!EjZti~lad}IW5nb_<=u=~n{`!085#Wm$;@H{

diff --git a/services/matrix_service.py b/services/matrix_service.py
index 8e32b48..45e0121 100644
--- a/services/matrix_service.py
+++ b/services/matrix_service.py
@@ -224,6 +224,17 @@ class MatrixBot:
                 }
             )
             
+            # 立即通知网页端有新用户消息（通过回调）
+            if self.on_message_callback:
+                await self.on_message_callback(
+                    action="user_message",
+                    conversation_id=conversation.conversation_id,
+                    user_message=message_text,
+                    room_id=room.room_id,
+                    message_id=user_msg.id,
+                    sender=sender
+                )
+            
             # 发送"正在输入"状态
             try:
                 await self.client.room_typing(room.room_id, typing_state=True)