From 9e7eb28381cad0e1759da77cd311557cabdc0bd4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 17 May 2018 10:50:24 +0200 Subject: [PATCH] Only include the user's comment in the pagure SAR script Signed-off-by: Pierre-Yves Chibon --- roles/pagure/frontend/files/pagure_sar.py | 32 ++++++++++++++++------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/roles/pagure/frontend/files/pagure_sar.py b/roles/pagure/frontend/files/pagure_sar.py index f04c49f3f7..d7204ee97a 100644 --- a/roles/pagure/frontend/files/pagure_sar.py +++ b/roles/pagure/frontend/files/pagure_sar.py @@ -119,18 +119,30 @@ def main(): temp['projects'] = projects issues = get_issue_users(session, user.id) - issues = [ - issue.to_json() - for issue in issues - ] - temp['issues'] = issues + issues_json = [] + for issue in issues: + tmp = issue.to_json() + comments = [] + for comment in tmp['comments']: + if comment['user']['name'] != username: + continue + comments.append(comment) + tmp['comments'] = comments + issues_json.append(tmp) + temp['issues'] = issues_json prs = get_pr_users(session, user.id) - prs = [ - pr.to_json() - for pr in prs - ] - temp['pull_requests'] = prs + prs_json = [] + for pr in prs: + tmp = pr.to_json() + comments = [] + for comment in tmp['comments']: + if comment['user']['name'] != username: + continue + comments.append(comment) + tmp['comments'] = comments + prs_json.append(tmp) + temp['pull_requests'] = prs_json output[user.username] = temp