From 876a6c1f448f59c067e7a529bb0163e363a4be7b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 23 Dec 2021 15:39:12 +0200 Subject: [PATCH] fsdfsd --- Drama rules.html | 3 --- files/helpers/const.py | 3 --- files/routes/settings.py | 14 -------------- files/templates/settings_profile.html | 4 ++-- files/templates/userpage.html | 12 ++---------- 5 files changed, 4 insertions(+), 32 deletions(-) diff --git a/Drama rules.html b/Drama rules.html index bd24cfcc6..c45e601cc 100644 --- a/Drama rules.html +++ b/Drama rules.html @@ -1,6 +1,3 @@ - - - The providers ("we", "us", "our") of the service provided by this web site ("rDrama.net") are not responsible for any user-generated content and accounts. Content submitted express the views of their author only.

You agree to not use rDrama.net to submit or link to any content which violates any laws. You are entirely responsible for the content of, and any harm resulting from, that content or your conduct.

diff --git a/files/helpers/const.py b/files/helpers/const.py index e901ef531..c35c78de2 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -125,7 +125,6 @@ if 'rdrama.net' in SITE: CARP_ID = 995 JOAN_ID = 28 AEVANN_ID = 1 - KLEN_ID = 2050 LAWLZ_ID = 3833 LLM_ID = 253 DAD_ID = 2513 @@ -150,7 +149,6 @@ elif SITE == "pcmemes.net": CARP_ID = 0 JOAN_ID = 0 AEVANN_ID = 1 - KLEN_ID = 0 LAWLZ_ID = 0 LLM_ID = 0 DAD_ID = 0 @@ -175,7 +173,6 @@ else: CARP_ID = 0 JOAN_ID = 0 AEVANN_ID = 0 - KLEN_ID = 0 LAWLZ_ID = 0 LLM_ID = 0 DAD_ID = 0 diff --git a/files/routes/settings.py b/files/routes/settings.py index 665b382ee..a96f80974 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -361,20 +361,6 @@ def settings_profile_post(v): if len(bio_html) > 10000: abort(400) - if v.id == KLEN_ID: - notify_users = NOTIFY_USERS(friends_html, v.id) - soup = BeautifulSoup(friends_html, features="html.parser") - for mention in soup.find_all("a", href=re.compile("^/@(\w+)")): - username = mention["href"].split("@")[1] - 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) - - cid = notif_comment(f"@{v.username} has added you to their friends list!") - - for x in notify_users: - add_notif(cid, x) - - v.bio = bio[:1500] v.bio_html=bio_html g.db.add(v) diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index df347aefe..ede61f6d4 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -542,7 +542,7 @@
- +
@@ -579,7 +579,7 @@
- +
diff --git a/files/templates/userpage.html b/files/templates/userpage.html index ff2d90d65..95526842b 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -119,22 +119,14 @@ {% if u.bio_html %}

-					{% if 'rdrama.net' in request.host and u.id == 2050 %}
-						
{{u.friends_html | safe}}
- {% else %} -
{{u.bio_html | safe}}
- {% endif %} +
{{u.bio_html | safe}}
{% else %}

No bio...

{% endif %} {% if u.friends_html %}

Friends:

- {% if 'rdrama.net' in request.host and u.id == 2050 %} - {{u.bio_html | safe}} - {% else %} - {{u.friends_html | safe}} - {% endif %} + {{u.friends_html | safe}} {% endif %} {% if u.enemies_html %}