diff --git a/src/plugins/publish/utils.py b/src/plugins/publish/utils.py index 83435d1b..9f50e66d 100644 --- a/src/plugins/publish/utils.py +++ b/src/plugins/publish/utils.py @@ -5,7 +5,6 @@ from typing import TYPE_CHECKING, Union from githubkit.exception import RequestFailed -from githubkit.rest import PullRequest, PullRequestSimple from nonebot import logger from nonebot.adapters.github import Bot, GitHubBot @@ -45,6 +44,7 @@ Issue, IssuePropLabelsItemsOneof1, Label, + PullRequest, PullRequestPropLabelsItems, PullRequestSimple, PullRequestSimplePropLabelsItems, @@ -262,7 +262,7 @@ def validate_info_from_issue( async def resolve_conflict_pull_requests( - pulls: list[PullRequestSimple] | list[PullRequest], + pulls: list["PullRequestSimple"] | list["PullRequest"], ): """根据关联的议题提交来解决冲突