diff --git a/files/routes/comments.py b/files/routes/comments.py index 3c34386dc..77f441237 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -195,7 +195,7 @@ def api_comment(v): body += f"\n\n![]({url})" - if v.agendaposter: + if v.agendaposter and not v.marseyawarded: for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l) body = body.replace('I ', f'@{v.username} ') body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ') @@ -649,7 +649,7 @@ def edit_comment(cid, v): for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|webp|PNG|JPG|JPEG|GIF|WEBP|9999))', body, re.MULTILINE): if "wikipedia" not in i.group(1): body = body.replace(i.group(1), f'![]({i.group(1)})') - if v.agendaposter: + if v.agendaposter and not v.marseyawarded: for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l) body = body.replace('I ', f'@{v.username} ') body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ') diff --git a/files/routes/posts.py b/files/routes/posts.py index aa64f9ec3..7774805e9 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -249,7 +249,7 @@ def edit_post(pid, v): elif len(body) > 140: return {"error":"You have to type less than 140 characters!"}, 403 if title != p.title: - if v.agendaposter: + if v.agendaposter and not v.marseyawarded: for k, l in AJ_REPLACEMENTS.items(): title = title.replace(k, l) title = title.replace('I ', f'@{v.username} ') title = censor_slurs2(title).upper().replace(' ME ', f' @{v.username} ') @@ -263,7 +263,7 @@ def edit_post(pid, v): for i in re.finditer('^(https:\/\/.*\.(png|jpg|jpeg|gif|webp|PNG|JPG|JPEG|GIF|WEBP|9999))', body, re.MULTILINE): if "wikipedia" not in i.group(1): body = body.replace(i.group(1), f'![]({i.group(1)})') - if v.agendaposter: + if v.agendaposter and not v.marseyawarded: for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l) body = body.replace('I ', f'@{v.username} ') body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ') @@ -546,7 +546,7 @@ def submit_post(v): title = request.values.get("title", "").strip() url = request.values.get("url", "").strip() - if v.agendaposter: + if v.agendaposter and not v.marseyawarded: for k, l in AJ_REPLACEMENTS.items(): title = title.replace(k, l) title = title.replace('I ', f'@{v.username} ') title = censor_slurs2(title).upper().replace(' ME ', f' @{v.username} ') @@ -730,7 +730,7 @@ def submit_post(v): options.append(i.group(1)) body = body.replace(i.group(0), "") - if v.agendaposter: + if v.agendaposter and not v.marseyawarded: for k, l in AJ_REPLACEMENTS.items(): body = body.replace(k, l) body = body.replace('I ', f'@{v.username} ') body = censor_slurs2(body).upper().replace(' ME ', f' @{v.username} ')