diff --git a/app_chatgpt/models/lib/sensi_words.txt b/app_chatgpt/models/lib/sensi_words.txt
index 555bcd94..71ab84f9 100644
--- a/app_chatgpt/models/lib/sensi_words.txt
+++ b/app_chatgpt/models/lib/sensi_words.txt
@@ -1057,7 +1057,6 @@ MY
 風騷欲女
 毛郭伯雄
 一九八九年六月四日
-game master
 龟头操进处女阴道
 浪少妇和医生疯狂做爱
 狭义道
@@ -1838,7 +1837,6 @@ tiang tang
 喇嘛
 體奸
 u  r靠
-game MASTER
 海盗时代
 我和姨在车上干
 赌马
@@ -5158,7 +5156,6 @@ renminbao
 RMB
 少妇房中自淫，和两勇男玩17P，操得直叫爽 操日本淫女穴
 淫奸护士姐姐穴
-game
 情色电影网站
 錘子
 民主墙
diff --git a/app_chatgpt/models/mail_channel.py b/app_chatgpt/models/mail_channel.py
index 744b4a01..6692f373 100644
--- a/app_chatgpt/models/mail_channel.py
+++ b/app_chatgpt/models/mail_channel.py
@@ -35,18 +35,20 @@ class Channel(models.Model):
             domain += [('date', '>=', afterTime)]
         ai_msg_list = message_model.with_context(tz='UTC').search(domain, order="id desc", limit=chat_count)
         for ai_msg in ai_msg_list:
-            # todo: 判断这个 ai_msg 是不是ai发，有才 insert。 判断 user_msg 是不是 user发的，有才 insert
+            # 判断这个 ai_msg 是不是ai发，有才 insert。 判断 user_msg 是不是 user发的，有才 insert
             user_msg = ai_msg.parent_id
-            user_content = user_msg.description.replace("<p>", "").replace("</p>", "").replace('@%s' % answer_id.name, '').lstrip()
-            ai_content = str(ai_msg.body).replace("<p>", "").replace("</p>", "").replace("<p>", "")
-            context_history.insert(0, {
-                'role': 'assistant',
-                'content': ai_content,
-            })
-            context_history.insert(0, {
-                'role': 'user',
-                'content': user_content,
-            })
+            if ai_msg.author_id.gpt_id:
+                ai_content = str(ai_msg.body).replace("<p>", "").replace("</p>", "").replace("<p>", "")
+                context_history.insert(0, {
+                    'role': 'assistant',
+                    'content': ai_content,
+                })
+            if not user_msg.author_id.gpt_id:
+                user_content = user_msg.description.replace("<p>", "").replace("</p>", "").replace('@%s' % answer_id.name, '').lstrip()
+                context_history.insert(0, {
+                    'role': 'user',
+                    'content': user_content,
+                })
         return context_history
 
     def get_ai_response(self, ai, messages, channel, user_id, message):
@@ -130,10 +132,11 @@ class Channel(models.Model):
                 channel = self
         
             try:
-                messages = [{"role": "user", "content": msg}]
+                messages = []
                 c_history = self.get_openai_context(channel.id, author_id, answer_id, openapi_context_timeout, chat_count)
                 if c_history:
                     messages += c_history
+                messages.append({"role": "user", "content": msg})
                 if sync_config == 'sync':
                     self.get_ai_response(ai, messages, channel, user_id, message)
                 else: