carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fsdfsd

master
Aevann1 2021-12-23 15:39:12 +02:00
parent 9416852615
commit 876a6c1f44
5 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Drama rules.html
View File

@ -1,6 +1,3 @@
<!-- aevann i swear to fuck -->
<!-- written by @Q for free -->
<!-- Joan made some changes to simplify things -->
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.<br><br>
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.<br><br>

3
files/helpers/const.py
View File

@ -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

14
files/routes/settings.py
View File

@ -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)

4
files/templates/settings_profile.html
View File

@ -542,7 +542,7 @@
<div class="body d-lg-flex border-bottom">
<label class="text-black w-lg-25">{% if 'rdrama.net' in request.host and v.id == 2050 %}Friends{% else %}Bio{% endif %}</label>
<label class="text-black w-lg-25">Bio</label>
<div class="w-lg-100">
<form id="profile-bio" action="/settings/profile" method="post" enctype="multipart/form-data">
@ -579,7 +579,7 @@
<div class="body d-lg-flex border-bottom">
<label class="text-black w-lg-25">{% if 'rdrama.net' in request.host and v.id == 2050 %}Bio{% else %}Friends{% endif %}</label>
<label class="text-black w-lg-25">Friends</label>
<div class="w-lg-100">
<form id="profile-friends" action="/settings/profile" method="post" enctype="multipart/form-data">

12
files/templates/userpage.html
View File

@ -119,22 +119,14 @@
{% if u.bio_html %}
<pre></pre>
{% if 'rdrama.net' in request.host and u.id == 2050 %}
<div class="text-muted font-weight-bolder">{{u.friends_html | safe}}</div>
{% else %}
<div class="text-muted font-weight-bolder">{{u.bio_html | safe}}</div>
{% endif %}
<div class="text-muted font-weight-bolder">{{u.bio_html | safe}}</div>
{% else %}
<p class="text-muted">No bio...</p>
{% endif %}
{% if u.friends_html %}
<p class="text-muted font-weight-bold">Friends:</p>
{% 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 %}