Merge pull request code-dot-org#24851 from code-dot-org/revert-24626-dont-use-content-mod-results

Revert "Image Moderation: temporarily don't increment abuse score "

Author: Erin007

shared/middleware/files_api.rb

@@ -857,14 +857,15 @@ def files_put_file(encrypted_channel_id, filename, body)
       project_type = storage_apps.project_type_from_channel_id(encrypted_channel_id)
       if MODERATE_THUMBNAILS_FOR_PROJECT_TYPES.include? project_type
         file_mime_type = mime_type(File.extname(filename.downcase))
-        ImageModeration.rate_image(file, file_mime_type, request.fullpath)
-        # We are going to re-enable content moderation, but will be adjusting
-        # the thresholds in a series of trials to optimize for identifying
-        # inappropriate images without incorrectly flagging appropriate images.
-        # In the meantime, we don't want to increment abuse score until we
-        # identify the optimal threshold.
-        # TODO (ErinB) re-enable abuse score incrementation when
-        # the correct thresholds are set.
+        rating = ImageModeration.rate_image(file, file_mime_type, request.fullpath)
+        if %i(adult racy).include? rating
+          # Incrementing abuse score by 15 to differentiate from manually reported projects
+          new_score = storage_apps.increment_abuse(encrypted_channel_id, 15)
+          FileBucket.new.replace_abuse_score(encrypted_channel_id, s3_prefix, new_score)
+          response.headers['x-cdo-content-rating'] = rating.to_s
+          cache_for 1.hour
+          not_found
+        end
       end
     end
 

shared/test/middleware/files_api/test_public_thumbnails.rb

@@ -10,9 +10,7 @@ def setup
     Aws::S3::Client.expects(:new).never
   end
 
-  #Disabled while we gather Azure moderation stats. (PR 24626)'
   def test_adult_thumbnail
-    skip
     ImageModeration.stubs(:rate_image).once.returns :adult
 
     with_project_type('applab') do |channel_id|
@@ -40,9 +38,7 @@ def test_adult_thumbnail
     end
   end
 
-  #Disabled while we gather Azure moderation stats. (PR 24626)'
   def test_racy_thumbnail
-    skip
     ImageModeration.stubs(:rate_image).once.returns :racy
 
     with_project_type('applab') do |channel_id|