diff --git a/files/routes/comments.py b/files/routes/comments.py index eae28e7edd..ce57540e5a 100755 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -156,7 +156,7 @@ def api_comment(v): body = body.strip() if v.marseyawarded: - marregex = list(re.finditer("^(:!?mar\w+:\s*)+$", body)) + marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You need to only type marseys!"}, 403 if not body and not request.files.get('file'): return {"error":"You need to actually write something!"}, 400 @@ -590,7 +590,7 @@ def edit_comment(cid, v): body = request.values.get("body", "").strip()[:10000] if v.marseyawarded: - marregex = list(re.finditer("^(:!?mar\w+:\s*)+$", body)) + marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You need to only type marseys!"}, 403 for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|webp|PNG|JPG|JPEG|GIF|WEBP|9999))', body, re.MULTILINE): diff --git a/files/routes/posts.py b/files/routes/posts.py index b3ed5a6f09..ec3e73f82b 100755 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -215,8 +215,11 @@ def edit_post(pid, v): body = request.values.get("body", "").strip() if v.marseyawarded: - marregex = list(re.finditer("^(:!?mar\w+:\s*)+$", body)) + title = list(re.finditer("^(:!?m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You need to only type marseys!"}, 403 + if body: + marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) + if len(marregex) == 0: return {"error":"You need to only type marseys!"}, 403 if title != p.title: p.title = title @@ -567,8 +570,11 @@ def submit_post(v): body = request.values.get("body", "").strip() if v.marseyawarded: - marregex = list(re.finditer("^(:!?mar\w+:\s*)+$", body)) + title = list(re.finditer("^(:!?m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You need to only type marseys!"}, 403 + if body: + marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) + if len(marregex) == 0: return {"error":"You need to only type marseys!"}, 403 dup = g.db.query(Submission).options(lazyload('*')).filter( Submission.author_id == v.id,