forked from rDrama/rDrama
fdfd
parent
d7c8818508
commit
28fed30ec1
|
@ -30,7 +30,7 @@ def filter_comment_html(html_text):
|
|||
|
||||
# search db for domain rules that prohibit commenting
|
||||
bans = [
|
||||
x for x in g.db.query(Domain).filter(Domain.domain.in_(list(domain_list))).all()]
|
||||
x for x in g.db.query(BannedDomain).filter(BannedDomain.domain.in_(list(domain_list))).all()]
|
||||
|
||||
if bans:
|
||||
return bans
|
||||
|
|
|
@ -232,8 +232,8 @@ def get_domain(s):
|
|||
|
||||
domain_list = tuple(list(domain_list))
|
||||
|
||||
doms = [x for x in g.db.query(Domain).filter(
|
||||
Domain.domain.in_(domain_list)).all()]
|
||||
doms = [x for x in g.db.query(BannedDomain).filter(
|
||||
BannedDomain.domain.in_(domain_list)).all()]
|
||||
|
||||
if not doms:
|
||||
return None
|
||||
|
|
|
@ -462,10 +462,10 @@ def admin_appdata(v):
|
|||
def admin_domain_domain(domain_name, v):
|
||||
|
||||
d_query=domain_name.replace("_","\_")
|
||||
domain=g.db.query(Domain).filter_by(domain=d_query).first()
|
||||
domain=g.db.query(BannedDomain).filter_by(domain=d_query).first()
|
||||
|
||||
if not domain:
|
||||
domain=Domain(domain=domain_name)
|
||||
domain=BannedDomain(domain=domain_name)
|
||||
|
||||
return render_template(
|
||||
"admin/manage_domain.html",
|
||||
|
@ -973,9 +973,9 @@ def admin_ban_domain(v):
|
|||
if not reason: abort(400)
|
||||
|
||||
d_query=domain.replace("_","\_")
|
||||
d=g.db.query(Domain).filter_by(domain=d_query).first()
|
||||
d=g.db.query(BannedDomain).filter_by(domain=d_query).first()
|
||||
if d: d.reason=reason
|
||||
else: d=Domain(domain=domain, reason=reason)
|
||||
else: d=BannedDomain(domain=domain, reason=reason)
|
||||
|
||||
g.db.add(d)
|
||||
return redirect(d.permalink)
|
||||
|
|
Loading…
Reference in New Issue