diff --git a/files/routes/comments.py b/files/routes/comments.py index ae46d7328..7dab9975e 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -535,8 +535,8 @@ def api_comment(v): if user.id != v.id: notify_users.add(user.id) if request.host == 'rdrama.net': - if 'aevann' in body_html.lower() and 1 not in notify_users: notify_users.add(1) - if 'joan' in body_html.lower() and 28 not in notify_users: notify_users.add(28) + if ('aevan' in body_html.lower() or 'avean' in body_html.lower()) and 1 not in notify_users: notify_users.add(1) + if ('joan' in body_html.lower() or 'pewkie' in body_html.lower()) and 28 not in notify_users: notify_users.add(28) if 'carp' in body_html.lower() and 995 not in notify_users: notify_users.add(995) notify_users.add(541) @@ -786,8 +786,8 @@ def edit_comment(cid, v): if user.id != v.id: notify_users.add(user.id) if request.host == 'rdrama.net': - if 'aevann' in body_html.lower() and 1 not in notify_users: notify_users.add(1) - if 'joan' in body_html.lower() and 28 not in notify_users: notify_users.add(28) + if ('aevan' in body_html.lower() or 'avean' in body_html.lower()) and 1 not in notify_users: notify_users.add(1) + if ('joan' in body_html.lower() or 'pewkie' in body_html.lower()) and 28 not in notify_users: notify_users.add(28) if 'carp' in body_html.lower() and 995 not in notify_users: notify_users.add(995) notify_users.add(541) diff --git a/files/routes/posts.py b/files/routes/posts.py index c6327890b..9e4cb06fa 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -68,8 +68,8 @@ def publish(pid, v): if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id) if request.host == 'rdrama.net': - if 'aevann' in f'{post.body_html}{post.title}'.lower() and 1 not in notify_users: notify_users.add(1) - if 'joan' in f'{post.body_html}{post.title}'.lower() and 28 not in notify_users: notify_users.add(28) + if ('aevan' in f'{post.body_html}{post.title}'.lower() or 'avean' in f'{post.body_html}{post.title}'.lower()) and 1 not in notify_users: notify_users.add(1) + if ('joan' in f'{post.body_html}{post.title}'.lower() or 'pewkie' in f'{post.body_html}{post.title}'.lower()) and 28 not in notify_users: notify_users.add(28) if 'carp' in f'{post.body_html}{post.title}'.lower() and 995 not in notify_users: notify_users.add(995) notify_users.add(541) @@ -343,8 +343,8 @@ def edit_post(pid, v): message = f"@{v.username} has mentioned you: http://{site}{p.permalink}" if request.host == 'rdrama.net': - if 'aevann' in f'{body_html}{title}'.lower() and 1 not in notify_users: notify_users.add(1) - if 'joan' in f'{body_html}{title}'.lower() and 28 not in notify_users: notify_users.add(28) + if ('aevan' in f'{body_html}{title}'.lower() or 'avean' in f'{body_html}{title}'.lower()) and 1 not in notify_users: notify_users.add(1) + if ('joan' in f'{body_html}{title}'.lower() or 'pewkie' in f'{body_html}{title}'.lower()) and 28 not in notify_users: notify_users.add(28) if 'carp' in f'{body_html}{title}'.lower() and 995 not in notify_users: notify_users.add(995) notify_users.add(541) @@ -803,8 +803,8 @@ def submit_post(v): if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id) if request.host == 'rdrama.net': - if 'aevann' in f'{body_html}{title}'.lower() and 1 not in notify_users: notify_users.add(1) - if 'joan' in f'{body_html}{title}'.lower() and 28 not in notify_users: notify_users.add(28) + if ('aevan' in f'{body_html}{title}'.lower() or 'avean' in f'{body_html}{title}'.lower()) and 1 not in notify_users: notify_users.add(1) + if ('joan' in f'{body_html}{title}'.lower() or 'pewkie' in f'{body_html}{title}'.lower()) and 28 not in notify_users: notify_users.add(28) if 'carp' in f'{body_html}{title}'.lower() and 995 not in notify_users: notify_users.add(995) notify_users.add(541) diff --git a/files/routes/settings.py b/files/routes/settings.py index 3adf80591..e808b9f7a 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -236,7 +236,7 @@ def settings_profile_post(v): user = g.db.query(User).filter_by(username=username).first() if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id) - if request.host == 'rdrama.net' and 'aevann' in friends_html.lower() and 1 not in notify_users: notify_users.add(1) + if request.host == 'rdrama.net' and ('aevan' in friends_html.lower() or 'avean' in friends_html.lower()) and 1 not in notify_users: notify_users.add(1) for x in notify_users: message = f"@{v.username} has added you to their friends list!" @@ -281,7 +281,7 @@ def settings_profile_post(v): user = g.db.query(User).filter_by(username=username).first() if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id) - if request.host == 'rdrama.net' and 'aevann' in enemies_html.lower() and 1 not in notify_users: notify_users.add(1) + if request.host == 'rdrama.net' and ('aevan' in enemies_html.lower() or 'avean' in enemies_html.lower()) and 1 not in notify_users: notify_users.add(1) for x in notify_users: message = f"@{v.username} has added you to their enemies list!"