Skip to content

Commit 2c3aa7b

Browse files
committed
Improve actor data extraction logic in Bitbucket app server
1 parent c934523 commit 2c3aa7b

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

pr_agent/servers/bitbucket_app.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,16 @@ async def inner():
164164
return "OK"
165165

166166
# Get the username of the sender
167-
try:
168-
username = data["data"]["actor"]["username"]
169-
except KeyError:
167+
actor = data.get("data", {}).get("actor", {})
168+
if actor:
170169
try:
171-
username = data["data"]["actor"]["display_name"]
170+
username = actor["username"]
172171
except KeyError:
173-
username = data["data"]["actor"]["nickname"]
174-
log_context["sender"] = username
172+
try:
173+
username = actor["display_name"]
174+
except KeyError:
175+
username = actor["nickname"]
176+
log_context["sender"] = username
175177

176178
sender_id = data["data"]["actor"]["account_id"]
177179
log_context["sender_id"] = sender_id

0 commit comments

Comments
 (0)