Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-09-29 00:32:06 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
molanp
2024-08-24 19:41:48 +08:00
parent 447c558957
commit 0822512c21
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhenxun/builtin_plugins/plugin_store/__init__.py
+9 -17
View File
@@ -74,7 +74,7 @@ async def _(session: EventSession):
try: try:
result = await ShopManage.get_plugins_info() result = await ShopManage.get_plugins_info()
logger.info("查看插件列表", "插件商店", session=session) logger.info("查看插件列表", "插件商店", session=session)
await MessageUtils.build_message(result).finish() await MessageUtils.build_message(result).send()
except FinishedException: except FinishedException:
pass pass
except Exception as e: except Exception as e:
@@ -88,44 +88,38 @@ async def _(session: EventSession, plugin_id: int):
f"正在添加插件 Id: {plugin_id}" f"正在添加插件 Id: {plugin_id}"
).send() ).send()
result = await ShopManage.add_plugin(plugin_id) result = await ShopManage.add_plugin(plugin_id)
except FinishedException:
pass
except Exception as e: except Exception as e:
logger.error(f"添加插件 Id: {plugin_id}失败", "插件商店", session=session, e=e) logger.error(f"添加插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
await MessageUtils.build_message( await MessageUtils.build_message(
f"添加插件 Id: {plugin_id} 失败 e: {e}" f"添加插件 Id: {plugin_id} 失败 e: {e}"
).finish() ).send()
logger.info(f"添加插件 Id: {plugin_id}", "插件商店", session=session) logger.info(f"添加插件 Id: {plugin_id}", "插件商店", session=session)
await MessageUtils.build_message(result).finish() await MessageUtils.build_message(result).send()
@_matcher.assign("remove") @_matcher.assign("remove")
async def _(session: EventSession, plugin_id: int): async def _(session: EventSession, plugin_id: int):
try: try:
result = await ShopManage.remove_plugin(plugin_id) result = await ShopManage.remove_plugin(plugin_id)
except FinishedException:
pass
except Exception as e: except Exception as e:
logger.error(f"移除插件 Id: {plugin_id}失败", "插件商店", session=session, e=e) logger.error(f"移除插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
await MessageUtils.build_message( await MessageUtils.build_message(
f"移除插件 Id: {plugin_id} 失败 e: {e}" f"移除插件 Id: {plugin_id} 失败 e: {e}"
).finish() ).send()
logger.info(f"移除插件 Id: {plugin_id}", "插件商店", session=session) logger.info(f"移除插件 Id: {plugin_id}", "插件商店", session=session)
await MessageUtils.build_message(result).finish() await MessageUtils.build_message(result).send()
@_matcher.assign("search") @_matcher.assign("search")
async def _(session: EventSession, plugin_name_or_author: str): async def _(session: EventSession, plugin_name_or_author: str):
try: try:
result = await ShopManage.search_plugin(plugin_name_or_author) result = await ShopManage.search_plugin(plugin_name_or_author)
except FinishedException:
pass
except Exception as e: except Exception as e:
logger.error(f"搜索插件 name: {plugin_name_or_author}失败", "插件商店", session=session, e=e) logger.error(f"搜索插件 name: {plugin_name_or_author}失败", "插件商店", session=session, e=e)
await MessageUtils.build_message( await MessageUtils.build_message(
f"搜索插件 name: {plugin_name_or_author} 失败 e: {e}" f"搜索插件 name: {plugin_name_or_author} 失败 e: {e}"
).finish() ).send()
logger.info(f"搜索插件 name: {plugin_name_or_author}", "插件商店", session=session) logger.info(f"搜索插件 name: {plugin_name_or_author}", "插件商店", session=session)
await MessageUtils.build_message(result).finish() await MessageUtils.build_message(result).send()
@_matcher.assign("update") @_matcher.assign("update")
async def _(session: EventSession, plugin_id: int): async def _(session: EventSession, plugin_id: int):
@@ -134,12 +128,10 @@ async def _(session: EventSession, plugin_id: int):
f"正在更新插件 Id: {plugin_id}" f"正在更新插件 Id: {plugin_id}"
).send() ).send()
result = await ShopManage.update_plugin(plugin_id) result = await ShopManage.update_plugin(plugin_id)
except FinishedException:
pass
except Exception as e: except Exception as e:
logger.error(f"更新插件 Id: {plugin_id}失败", "插件商店", session=session, e=e) logger.error(f"更新插件 Id: {plugin_id}失败", "插件商店", session=session, e=e)
await MessageUtils.build_message( await MessageUtils.build_message(
f"更新插件 Id: {plugin_id} 失败 e: {e}" f"更新插件 Id: {plugin_id} 失败 e: {e}"
).finish() ).send()
logger.info(f"更新插件 Id: {plugin_id}", "插件商店", session=session) logger.info(f"更新插件 Id: {plugin_id}", "插件商店", session=session)
await MessageUtils.build_message(result).finish() await MessageUtils.build_message(result).send()