加入自动撤回,防止骚扰
This commit is contained in:
@@ -137,7 +137,7 @@ class DifyPlugin(MessagePluginInterface):
|
|||||||
query = re.sub(r"@.*?[\u2005|\s]", "", content).strip()
|
query = re.sub(r"@.*?[\u2005|\s]", "", content).strip()
|
||||||
|
|
||||||
if not query:
|
if not query:
|
||||||
await bot.send_text_message(roomid, "请在@我的同时提供问题内容", sender)
|
await bot.send_at_message(roomid, "请在@我的同时提供问题内容", sender)
|
||||||
return False, "没有提供问题内容"
|
return False, "没有提供问题内容"
|
||||||
|
|
||||||
# self.message_util.send_text_msg("⏳AI 正在加油,请稍候… 😊", roomid, sender)
|
# self.message_util.send_text_msg("⏳AI 正在加油,请稍候… 😊", roomid, sender)
|
||||||
@@ -156,7 +156,7 @@ class DifyPlugin(MessagePluginInterface):
|
|||||||
self.message_util.send_file(response, roomid)
|
self.message_util.send_file(response, roomid)
|
||||||
else:
|
else:
|
||||||
# 如果是普通文本,使用发送文本方法
|
# 如果是普通文本,使用发送文本方法
|
||||||
await bot.send_text_message((roomid if roomid else sender), response, sender)
|
await bot.send_at_message((roomid if roomid else sender), response, sender)
|
||||||
return True, "发送成功"
|
return True, "发送成功"
|
||||||
else:
|
else:
|
||||||
await bot.send_text_message((roomid if roomid else sender), "❌未能获取到回复,请稍后再试", sender)
|
await bot.send_text_message((roomid if roomid else sender), "❌未能获取到回复,请稍后再试", sender)
|
||||||
@@ -204,15 +204,18 @@ class DifyPlugin(MessagePluginInterface):
|
|||||||
# 判断是否为本地文件路径
|
# 判断是否为本地文件路径
|
||||||
if os.path.isfile(response):
|
if os.path.isfile(response):
|
||||||
# 如果是文件路径,使用发送文件方法
|
# 如果是文件路径,使用发送文件方法
|
||||||
self.message_util.send_file(response, (roomid if roomid else sender))
|
await bot.send_image_message((roomid if roomid else sender), response)
|
||||||
else:
|
else:
|
||||||
# 如果是普通文本,使用发送文本方法
|
# 如果是普通文本,使用发送文本方法
|
||||||
await bot.send_text_message((roomid if roomid else sender), response,
|
await bot.send_at_message((roomid if roomid else sender), response,
|
||||||
sender if roomid else "")
|
sender if roomid else "")
|
||||||
return True, "发送成功"
|
return True, "发送成功"
|
||||||
else:
|
else:
|
||||||
await bot.send_text_message((roomid if roomid else sender), "❌未能获取到回复,请稍后再试",
|
client_msg_id, create_time, new_msg_id = await bot.send_text_message((roomid if roomid else sender),
|
||||||
sender if roomid else "")
|
"❌未能获取到回复,请稍后再试",
|
||||||
|
sender if roomid else "")
|
||||||
|
|
||||||
|
revoke.add_message_to_revoke(roomid, client_msg_id, create_time, new_msg_id, 5)
|
||||||
return False, "未获取到回复"
|
return False, "未获取到回复"
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class XiurenImagePlugin(MessagePluginInterface):
|
|||||||
self._commands = self._config.get("XiurenImage", {}).get("command", ["图来", "秀人"])
|
self._commands = self._config.get("XiurenImage", {}).get("command", ["图来", "秀人"])
|
||||||
self.command_format = self._config.get("XiurenImage", {}).get("command-format", "图来")
|
self.command_format = self._config.get("XiurenImage", {}).get("command-format", "图来")
|
||||||
self.enable = self._config.get("XiurenImage", {}).get("enable", True)
|
self.enable = self._config.get("XiurenImage", {}).get("enable", True)
|
||||||
self.image_folder =self._config.get("XiurenImage", {}).get("image_folder")
|
self.image_folder = self._config.get("XiurenImage", {}).get("image_folder")
|
||||||
# 检查图片文件夹是否存在
|
# 检查图片文件夹是否存在
|
||||||
if not os.path.exists(self.image_folder):
|
if not os.path.exists(self.image_folder):
|
||||||
self.LOG.warning(f"图片文件夹不存在: {self.image_folder}")
|
self.LOG.warning(f"图片文件夹不存在: {self.image_folder}")
|
||||||
@@ -116,8 +116,11 @@ class XiurenImagePlugin(MessagePluginInterface):
|
|||||||
|
|
||||||
# 发送图片
|
# 发送图片
|
||||||
|
|
||||||
result = await bot.send_image_message((roomid if roomid else sender), Path(pic_path))
|
client_msg_id, create_time, new_msg_id = await bot.send_image_message((roomid if roomid else sender),
|
||||||
self.LOG.info(f"发送图片结果: {result}")
|
Path(pic_path))
|
||||||
|
revoke.add_message_to_revoke(roomid, client_msg_id, create_time, new_msg_id, 90)
|
||||||
|
self.LOG.info(
|
||||||
|
f"发送图片结果,client_msg_id= {client_msg_id},create_time={create_time},new_msg_id={new_msg_id}")
|
||||||
return True, "发送成功"
|
return True, "发送成功"
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
Reference in New Issue
Block a user