Ads: Require targets to be nsfw if the creative is nsfw.

lmumar · Dec 9, 2015 · e20c4be · e20c4be
1 parent 0c6262b
commit e20c4be
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/r2/r2/controllers/promotecontroller.py b/r2/r2/controllers/promotecontroller.py
@@ -1304,6 +1304,11 @@ def POST_edit_campaign(self, form, jquery, link, campaign_id36,
         is_frontpage = (not target.is_collection and
                         target.subreddit_name == Frontpage.name)
 
+        if link.over_18 and not target.over_18:
+            c.errors.add(errors.INVALID_NSFW_TARGET, field='targeting')
+            form.has_errors('targeting', errors.INVALID_NSFW_TARGET)
+            return
+
         if not target.is_collection and not is_frontpage:
             # targeted to a single subreddit, check roadblock
             sr = target.subreddits_slow[0]

diff --git a/r2/r2/lib/errors.py b/r2/r2/lib/errors.py
@@ -81,6 +81,7 @@
         ('BAD_SR_NAME', _('that name isn\'t going to work')),
         ('COLLECTION_NOEXIST', _('that collection doesn\'t exist')),
         ('INVALID_TARGET', _('that target type is not valid')),
+        ('INVALID_NSFW_TARGET', _('nsfw ads must target nsfw content')),
         ('INVALID_OS_VERSION', _('that version range is not valid')),
         ('RATELIMIT', _('you are doing that too much. try again in %(time)s.')),
         ('SUBREDDIT_RATELIMIT', _("you are doing that too much. try again later.")),

diff --git a/r2/r2/models/promo.py b/r2/r2/models/promo.py
@@ -290,6 +290,14 @@ def __init__(self, target):
         # defer looking up subreddits, we might only need their names
         self._subreddits = None
 
+    @property
+    def over_18(self):
+        if self.is_collection:
+            return self.collection.over_18
+        else:
+            subreddits = self.subreddits_slow
+            return subreddits and subreddits[0].over_18
+
     @property
     def subreddit_names(self):
         if self.is_collection:

diff --git a/r2/r2/templates/promotelinkbase.html b/r2/r2/templates/promotelinkbase.html
@@ -751,6 +751,7 @@
         ${error_field("OVERSOLD", "sr", "div")}
         ${thing.subreddit_selector}
       </div>
+      ${error_field("INVALID_NSFW_TARGET", "targeting", "div")}
     </div>
     <div class="select-group geotargeting-group">
       <span class="label">location</span>