From abe95ef6bf44f5e1991b6ad15cd704248b000a27 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Wed, 17 Aug 2016 12:30:54 +0200
Subject: [PATCH] mark_spam.py: Mark as spam all comments done by a creator
* mark_spam.py: Mark as spam all comments done by a creator.
From-SVN: r239527
---
contrib/ChangeLog | 4 ++++
contrib/mark_spam.py | 20 ++++++++++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 16ea455b2cf7..d2286e52e536 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-17 Martin Liska <mliska@suse.cz>
+
+ * mark_spam.py: Mark as spam all comments done by a creator.
+
2016-08-15 Martin Liska <mliska@suse.cz>
* mark_spam.py: Add error handling and reset
diff --git a/contrib/mark_spam.py b/contrib/mark_spam.py
index f206356ba6e3..86f46a129ccd 100755
--- a/contrib/mark_spam.py
+++ b/contrib/mark_spam.py
@@ -39,7 +39,9 @@ def mark_as_spam(id, api_key, verbose):
return
# 2) mark the bug as spam
- cc_list = response['bugs'][0]['cc']
+ bug = response['bugs'][0]
+ creator = bug['creator']
+ cc_list = bug['cc']
data = {
'status': 'RESOLVED',
'resolution': 'INVALID',
@@ -64,13 +66,15 @@ def mark_as_spam(id, api_key, verbose):
# 3) mark the first comment as spam
r = requests.get(u + '/comment')
response = json.loads(r.text)
- comment_id = response['bugs'][str(id)]['comments'][0]['id']
-
- u2 = '%sbug/comment/%d/tags' % (base_url, comment_id)
- r = requests.put(u2, json = {'comment_id': comment_id, 'add': ['spam'], 'api_key': api_key})
- if verbose:
- print(r)
- print(r.text)
+ for c in response['bugs'][str(id)]['comments']:
+ if c['creator'] == creator:
+ comment_id = c['id']
+ u2 = '%sbug/comment/%d/tags' % (base_url, comment_id)
+ print(u2)
+ r = requests.put(u2, json = {'comment_id': comment_id, 'add': ['spam'], 'api_key': api_key})
+ if verbose:
+ print(r)
+ print(r.text)
# 4) mark all attachments as spam
r = requests.get(u + '/attachment')
--
GitLab