add /marseys/all for carp
parent
b53b0e6ac7
commit
172fa6ab6f
|
@ -42,6 +42,7 @@ def reddit_post(subreddit, v, path):
|
||||||
|
|
||||||
|
|
||||||
@app.get("/marseys")
|
@app.get("/marseys")
|
||||||
|
@app.get("/marseys/all")
|
||||||
@limiter.limit(DEFAULT_RATELIMIT)
|
@limiter.limit(DEFAULT_RATELIMIT)
|
||||||
@limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
|
@limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
|
||||||
@auth_required
|
@auth_required
|
||||||
|
@ -64,7 +65,10 @@ def marseys(v:User):
|
||||||
try: page = max(int(request.values.get("page", 1)), 1)
|
try: page = max(int(request.values.get("page", 1)), 1)
|
||||||
except: page = 1
|
except: page = 1
|
||||||
|
|
||||||
marseys = marseys.offset(PAGE_SIZE*(page-1)).limit(PAGE_SIZE).all()
|
if request.path != "/marseys/all":
|
||||||
|
marseys = marseys.offset(PAGE_SIZE*(page-1)).limit(PAGE_SIZE)
|
||||||
|
|
||||||
|
marseys = marseys.all()
|
||||||
|
|
||||||
original = os.listdir("/asset_submissions/emojis/original")
|
original = os.listdir("/asset_submissions/emojis/original")
|
||||||
for marsey, user in marseys:
|
for marsey, user in marseys:
|
||||||
|
|
|
@ -42,5 +42,7 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block pagenav %}
|
{% block pagenav %}
|
||||||
{% include "pagination.html" %}
|
{% if request.path != "/marseys/all" %}
|
||||||
|
{% include "pagination.html" %}
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
Loading…
Reference in New Issue