From 5ed5fa3315a1224ddf332bf2886789a5e8086db2 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Fri, 3 Oct 2025 13:56:09 +0200 Subject: [PATCH] webhooks_gitea: Use the correct actor for pull_request actions The user associated to a pull request is always its creator, however, when closing a pull request, this can be the wrong actor. The paylod contains the actor in the `sender` value, use this instead. --- zerver/webhooks/gitea/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zerver/webhooks/gitea/view.py b/zerver/webhooks/gitea/view.py index e7e937d206..345bb52e45 100644 --- a/zerver/webhooks/gitea/view.py +++ b/zerver/webhooks/gitea/view.py @@ -22,7 +22,7 @@ def format_pull_request_event(payload: WildValue, include_title: bool = False) - user_name = payload["pull_request"]["merged_by"]["username"].tame(check_string) action = "merged" else: - user_name = payload["pull_request"]["user"]["username"].tame(check_string) + user_name = payload["sender"]["username"].tame(check_string) action = payload["action"].tame(check_string) url = payload["pull_request"]["html_url"].tame(check_string)