Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f3636dddd6 | |||
| 66fa5db3d7 | |||
| 2c007c4801 |
BIN
ai_chat.db
BIN
ai_chat.db
Binary file not shown.
2
main.py
2
main.py
@@ -258,7 +258,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str, db: Session = D
|
|||||||
|
|
||||||
# 同步到Matrix(如果有房间)
|
# 同步到Matrix(如果有房间)
|
||||||
if matrix_bot.is_running and matrix_bot.last_room_id:
|
if matrix_bot.is_running and matrix_bot.last_room_id:
|
||||||
await matrix_bot.send_message(matrix_bot.last_room_id, f"[网页] {message}")
|
await matrix_bot.send_message(matrix_bot.last_room_id, message)
|
||||||
|
|
||||||
# 获取对话历史
|
# 获取对话历史
|
||||||
history = conv_service.get_conversation_history(conversation_id, limit=20)
|
history = conv_service.get_conversation_history(conversation_id, limit=20)
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
@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
|
||||||
|
@tester:matrix.tphai.com MIPPYHRVAS matrix-ed25519 s8Ol56sxLCjCOi0Gkv/Kj7LqVMp/8ZmuAJ6QA1rUi7o
|
||||||
|
@tester:matrix.tphai.com UKJGJYQQLT matrix-ed25519 opC9rhsz1nzrvQqNWMKTF5FxWIGuHTDfixx+q/Y8ea0
|
||||||
|
@tester:matrix.tphai.com UPMZGRLESG matrix-ed25519 86c6XPCIYHgesq83C2k5xhXNa0EYMnqTq4jFrTwJX8I
|
||||||
|
@huangzhuang_bro:matrix.tphai.com BQHGFLQEPR matrix-ed25519 IrEHmvqotfHKLyx1JRJp4RthUVyBT8qQX72qBifRRyQ
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
@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
|
||||||
|
@tester:matrix.tphai.com MIPPYHRVAS matrix-ed25519 s8Ol56sxLCjCOi0Gkv/Kj7LqVMp/8ZmuAJ6QA1rUi7o
|
||||||
|
@huangzhuang_bro:matrix.tphai.com BQHGFLQEPR matrix-ed25519 IrEHmvqotfHKLyx1JRJp4RthUVyBT8qQX72qBifRRyQ
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
@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
|
||||||
|
@tester:matrix.tphai.com MIPPYHRVAS matrix-ed25519 s8Ol56sxLCjCOi0Gkv/Kj7LqVMp/8ZmuAJ6QA1rUi7o
|
||||||
|
@tester:matrix.tphai.com UKJGJYQQLT matrix-ed25519 opC9rhsz1nzrvQqNWMKTF5FxWIGuHTDfixx+q/Y8ea0
|
||||||
Binary file not shown.
@@ -26,6 +26,7 @@ class MatrixBot:
|
|||||||
self.is_running: bool = False
|
self.is_running: bool = False
|
||||||
self.on_message_callback: Optional[Callable] = None
|
self.on_message_callback: Optional[Callable] = None
|
||||||
self.last_room_id: str = ""
|
self.last_room_id: str = ""
|
||||||
|
self.processed_events: set = set() # 已处理的事件ID,防止重复处理
|
||||||
|
|
||||||
async def init_from_config(self):
|
async def init_from_config(self):
|
||||||
"""从数据库配置初始化"""
|
"""从数据库配置初始化"""
|
||||||
@@ -171,6 +172,20 @@ class MatrixBot:
|
|||||||
|
|
||||||
async def _process_message(self, room, sender, message_text, event_id):
|
async def _process_message(self, room, sender, message_text, event_id):
|
||||||
"""处理消息的核心逻辑"""
|
"""处理消息的核心逻辑"""
|
||||||
|
# 检查是否已处理过此事件(防止重复处理)
|
||||||
|
if event_id in self.processed_events:
|
||||||
|
logger.debug(f"忽略已处理的事件: {event_id}")
|
||||||
|
return
|
||||||
|
|
||||||
|
# 标记为已处理
|
||||||
|
self.processed_events.add(event_id)
|
||||||
|
logger.info(f"处理消息: event_id={event_id}")
|
||||||
|
|
||||||
|
# 限制集合大小,保留最近的100个
|
||||||
|
if len(self.processed_events) > 100:
|
||||||
|
# 清理旧的一半
|
||||||
|
self.processed_events = set(list(self.processed_events)[-50:])
|
||||||
|
|
||||||
# 忽略自己发送的消息
|
# 忽略自己发送的消息
|
||||||
if sender == self.user_id:
|
if sender == self.user_id:
|
||||||
logger.debug(f"忽略自己发送的消息: {sender}")
|
logger.debug(f"忽略自己发送的消息: {sender}")
|
||||||
|
|||||||
@@ -467,11 +467,10 @@
|
|||||||
messageDiv.className = `message ${role}`;
|
messageDiv.className = `message ${role}`;
|
||||||
|
|
||||||
const avatar = role === 'user' ? '👤' : '🤖';
|
const avatar = role === 'user' ? '👤' : '🤖';
|
||||||
const sourceLabel = source === 'matrix' ? ' [Matrix]' : '';
|
|
||||||
|
|
||||||
messageDiv.innerHTML = `
|
messageDiv.innerHTML = `
|
||||||
<div class="message-avatar">${avatar}</div>
|
<div class="message-avatar">${avatar}</div>
|
||||||
<div class="message-content">${formatContent(content)}${sourceLabel}</div>
|
<div class="message-content">${formatContent(content)}</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
container.appendChild(messageDiv);
|
container.appendChild(messageDiv);
|
||||||
|
|||||||
Reference in New Issue
Block a user