From 0d92e51108a50b4cb4c42426d1560212e597c682 Mon Sep 17 00:00:00 2001 From: bsimpson63 Date: Wed, 12 Jun 2013 17:53:32 -0400 Subject: [PATCH] is_shamed_domain: remove ip argument. --- r2/r2/controllers/toolbar.py | 4 ++-- r2/r2/lib/validator/validator.py | 2 +- r2/r2/models/admintools.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/r2/r2/controllers/toolbar.py b/r2/r2/controllers/toolbar.py index de5e2fb7e..380eb7267 100644 --- a/r2/r2/controllers/toolbar.py +++ b/r2/r2/controllers/toolbar.py @@ -109,7 +109,7 @@ class ToolbarController(RedditController): return self.redirect(link.make_permalink_slow(force_domain=True)) # if the domain is shame-banned, bail out. - if is_shamed_domain(link.url, request.ip)[0]: + if is_shamed_domain(link.url)[0]: self.abort404() if not link.subreddit_slow.can_view(c.user): @@ -137,7 +137,7 @@ class ToolbarController(RedditController): self.abort404() # if the domain is shame-banned, bail out. - if is_shamed_domain(path, request.ip)[0]: + if is_shamed_domain(path)[0]: self.abort404() link = utils.link_from_url(path, multiple = False) diff --git a/r2/r2/lib/validator/validator.py b/r2/r2/lib/validator/validator.py index c6b494c48..68bfae2cb 100644 --- a/r2/r2/lib/validator/validator.py +++ b/r2/r2/lib/validator/validator.py @@ -1211,7 +1211,7 @@ class VShamedDomain(Validator): if not url: return - is_shamed, domain, reason = is_shamed_domain(url, request.ip) + is_shamed, domain, reason = is_shamed_domain(url) if is_shamed: self.set_error(errors.DOMAIN_BANNED, dict(domain=domain, diff --git a/r2/r2/models/admintools.py b/r2/r2/models/admintools.py index 0385ff8a4..06dfcd8cb 100644 --- a/r2/r2/models/admintools.py +++ b/r2/r2/models/admintools.py @@ -311,7 +311,7 @@ def is_banned_IP(ip): def is_banned_domain(dom): return None -def is_shamed_domain(dom, ip): +def is_shamed_domain(dom): return False, None, None def valid_thing(v, karma, *a, **kw):