diff --git a/drama/classes/domains.py b/drama/classes/domains.py index d1bdd980c..c10265c38 100644 --- a/drama/classes/domains.py +++ b/drama/classes/domains.py @@ -19,11 +19,7 @@ class BannedDomain(Base): reason = Column(Integer, default=0) @property - def reason_text(self): return reasons.get(self.reason) - - @property - def permalink(self): return f"/admin/domain/{self.domain}" - + def reason_text(self): return reasons.get(self.reason) class BadLink(Base): @@ -35,5 +31,4 @@ class BadLink(Base): autoban = Column(Boolean, default=False) @property - def reason_text(self): - return reasons.get(self.reason) + def reason_text(self): return reasons.get(self.reason) \ No newline at end of file diff --git a/drama/routes/admin.py b/drama/routes/admin.py index d4eaa7853..e8e763f25 100644 --- a/drama/routes/admin.py +++ b/drama/routes/admin.py @@ -459,20 +459,16 @@ def admin_appdata(v): v=v) -@app.get("/admin/domain/") +@app.get("/admin/banned_domains/") @admin_level_required(4) -def admin_domain_domain(domain_name, v): +def admin_domain_domain(v): - d_query=domain_name.replace("_","\_") - domain=g.db.query(BannedDomain).filter_by(domain=d_query).first() - - if not domain: domain=BannedDomain(domain=domain_name) + domains = g.db.query(BannedDomain).all() return render_template( - "admin/manage_domain.html", + "admin/banned_domains.html", v=v, - domain_name=domain_name, - domain=domain, + domains=domains, reasons=REASONS ) @@ -967,6 +963,7 @@ def admin_dump_cache(v): def admin_ban_domain(v): domain=request.form.get("domain",'').strip() + if not domain: abort(400) reason=int(request.form.get("reason",0)) diff --git a/drama/templates/admin/admin_home.html b/drama/templates/admin/admin_home.html index 09358d5c8..4ed934050 100644 --- a/drama/templates/admin/admin_home.html +++ b/drama/templates/admin/admin_home.html @@ -12,7 +12,7 @@ {% filter markdown %} * [Grant User Award](/admin/user_award) * [Advanced Stats](/user_stat_data) -* [Ban Domain](/admin/domain/enter%20domain%20here) +* [Banned Domains](/admin/banned_domains) * [Shadowbanned Users](/admin/shadowbanned) * [Users with Agendaposter Theme](/admin/agendaposters) * [Flagged Posts](/admin/flagged/posts) diff --git a/drama/templates/admin/manage_domain.html b/drama/templates/admin/banned_domains.html similarity index 50% rename from drama/templates/admin/manage_domain.html rename to drama/templates/admin/banned_domains.html index 716a051e1..faa916032 100644 --- a/drama/templates/admin/manage_domain.html +++ b/drama/templates/admin/banned_domains.html @@ -1,33 +1,39 @@ {% extends "default.html" %} {% block title %} -{{"SITE_NAME" | app_config}} - + Banned Domains {% endblock %} {% block content %} -
+
+	
+		
+			
+			
+		
+	
 
-
-
-Check if domain is banned
-
-

{{domain_name}}

- -

Current ban reason

-

{{domain.reason_text}}

- -

Actions

+ {% for domain in domains %} + + + + + {% endfor %} +
DomainBan reason
{{domain}}{{domain.reason_text}}
+
+ + +