when flagged, mark as spam

seuros · seuros · commit 1c276cca51c6 · 2015-07-21T10:03:01.000+01:00
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -202,6 +202,10 @@ def is_admin?
     signed_in? && current_user.role == 'admin'
   end
 
+  def is_moderator?
+    signed_in? && current_user.role.in?(%w(admin moderator))
+  end
+
   def iphone_user_agent?
     request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(Mobile\/.+Safari)/]
   end
diff --git a/app/controllers/protips_controller.rb b/app/controllers/protips_controller.rb
@@ -241,11 +241,12 @@ def report_inappropriate
     end
   end
 
-  def flag
-    times_to_flag = is_admin? ? Protip::MIN_FLAG_THRESHOLD : 1
+   def flag
+    times_to_flag = is_moderator? ? Protip::MIN_FLAG_THRESHOLD : 1
     times_to_flag.times do
       @protip.flag
     end
+    @protip.mark_as_spam
     respond_to do |format|
       if @protip.save
         format.json { head :ok }
@@ -256,7 +257,7 @@ def flag
   end
 
   def unflag
-    times_to_flag = is_admin? ? Protip::MIN_FLAG_THRESHOLD : 1
+    times_to_flag = is_moderator? ? Protip::MIN_FLAG_THRESHOLD : 1
     times_to_flag.times do
       @protip.unflag
     end
