rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

remotes/1693045480750635534/spooky-22
Aevann1 2022-04-10 16:27:48 +00:00
parent 59347a0d17 c0c0b3a134
commit 88e47b22dd
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/helpers/const.py
View File

@ -731,8 +731,6 @@ snappy_url_regex = re.compile('<a href=\"(https?:\/\/[a-z]{1,20}\.[\w:~,()\-.#&\
email_regex = re.compile('([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,100})+', flags=re.A)
reddit_post_regex = re.compile('https:\/\/old\.reddit\.com\/r\/\w{1,30}\/comments\/([a-z0-9]+)(\/\w{0,100})?', flags=re.A)
utm_regex = re.compile('utm_[a-z]+=[a-z0-9_]+&', flags=re.A)
utm_regex2 = re.compile('[?&]utm_[a-z]+=[a-z0-9_]+', flags=re.A)

10
files/routes/posts.py
View File

@ -517,7 +517,7 @@ def edit_post(pid, v):
p.body = body
if len(body_html) > 40000: return {"error":"Submission body too long!"}, 400
if len(body_html) > 40000: return {"error":"Submission body_html too long! (max 40k characters)"}, 400
p.body_html = body_html
@ -844,9 +844,6 @@ def api_is_repost():
url = urlunparse(new_url)
if url.endswith('/'): url = url[:-1]
if reddit_post_regex.fullmatch(url):
url = reddit_post_regex.sub(r'https://old.reddit.com/\1', url)
search_url = url.replace('%', '').replace('\\', '').replace('_', '\_').strip()
repost = g.db.query(Submission).filter(
@ -947,9 +944,6 @@ def submit_post(v, sub=None):
url = urlunparse(new_url)
if url.endswith('/'): url = url[:-1]
if reddit_post_regex.fullmatch(url):
url = reddit_post_regex.sub(r'https://old.reddit.com/\1', url)
search_url = url.replace('%', '').replace('\\', '').replace('_', '\_').strip()
repost = g.db.query(Submission).filter(
@ -1105,7 +1099,7 @@ def submit_post(v, sub=None):
if v.marseyawarded and marseyaward_body_regex.search(body_html):
return {"error":"You can only type marseys!"}, 403
if len(body_html) > 40000: return error("Submission body too long!")
if len(body_html) > 40000: return error("Submission body_html too long! (max 40k characters)")
bans = filter_comment_html(body_html)
if bans: