diff --git a/server/tasks/lark/pull_request.py b/server/tasks/lark/pull_request.py index f4e90cc4..dac938b4 100644 --- a/server/tasks/lark/pull_request.py +++ b/server/tasks/lark/pull_request.py @@ -15,10 +15,12 @@ db, ) from model.team import get_assignees_by_openid +from tasks.lark.chat import process_desc from tasks.lark.issue import ( gen_comment_post_message, get_creater_by_item, get_github_name_by_openid, + replace_code_name_to_im_name, replace_im_name_to_github_name, replace_images_with_keys, ) @@ -94,7 +96,9 @@ def get_assignees_by_pr(pr, team): return assignees -def gen_pr_card_by_pr(pr: PullRequest, repo_url, team, maunal=False): +def gen_pr_card_by_pr( + bot, pr: PullRequest, repo_url, team, maunal=False, is_private=False +): assignees = get_assignees_by_pr(pr, team) creater, code_name = get_creater_by_item(pr, team) reviewers = pr.extra.get("requested_reviewers", []) @@ -134,11 +138,19 @@ def gen_pr_card_by_pr(pr: PullRequest, repo_url, team, maunal=False): merged=merged, ) + # 处理从 github 创建 Issue 时, description 中的图片 + description = replace_images_with_keys( + pr.description if pr.description else "", bot, is_private=is_private + ) + + # 处理从 github 创建 Issue 时, description 中的 at + description = replace_code_name_to_im_name(description) + return PullCard( repo_url=repo_url, id=pr.pull_request_number, title=pr.title, - description=pr.description, + description=description, base=pr.extra.get("base", {}), head=pr.extra.get("head", {}), status=status, @@ -206,7 +218,7 @@ def send_pull_request_manual(app_id, message_id, content, data, *args, **kwargs) ) repo_url = f"https://github.com/{team.name}/{repo.name}" - message = gen_pr_card_by_pr(pr, repo_url, team, maunal=True) + message = gen_pr_card_by_pr(bot, pr, repo_url, team, maunal=True) # 回复到话题内部 return bot.reply(message_id, message).json() @@ -339,8 +351,10 @@ def send_pull_request_card(pull_request_id: str): team = db.session.query(Team).filter(Team.id == application.team_id).first() if application and team: repo_url = f"https://github.com/{team.name}/{repo.name}" - - message = gen_pr_card_by_pr(pr, repo_url, team) + is_private = repo.extra.get("private", False) + message = gen_pr_card_by_pr( + bot, pr, repo_url, team, is_private=is_private + ) result = bot.send( chat_group.chat_id, message, receive_id_type="chat_id" @@ -366,7 +380,7 @@ def send_pull_request_card(pull_request_id: str): first_message_result = bot.reply( message_id, - # TODO 第一条话题消息，直接放repo_url + # 第一条话题消息，直接放repo_url FeishuTextMessage( f"{users} {repo_url}/pull/{pr.pull_request_number}" ), @@ -399,8 +413,9 @@ def send_pull_request_comment(pull_request_id, comment, user_name: str): ) if chat_group and pr.message_id: bot, _ = get_bot_by_application_id(chat_group.im_application_id) + is_private = repo.extra.get("private", False) # 替换 comment 中的图片 url 为 image_key - comment = replace_images_with_keys(comment, bot) + comment = replace_images_with_keys(comment, bot, is_private=is_private) # 统一用富文本回答, 支持图片、at content = gen_comment_post_message(user_name, comment) result = bot.reply( @@ -439,7 +454,7 @@ def update_pull_request_card(pr_id: str) -> bool | dict: if application and team: repo_url = f"https://github.com/{team.name}/{repo.name}" - message = gen_pr_card_by_pr(pr, repo_url, team) + message = gen_pr_card_by_pr(bot, pr, repo_url, team) result = bot.update(pr.message_id, message).json() return result @@ -525,30 +540,9 @@ def create_pull_request_comment(app_id, message_id, content, data, *args, **kwar ) comment_text = content["text"] - # 判断 content 中是否有 at - if "mentions" in data["event"]["message"]: - # 获得 mentions 中的 openid list - mentions = data["event"]["message"]["mentions"] - openid_list = [mention["id"]["open_id"] for mention in mentions] - code_name_list = [] - - for openid in openid_list: - # 通过 openid list 获得 code_name_list - code_name_list.append( - get_github_name_by_openid( - openid, - team.id, - app_id, - message_id, - content, - data, - *args, - **kwargs, - ) - ) - - # 替换 content 中的 im_name 为 code_name - comment_text = replace_im_name_to_github_name(content["text"], code_name_list) + comment_text = process_desc( + app_id, message_id, repo.id, comment_text, data, team, *args, **kwargs + ) response = github_app.create_issue_comment( team.name, repo.name, pr.pull_request_number, comment_text @@ -584,7 +578,7 @@ def close_pull_request(app_id, message_id, content, data, *args, **kwargs): if root_id != message_id: repo_url = f"https://github.com/{team.name}/{repo.name}" pr.extra.update(state="closed") - message = gen_pr_card_by_pr(pr, repo_url, team, True) + message = gen_pr_card_by_pr(bot, pr, repo_url, team, True) bot, _ = get_bot_by_application_id(app_id) bot.update(message_id=message_id, content=message) return response @@ -613,7 +607,7 @@ def merge_pull_request(app_id, message_id, content, data, *args, **kwargs): if root_id != message_id: repo_url = f"https://github.com/{team.name}/{repo.name}" pr.extra.update(merged=True) - message = gen_pr_card_by_pr(pr, repo_url, team, True) + message = gen_pr_card_by_pr(bot, pr, repo_url, team, True) bot, _ = get_bot_by_application_id(app_id) bot.update(message_id=message_id, content=message) return response @@ -642,7 +636,7 @@ def reopen_pull_request(app_id, message_id, content, data, *args, **kwargs): if root_id != message_id: repo_url = f"https://github.com/{team.name}/{repo.name}" pr.extra.update(state="opened") - message = gen_pr_card_by_pr(pr, repo_url, team, True) + message = gen_pr_card_by_pr(bot, pr, repo_url, team, True) bot, _ = get_bot_by_application_id(app_id) bot.update(message_id=message_id, content=message) return response diff --git a/server/utils/utils.py b/server/utils/utils.py index 0f52b161..1fb62fda 100644 --- a/server/utils/utils.py +++ b/server/utils/utils.py @@ -18,7 +18,9 @@ def process_image(url, bot): @stalecache(expire=3600, stale=600) def upload_image(url, bot): logging.info("upload image: %s", url) - response = httpx.get(url, follow_redirects=True) + response = httpx.get( + url, follow_redirects=True, timeout=15 + ) # Increase the timeout to 30 seconds if response.status_code == 200: # 函数返回值: iamg_key 存到缓存中 img_key = upload_image_binary(response.content, bot)