Skip to content

Commit ba788a1

Browse files
authored
Merge pull request openSUSE#1927 from dmach/git-obs-timeline-ghost
Properly handle deleted users and teams in the git-obs timeline
2 parents 2b10d20 + f022e08 commit ba788a1

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

osc/gitea_api/issue_timeline_entry.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,18 @@ def _format_review(self):
158158
return f"{msg} the review", self.body
159159

160160
def _format_review_request(self):
161-
reviewer = self._data["assignee"]["login"] if self._data["assignee"] else self._data["assignee_team"]["name"]
162-
return f"requested review from {reviewer}", self.body
161+
action = "removed" if self._data["removed_assignee"] else "requested"
162+
163+
if self._data["assignee"]:
164+
reviewer = self._data["assignee"]["login"]
165+
if self._data["assignee"]["id"] == -1:
166+
reviewer += " (DELETED)"
167+
elif self._data["assignee_team"]:
168+
reviewer = self._data["assignee_team"]["name"]
169+
else:
170+
reviewer = "Ghost Team (DELETED)"
171+
172+
return f"{action} review from {reviewer}", self.body
163173

164174
# unused; we are not interested in these types of entries
165175

0 commit comments

Comments
 (0)