diff --git a/files/routes/__init__.py b/files/routes/__init__.py index 6d73bd1fc..65a4969e5 100644 --- a/files/routes/__init__.py +++ b/files/routes/__init__.py @@ -15,4 +15,4 @@ from .votes import * from .feeds import * from .awards import * from .giphy import * -from .subs import * \ No newline at end of file +# from .subs import * \ No newline at end of file diff --git a/files/routes/comments.py b/files/routes/comments.py index 2d0ada1c5..07c4e0aae 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -57,8 +57,8 @@ def pusher_thread(interests, c, username): @app.get("/comment/") @app.get("/post///") -@app.get("/h//comment/") -@app.get("/h//post///") +# @app.get("/h//comment/") +# @app.get("/h//post///") @auth_desired def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): diff --git a/files/routes/front.py b/files/routes/front.py index 85e872595..8a75a2d3f 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -159,8 +159,8 @@ def notifications(v): @app.get("/") @app.get("/catalog") -@app.get("/h/") -@app.get("/s/") +# @app.get("/h/") +# @app.get("/s/") @limiter.limit("3/second;30/minute;1000/hour;5000/day") @auth_desired def front_all(v, sub=None, subdomain=None): diff --git a/files/routes/posts.py b/files/routes/posts.py index 4f77f2c37..597edad2a 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -95,7 +95,7 @@ def publish(pid, v): return redirect(post.permalink) @app.get("/submit") -@app.get("/h//submit") +# @app.get("/h//submit") @auth_required def submit_get(v, sub=None): if sub: sub = g.db.query(Sub.name).filter_by(name=sub.strip().lower()).one_or_none() @@ -108,8 +108,8 @@ def submit_get(v, sub=None): @app.get("/post/") @app.get("/post//") -@app.get("/h//post/") -@app.get("/h//post//") +# @app.get("/h//post/") +# @app.get("/h//post//") @auth_desired def post_id(pid, anything=None, v=None, sub=None): @@ -758,7 +758,7 @@ def api_is_repost(): else: return {'permalink': ''} @app.post("/submit") -@app.post("/h//submit") +# @app.post("/h//submit") @limiter.limit("1/second;2/minute;10/hour;50/day") @auth_required def submit_post(v, sub=None): diff --git a/files/routes/reporting.py b/files/routes/reporting.py index 31fb61173..fe01741c5 100644 --- a/files/routes/reporting.py +++ b/files/routes/reporting.py @@ -38,15 +38,6 @@ def api_flag_post(pid, v): _note=f'"{post.flair}"' ) g.db.add(ma) - elif reason.startswith('/h/') and v.admin_level > 2: - post.sub = reason[3:] - g.db.add(post) - ma=ModAction( - kind="move_hole", - user_id=v.id, - target_submission_id=post.id, - ) - g.db.add(ma) else: flag = Flag(post_id=post.id, user_id=v.id, reason=reason) g.db.add(flag) diff --git a/files/templates/sidebar_TheMotte.html b/files/templates/sidebar_TheMotte.html index dd3493aa4..d960851d2 100644 --- a/files/templates/sidebar_TheMotte.html +++ b/files/templates/sidebar_TheMotte.html @@ -20,11 +20,6 @@ HOLE EXILEES HOLE BLOCKERS {% else %} - {% if v and v.admin_level > 2 %} - CREATE HOLE - {% endif %} - BROWSE HOLES -

What is this place?

diff --git a/files/templates/submit.html b/files/templates/submit.html index 6a148d778..bacbe2008 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -74,19 +74,6 @@ - - -
- - - {% for s in SUBS %} - - {% endfor %} - - -
-
WARNING: Selecting a hole considerably reduces the number of people who will see your post. Don't select a hole unless that's what you want.
-