Merge pull request code-dot-org#24869 from code-dot-org/skip-auto-content-mod

Image Moderation: functional disable automated moderation buttons

Author: Erin007

apps/src/code-studio/showProjectAdmin.js

@@ -84,15 +84,13 @@ export default () => {
 
   $('#disable-auto-moderation').click(async function () {
     await dashboard.project.disableAutoContentModeration();
-    alert("Our moderation filter is currently turned off for all projects, but your choice will be saved and applied when we re-enable the moderation service.");
     $('#disable-auto-moderation').hide();
     $('#moderation-explanation').hide();
     $('#enable-auto-moderation').show();
   });
 
   $('#enable-auto-moderation').click(async function () {
     await dashboard.project.enableAutoContentModeration();
-    alert("Our moderation filter is currently turned off for all projects, but your choice will be saved and applied when we re-enable the moderation service.");
     $('#disable-auto-moderation').show();
     $('#moderation-explanation').show();
     $('#enable-auto-moderation').hide();

shared/middleware/files_api.rb

@@ -855,7 +855,8 @@ def files_put_file(encrypted_channel_id, filename, body)
     if THUMBNAIL_FILENAME == filename
       storage_apps = StorageApps.new(storage_id('user'))
       project_type = storage_apps.project_type_from_channel_id(encrypted_channel_id)
-      if MODERATE_THUMBNAILS_FOR_PROJECT_TYPES.include? project_type
+      content_moderation_enabled = !storage_apps.content_moderation_disabled?(encrypted_channel_id)
+      if MODERATE_THUMBNAILS_FOR_PROJECT_TYPES.include?(project_type) && content_moderation_enabled
         file_mime_type = mime_type(File.extname(filename.downcase))
         rating = ImageModeration.rate_image(file, file_mime_type, request.fullpath)
         if %i(adult racy).include? rating