type hints for get functions :)
parent
32bede574b
commit
db9b37de40
|
@ -1,10 +1,9 @@
|
||||||
|
from typing import Optional
|
||||||
from files.classes import *
|
from files.classes import *
|
||||||
from flask import g
|
from flask import g
|
||||||
|
|
||||||
def get_id(username, graceful=False):
|
def get_id(username, graceful=False) -> Optional[int]:
|
||||||
|
|
||||||
username = username.replace('\\', '').replace('_', '\_').replace('%', '').strip()
|
username = username.replace('\\', '').replace('_', '\_').replace('%', '').strip()
|
||||||
|
|
||||||
user = g.db.query(
|
user = g.db.query(
|
||||||
User.id
|
User.id
|
||||||
).filter(
|
).filter(
|
||||||
|
@ -21,13 +20,12 @@ def get_id(username, graceful=False):
|
||||||
return user[0]
|
return user[0]
|
||||||
|
|
||||||
|
|
||||||
def get_user(username, v=None, graceful=False, rendered=False, include_blocks=False, include_shadowbanned=True):
|
def get_user(username, v=None, graceful=False, rendered=False, include_blocks=False, include_shadowbanned=True) -> Optional[User]:
|
||||||
if not username:
|
if not username:
|
||||||
if not graceful: abort(404)
|
if not graceful: abort(404)
|
||||||
else: return None
|
else: return None
|
||||||
|
|
||||||
username = username.replace('\\', '').replace('_', '\_').replace('%', '').replace('(', '').replace(')', '').strip()
|
username = username.replace('\\', '').replace('_', '\_').replace('%', '').replace('(', '').replace(')', '').strip()
|
||||||
|
|
||||||
user = g.db.query(
|
user = g.db.query(
|
||||||
User
|
User
|
||||||
).filter(
|
).filter(
|
||||||
|
@ -66,13 +64,11 @@ def get_user(username, v=None, graceful=False, rendered=False, include_blocks=Fa
|
||||||
|
|
||||||
return user
|
return user
|
||||||
|
|
||||||
def get_users(usernames, graceful=False):
|
def get_users(usernames, graceful=False) -> list[User]:
|
||||||
|
|
||||||
def clean(n):
|
def clean(n):
|
||||||
return n.replace('\\', '').replace('_', '\_').replace('%', '').strip()
|
return n.replace('\\', '').replace('_', '\_').replace('%', '').strip()
|
||||||
|
|
||||||
usernames = [clean(n) for n in usernames]
|
usernames = [clean(n) for n in usernames]
|
||||||
|
|
||||||
users = g.db.query(User).filter(
|
users = g.db.query(User).filter(
|
||||||
or_(
|
or_(
|
||||||
User.username.ilike(any_(usernames)),
|
User.username.ilike(any_(usernames)),
|
||||||
|
@ -85,8 +81,7 @@ def get_users(usernames, graceful=False):
|
||||||
|
|
||||||
return users
|
return users
|
||||||
|
|
||||||
def get_account(id, v=None, graceful=False, include_blocks=False, include_shadowbanned=True):
|
def get_account(id, v=None, graceful=False, include_blocks=False, include_shadowbanned=True) -> Optional[User]:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
id = int(id)
|
id = int(id)
|
||||||
except:
|
except:
|
||||||
|
@ -118,8 +113,7 @@ def get_account(id, v=None, graceful=False, include_blocks=False, include_shadow
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
def get_post(i, v=None, graceful=False):
|
def get_post(i, v=None, graceful=False) -> Optional[Submission]:
|
||||||
|
|
||||||
try: i = int(i)
|
try: i = int(i)
|
||||||
except: abort(404)
|
except: abort(404)
|
||||||
|
|
||||||
|
@ -167,8 +161,7 @@ def get_post(i, v=None, graceful=False):
|
||||||
return x
|
return x
|
||||||
|
|
||||||
|
|
||||||
def get_posts(pids, v=None):
|
def get_posts(pids, v=None) -> list[Submission]:
|
||||||
|
|
||||||
if not pids:
|
if not pids:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
@ -210,8 +203,7 @@ def get_posts(pids, v=None):
|
||||||
|
|
||||||
return sorted(output, key=lambda x: pids.index(x.id))
|
return sorted(output, key=lambda x: pids.index(x.id))
|
||||||
|
|
||||||
def get_comment(i, v=None, graceful=False):
|
def get_comment(i, v=None, graceful=False) -> Optional[Comment]:
|
||||||
|
|
||||||
try: i = int(i)
|
try: i = int(i)
|
||||||
except: abort(404)
|
except: abort(404)
|
||||||
|
|
||||||
|
@ -246,8 +238,7 @@ def get_comment(i, v=None, graceful=False):
|
||||||
return comment
|
return comment
|
||||||
|
|
||||||
|
|
||||||
def get_comments(cids, v=None, load_parent=False):
|
def get_comments(cids, v=None, load_parent=False) -> list[Comment]:
|
||||||
|
|
||||||
if not cids: return []
|
if not cids: return []
|
||||||
|
|
||||||
if v:
|
if v:
|
||||||
|
@ -295,7 +286,7 @@ def get_comments(cids, v=None, load_parent=False):
|
||||||
|
|
||||||
return sorted(output, key=lambda x: cids.index(x.id))
|
return sorted(output, key=lambda x: cids.index(x.id))
|
||||||
|
|
||||||
def get_sub_by_name(sub, v=None, graceful=False):
|
def get_sub_by_name(sub, v=None, graceful=False) -> Optional[Sub]:
|
||||||
if not sub:
|
if not sub:
|
||||||
if graceful: return None
|
if graceful: return None
|
||||||
else: abort(404)
|
else: abort(404)
|
||||||
|
@ -309,8 +300,7 @@ def get_sub_by_name(sub, v=None, graceful=False):
|
||||||
else: abort(404)
|
else: abort(404)
|
||||||
return sub
|
return sub
|
||||||
|
|
||||||
def get_domain(s):
|
def get_domain(s) -> Optional[BannedDomain]:
|
||||||
|
|
||||||
parts = s.split(".")
|
parts = s.split(".")
|
||||||
domain_list = set()
|
domain_list = set()
|
||||||
for i in range(len(parts)):
|
for i in range(len(parts)):
|
||||||
|
|
Loading…
Reference in New Issue