From cdb7a1b3fa06f647b5cd0be76fd7342142c81303 Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Mon, 9 Jun 2025 23:54:51 +0800 Subject: [PATCH] style: merge else if into elif --- packages/astrbot/main.py | 83 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/packages/astrbot/main.py b/packages/astrbot/main.py index d4557e6b8..739f12b5c 100644 --- a/packages/astrbot/main.py +++ b/packages/astrbot/main.py @@ -464,55 +464,54 @@ UID: {user_id} 此 ID 可用于设置管理员。 ret += "\n使用 /provider stt <切换> STT 提供商。" event.set_result(MessageEventResult().message(ret)) - else: - if idx == "tts": - if idx2 is None: - event.set_result(MessageEventResult().message("请输入序号。")) - return - else: - if idx2 > len(self.context.get_all_tts_providers()) or idx2 < 1: - event.set_result(MessageEventResult().message("无效的序号。")) - provider = self.context.get_all_tts_providers()[idx2 - 1] - id_ = provider.meta().id - await self.context.provider_manager.set_provider( - provider_id=id_, - provider_type=ProviderType.TEXT_TO_SPEECH, - umo=umo, - ) - event.set_result( - MessageEventResult().message(f"成功切换到 {id_}。") - ) - elif idx == "stt": - if idx2 is None: - event.set_result(MessageEventResult().message("请输入序号。")) - return - else: - if idx2 > len(self.context.get_all_stt_providers()) or idx2 < 1: - event.set_result(MessageEventResult().message("无效的序号。")) - provider = self.context.get_all_stt_providers()[idx2 - 1] - id_ = provider.meta().id - await self.context.provider_manager.set_provider( - provider_id=id_, - provider_type=ProviderType.SPEECH_TO_TEXT, - umo=umo, - ) - event.set_result( - MessageEventResult().message(f"成功切换到 {id_}。") - ) - elif isinstance(idx, int): - if idx > len(self.context.get_all_providers()) or idx < 1: + elif idx == "tts": + if idx2 is None: + event.set_result(MessageEventResult().message("请输入序号。")) + return + else: + if idx2 > len(self.context.get_all_tts_providers()) or idx2 < 1: event.set_result(MessageEventResult().message("无效的序号。")) - - provider = self.context.get_all_providers()[idx - 1] + provider = self.context.get_all_tts_providers()[idx2 - 1] id_ = provider.meta().id await self.context.provider_manager.set_provider( provider_id=id_, - provider_type=ProviderType.CHAT_COMPLETION, + provider_type=ProviderType.TEXT_TO_SPEECH, umo=umo, ) - event.set_result(MessageEventResult().message(f"成功切换到 {id_}。")) + event.set_result( + MessageEventResult().message(f"成功切换到 {id_}。") + ) + elif idx == "stt": + if idx2 is None: + event.set_result(MessageEventResult().message("请输入序号。")) + return else: - event.set_result(MessageEventResult().message("无效的参数。")) + if idx2 > len(self.context.get_all_stt_providers()) or idx2 < 1: + event.set_result(MessageEventResult().message("无效的序号。")) + provider = self.context.get_all_stt_providers()[idx2 - 1] + id_ = provider.meta().id + await self.context.provider_manager.set_provider( + provider_id=id_, + provider_type=ProviderType.SPEECH_TO_TEXT, + umo=umo, + ) + event.set_result( + MessageEventResult().message(f"成功切换到 {id_}。") + ) + elif isinstance(idx, int): + if idx > len(self.context.get_all_providers()) or idx < 1: + event.set_result(MessageEventResult().message("无效的序号。")) + + provider = self.context.get_all_providers()[idx - 1] + id_ = provider.meta().id + await self.context.provider_manager.set_provider( + provider_id=id_, + provider_type=ProviderType.CHAT_COMPLETION, + umo=umo, + ) + event.set_result(MessageEventResult().message(f"成功切换到 {id_}。")) + else: + event.set_result(MessageEventResult().message("无效的参数。")) @filter.command("reset") async def reset(self, message: AstrMessageEvent):