forked from rDrama/rDrama
1
0
Fork 0
Aevann 2023-06-24 21:48:13 +03:00
parent 8769023985
commit ed65f92500
1 changed files with 9 additions and 4 deletions

View File

@ -73,11 +73,16 @@ def marseys(v:User):
@cache.cached(key_prefix="emojis", timeout=86400) @cache.cached(key_prefix="emojis", timeout=86400)
def get_emojis(): def get_emojis():
emojis = [] emojis = g.db.query(Emoji, User).join(User, Emoji.author_id == User.id).filter(Emoji.submitter_id == None)
for emoji, author in g.db.query(Emoji, User).join(User, Emoji.author_id == User.id).filter(Emoji.submitter_id == None).order_by(Emoji.count.desc()): emojis1 = emojis.filter(Emoji.kind != 'Marsey Alphabet').order_by(Emoji.count.desc()).all()
emojis2 = emojis.filter(Emoji.kind == 'Marsey Alphabet').order_by(func.length(Emoji.name), Emoji.name).all()
emojis = emojis1 + emojis2
collected = []
for emoji, author in emojis:
emoji.author = author.username if FEATURES['ASSET_SUBMISSIONS'] else None emoji.author = author.username if FEATURES['ASSET_SUBMISSIONS'] else None
emojis.append(emoji.json()) collected.append(emoji.json())
return emojis return collected
@app.get("/emojis") @app.get("/emojis")
@limiter.limit(DEFAULT_RATELIMIT) @limiter.limit(DEFAULT_RATELIMIT)