diff --git a/dify/dify_chat.py b/dify/dify_chat.py index 94c84cf..b630e0e 100644 --- a/dify/dify_chat.py +++ b/dify/dify_chat.py @@ -107,7 +107,7 @@ class DifyChat: message.sender if message.from_group() else "") except Exception as e: self.LOG.error(f"Dify聊天出错:{e}") - self.wcf.send_text(f"-----Bot-----\n❌请求出错:{str(e)}", + self.wcf.send_text(f"❌请求出错:{str(e)}", (message.roomid if message.from_group() else message.sender), message.sender if message.from_group() else "") diff --git a/group_video/bot_video.py b/group_video/bot_video.py index 187b4e4..e5084aa 100644 --- a/group_video/bot_video.py +++ b/group_video/bot_video.py @@ -74,7 +74,7 @@ class BotVideo: try: file_abspath = self.download_stream("https://api.guiguiya.com/api/hook/heisis", "down_load_dir/video.mp4") except requests.RequestException as e: - self.wcf.send_text(f"-----Bot-----\n❌请求出错:{e}", + self.wcf.send_text(f"❌请求出错:{e}", (message.roomid if message.from_group() else message.sender), message.sender) return diff --git a/group_video_man/bot_video_man.py b/group_video_man/bot_video_man.py index e13be3d..2f59fe1 100644 --- a/group_video_man/bot_video_man.py +++ b/group_video_man/bot_video_man.py @@ -41,7 +41,7 @@ class BotVideoMan: self.wcf.send_file(file_abspath, (message.roomid if message.from_group() else message.sender)) return except requests.RequestException as e: - self.wcf.send_text(f"-----Bot-----\n❌请求出错:{e}", + self.wcf.send_text(f"❌请求出错:{e}", (message.roomid if message.from_group() else message.sender), message.sender) return diff --git a/plugins/music/main.py b/plugins/music/main.py index ac39488..ee6d1c2 100644 --- a/plugins/music/main.py +++ b/plugins/music/main.py @@ -93,7 +93,7 @@ class MusicPlugin(MessagePluginInterface): # 检查命令格式 if len(content.split(" ")) == 1: - wcf.send_text(f"-----Bot-----\n❌命令格式错误!\n{self.command_format}", + wcf.send_text(f"❌命令格式错误!\n{self.command_format}", (roomid if roomid else sender), sender) return True, "命令格式错误" @@ -108,7 +108,7 @@ class MusicPlugin(MessagePluginInterface): # 搜索歌曲 song_info = self._search_song(user_song_name) if not song_info or not song_info.get("play_url"): - wcf.send_text(f"-----Bot-----\n❌未找到歌曲:{user_song_name}", + wcf.send_text(f"❌未找到歌曲:{user_song_name}", (roomid if roomid else sender), sender) return True, "未找到歌曲" diff --git a/plugins/plugin_manager/main.py b/plugins/plugin_manager/main.py index 44a0b4e..dfec26e 100644 --- a/plugins/plugin_manager/main.py +++ b/plugins/plugin_manager/main.py @@ -105,13 +105,13 @@ class PluginManagerPlugin(MessagePluginInterface): # 检查命令格式 parts = content.split(" ") if len(parts) == 1: - wcf.send_text(f"-----Bot-----\n❌命令格式错误!\n{self.command_format}", + wcf.send_text(f"❌命令格式错误!\n{self.command_format}", (roomid if roomid else sender), sender) return True, "命令格式错误" # 检查权限 (只允许管理员操作) if not self._is_admin(sender, gbm): - wcf.send_text(f"-----Bot-----\n❌权限不足,只有管理员可以管理插件", + wcf.send_text(f"❌权限不足,只有管理员可以管理插件", (roomid if roomid else sender), sender) return True, "权限不足" @@ -136,12 +136,12 @@ class PluginManagerPlugin(MessagePluginInterface): elif sub_command == "信息" and plugin_name: return self._plugin_info(plugin_name, wcf, sender, roomid) else: - wcf.send_text(f"-----Bot-----\n❌未知命令或缺少参数!\n{self.command_format}", + wcf.send_text(f"❌未知命令或缺少参数!\n{self.command_format}", (roomid if roomid else sender), sender) return True, "未知命令" except Exception as e: self.LOG.error(f"处理插件管理请求出错: {e}") - wcf.send_text(f"-----Bot-----\n❌操作失败: {str(e)}", + wcf.send_text(f"❌操作失败: {str(e)}", (roomid if roomid else sender), sender) return True, f"处理出错: {e}" @@ -156,7 +156,7 @@ class PluginManagerPlugin(MessagePluginInterface): plugins = self.plugin_registry.get_all_plugins().values() # 构建插件列表消息 - message = "-----Bot-----\n📋 插件列表:\n" + message = "📋 插件列表:\n" for plugin in plugins: status = "✅ 已启用" if plugin.status == PluginStatus.RUNNING else "❌ 已禁用" message += f"{status}-{plugin.name}\n" @@ -168,23 +168,23 @@ class PluginManagerPlugin(MessagePluginInterface): """启用插件""" plugin = self.plugin_registry.get_plugin(plugin_name) if not plugin: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 不存在", + wcf.send_text(f"❌插件 {plugin_name} 不存在", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 不存在" if plugin.status == PluginStatus.RUNNING: - wcf.send_text(f"-----Bot-----\n⚠️插件 {plugin_name} 已经是启用状态", + wcf.send_text(f"⚠️插件 {plugin_name} 已经是启用状态", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 已经是启用状态" # 使用插件管理器启动插件 success = self.plugin_manager.start_plugin(plugin_name) if success: - wcf.send_text(f"-----Bot-----\n✅插件 {plugin_name} 启用成功", + wcf.send_text(f"✅插件 {plugin_name} 启用成功", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 启用成功" else: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 启用失败", + wcf.send_text(f"❌插件 {plugin_name} 启用失败", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 启用失败" @@ -192,29 +192,29 @@ class PluginManagerPlugin(MessagePluginInterface): """禁用插件""" # 不允许禁用自身 if plugin_name == self.name: - wcf.send_text(f"-----Bot-----\n⚠️不能禁用插件管理插件自身", + wcf.send_text(f"⚠️不能禁用插件管理插件自身", (roomid if roomid else sender), sender) return True, "不能禁用插件管理插件自身" plugin = self.plugin_registry.get_plugin(plugin_name) if not plugin: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 不存在", + wcf.send_text(f"❌插件 {plugin_name} 不存在", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 不存在" if plugin.status == PluginStatus.STOPPED: - wcf.send_text(f"-----Bot-----\n⚠️插件 {plugin_name} 已经是禁用状态", + wcf.send_text(f"⚠️插件 {plugin_name} 已经是禁用状态", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 已经是禁用状态" # 使用插件管理器停止插件 success = self.plugin_manager.stop_plugin(plugin_name) if success: - wcf.send_text(f"-----Bot-----\n✅插件 {plugin_name} 禁用成功", + wcf.send_text(f"✅插件 {plugin_name} 禁用成功", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 禁用成功" else: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 禁用失败", + wcf.send_text(f"❌插件 {plugin_name} 禁用失败", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 禁用失败" @@ -222,18 +222,18 @@ class PluginManagerPlugin(MessagePluginInterface): """重新加载插件""" # 不允许重载自身 if plugin_name == self.name: - wcf.send_text(f"-----Bot-----\n⚠️不能重载插件管理插件自身", + wcf.send_text(f"⚠️不能重载插件管理插件自身", (roomid if roomid else sender), sender) return True, "不能重载插件管理插件自身" # 使用插件管理器重新加载插件 plugin = self.plugin_manager.reload_plugin(plugin_name) if plugin: - wcf.send_text(f"-----Bot-----\n✅插件 {plugin_name} 重载成功", + wcf.send_text(f"✅插件 {plugin_name} 重载成功", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 重载成功" else: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 重载失败", + wcf.send_text(f"❌插件 {plugin_name} 重载失败", (roomid if roomid else sender), sender) return False, f"插件 {plugin_name} 重载失败" @@ -242,14 +242,14 @@ class PluginManagerPlugin(MessagePluginInterface): # 不允许卸载自身 if plugin_name == self.name: if not silent: - wcf.send_text(f"-----Bot-----\n⚠️不能卸载插件管理插件自身", + wcf.send_text(f"⚠️不能卸载插件管理插件自身", (roomid if roomid else sender), sender) return True, "不能卸载插件管理插件自身" plugin = self.plugin_registry.get_plugin(plugin_name) if not plugin: if not silent: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 不存在或已卸载", + wcf.send_text(f"❌插件 {plugin_name} 不存在或已卸载", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 不存在或已卸载" @@ -257,12 +257,12 @@ class PluginManagerPlugin(MessagePluginInterface): success = self.plugin_manager.unload_plugin(plugin_name) if success: if not silent: - wcf.send_text(f"-----Bot-----\n✅插件 {plugin_name} 卸载成功", + wcf.send_text(f"✅插件 {plugin_name} 卸载成功", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 卸载成功" else: if not silent: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 卸载失败", + wcf.send_text(f"❌插件 {plugin_name} 卸载失败", (roomid if roomid else sender), sender) return False, f"插件 {plugin_name} 卸载失败" @@ -272,7 +272,7 @@ class PluginManagerPlugin(MessagePluginInterface): existing_plugin = self.plugin_registry.get_plugin(plugin_name) if existing_plugin: if not silent: - wcf.send_text(f"-----Bot-----\n⚠️插件 {plugin_name} 已经加载", + wcf.send_text(f"⚠️插件 {plugin_name} 已经加载", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 已经加载" @@ -281,7 +281,7 @@ class PluginManagerPlugin(MessagePluginInterface): plugin_dir = os.path.join("plugins", plugin_name) if not os.path.exists(plugin_dir): if not silent: - wcf.send_text(f"-----Bot-----\n❌插件目录 {plugin_dir} 不存在", + wcf.send_text(f"❌插件目录 {plugin_dir} 不存在", (roomid if roomid else sender), sender) return False, f"插件目录 {plugin_dir} 不存在" @@ -289,18 +289,18 @@ class PluginManagerPlugin(MessagePluginInterface): plugin = self.plugin_manager.load_plugin(plugin_name) if plugin: if not silent: - wcf.send_text(f"-----Bot-----\n✅插件 {plugin_name} 加载成功", + wcf.send_text(f"✅插件 {plugin_name} 加载成功", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 加载成功" else: if not silent: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 加载失败", + wcf.send_text(f"❌插件 {plugin_name} 加载失败", (roomid if roomid else sender), sender) return False, f"插件 {plugin_name} 加载失败" except Exception as e: self.LOG.error(f"加载插件 {plugin_name} 出错: {e}") if not silent: - wcf.send_text(f"-----Bot-----\n❌加载插件出错: {str(e)}", + wcf.send_text(f"❌加载插件出错: {str(e)}", (roomid if roomid else sender), sender) return False, f"加载插件出错: {e}" @@ -308,7 +308,7 @@ class PluginManagerPlugin(MessagePluginInterface): """查看插件详情""" plugin = self.plugin_registry.get_plugin(plugin_name) if not plugin: - wcf.send_text(f"-----Bot-----\n❌插件 {plugin_name} 不存在", + wcf.send_text(f"❌插件 {plugin_name} 不存在", (roomid if roomid else sender), sender) return True, f"插件 {plugin_name} 不存在" diff --git a/plugins/xiuren_image/main.py b/plugins/xiuren_image/main.py index 90efeef..488ccc9 100644 --- a/plugins/xiuren_image/main.py +++ b/plugins/xiuren_image/main.py @@ -104,7 +104,7 @@ class XiurenImagePlugin(MessagePluginInterface): # 获取随机图片 pic_path = self._get_random_pic() if not pic_path: - wcf.send_text(f"-----Bot-----\n❌未找到图片资源", + wcf.send_text(f"❌未找到图片资源", (roomid if roomid else sender), sender) return True, "未找到图片资源" diff --git a/point_trade/main.py b/point_trade/main.py index 936c56c..3c9d0d7 100644 --- a/point_trade/main.py +++ b/point_trade/main.py @@ -67,7 +67,7 @@ class PointTrade: return if len(command) < 3: - self.wcf.send_text(f"-----Bot-----\n❌命令格式错误!{self.command_format}", + self.wcf.send_text(f"❌命令格式错误!{self.command_format}", (message.roomid if message.from_group() else message.sender), message.sender) return @@ -75,12 +75,12 @@ class PointTrade: return if not command[1].isdigit(): - self.wcf.send_text(f"-----Bot-----\n🈚️转账积分无效(必须为正整数!) \n{self.command_format}", + self.wcf.send_text(f"🈚️转账积分无效(必须为正整数!) \n{self.command_format}", (message.roomid if message.from_group() else message.sender), message.sender) return if len(self.at_list(message.xml)) != 1: - self.wcf.send_text(f"-----Bot-----\n转账失败❌\n🈚️转账人无效! \n{self.command_format}", + self.wcf.send_text(f"转账失败❌\n🈚️转账人无效! \n{self.command_format}", (message.roomid if message.from_group() else message.sender), message.sender) return @@ -92,7 +92,7 @@ class PointTrade: # 查询发信人的记录 sender_result = self._get_user_record(trader_wxid, group_id) if not sender_result: - self.wcf.send_text(f"-----Bot-----\n❌打赏失败!\n没有找到你的记录,无法进行打赏!", + self.wcf.send_text(f"❌打赏失败!\n没有找到你的记录,无法进行打赏!", (message.roomid if message.from_group() else message.sender), message.sender) return @@ -104,7 +104,7 @@ class PointTrade: # 检查发信人积分是否足够 if sender_current_points < reward_points: self.wcf.send_text( - f"-----Bot-----\n❌打赏失败!\n你的积分不足以进行打赏!当前积分:{sender_current_points},你需要 {reward_points} 积分。", + f"❌打赏失败!\n你的积分不足以进行打赏!当前积分:{sender_current_points},你需要 {reward_points} 积分。", (message.roomid if message.from_group() else message.sender), message.sender) return @@ -112,7 +112,7 @@ class PointTrade: recipient_result = self._get_user_record_by_nick(target_wxid, group_id) if not recipient_result: self.wcf.send_text( - f"-----Bot-----\n❌打赏失败!\n接收人[{target_wxid}]无法收取积分", + f"❌打赏失败!\n接收人[{target_wxid}]无法收取积分", (message.roomid if message.from_group() else message.sender), message.sender) return @@ -126,7 +126,7 @@ class PointTrade: self._update_user_points(sender_user_id, -reward_points, group_id) # 减少发送者积分 self._update_user_points(recipient_user_id, reward_points, group_id) # 增加接收者积分 except mysql.connector.Error as e: - self.wcf.send_text(f"-----Bot-----\n❌积分更新失败!请稍后重试。错误: {str(e)}", + self.wcf.send_text(f"❌积分更新失败!请稍后重试。错误: {str(e)}", (message.roomid if message.from_group() else message.sender), message.sender) return @@ -137,7 +137,7 @@ class PointTrade: new_recipient_points = int(updated_recipient['points']) if updated_recipient else recipient_current_points output = ( - f"\n-----Bot-----\n" + f"\n" f"✅积分赠送成功!✨\n" f"🤝{sender_wx_nick_name} 现在有 {new_sender_points} 点积分➖\n" f"🤝{recipient_wx_nick_name} 现在有 {new_recipient_points} 点积分➕\n"