[FIX] website_forum: do the todo

We have a tunable parameter for flagged / offensive questions. So let us use
it instead of some other parameter * 5.

3 files changed, 6 insertions, 8 deletions

diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index d2021783686..a428b1578db 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -494,8 +494,7 @@ class Post(models.Model):
             if post.closed_reason_id in (reason_offensive, reason_spam):
                 _logger.info('Upvoting user <%s>, reopening spam/offensive question',
                              post.create_uid)
-                # TODO: in master, consider making this a tunable karma parameter
-                post.create_uid.sudo().add_karma(post.forum_id.karma_gen_question_downvote * -5)
+                post.create_uid.sudo().add_karma(post.forum_id.karma_gen_answer_flagged * -1)
 
         self.sudo().write({'state': 'active'})
 
@@ -510,8 +509,7 @@ class Post(models.Model):
             for post in self:
                 _logger.info('Downvoting user <%s> for posting spam/offensive contents',
                              post.create_uid)
-                # TODO: in master, consider making this a tunable karma parameter
-                post.create_uid.sudo().add_karma(post.forum_id.karma_gen_question_downvote * 5)
+                post.create_uid.sudo().add_karma(post.forum_id.karma_gen_answer_flagged)
 
         self.write({
             'state': 'close',
@@ -568,9 +566,8 @@ class Post(models.Model):
             raise KarmaError('Not enough karma to mark a post as offensive')
 
         # remove some karma
-        # TODO: consider making this a tunable karma parameter (cfr close)
         _logger.info('Downvoting user <%s> for posting spam/offensive contents', self.create_uid)
-        self.create_uid.sudo().add_karma(self.forum_id.karma_gen_question_downvote * 5)
+        self.create_uid.sudo().add_karma(self.forum_id.karma_gen_answer_flagged)
 
         self.write({
             'state': 'offensive',
diff --git a/addons/website_forum/tests/common.py b/addons/website_forum/tests/common.py
index e0f143ac293..18be08c4a83 100644
--- a/addons/website_forum/tests/common.py
+++ b/addons/website_forum/tests/common.py
@@ -12,7 +12,7 @@ KARMA = {
     'unlink_own': 10, 'unlink_all': 20,
     'post': 100, 'flag': 500, 'moderate': 1000,
     'gen_que_new': 1, 'gen_que_upv': 5, 'gen_que_dwv': -10,
-    'gen_ans_upv': 10, 'gen_ans_dwv': -20,
+    'gen_ans_upv': 10, 'gen_ans_dwv': -20, 'gen_ans_flag': -45,
 }
 
 
@@ -81,6 +81,7 @@ class TestForumCommon(common.SavepointCase):
             'karma_gen_answer_downvote': KARMA['gen_ans_dwv'],
             'karma_gen_answer_accept': 9999,
             'karma_gen_answer_accepted': 9999,
+            'karma_gen_answer_flagged': KARMA['gen_ans_flag'],
         })
         cls.post = Post.create({
             'name': 'TestQuestion',
diff --git a/addons/website_forum/tests/test_forum.py b/addons/website_forum/tests/test_forum.py
index fbe6dc4f6d5..95ebf371ec2 100644
--- a/addons/website_forum/tests/test_forum.py
+++ b/addons/website_forum/tests/test_forum.py
@@ -210,7 +210,7 @@ class TestForum(TestForumCommon):
         init_karma = post.create_uid.karma
         post.sudo(self.user_portal).mark_as_offensive(12)
         self.assertEqual(post.state, 'offensive', 'website_forum: wrong state when marking a post as offensive')
-        self.assertEqual(post.create_uid.karma, init_karma + 5 * KARMA['gen_que_dwv'], 'website_forum: wrong karma when marking a post as offensive')
+        self.assertEqual(post.create_uid.karma, init_karma + KARMA['gen_ans_flag'], 'website_forum: wrong karma when marking a post as offensive')
 
     def test_convert_answer_to_comment_crash(self):
         Post = self.env['forum.post']