skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fsdfsd

Browse source
This commit is contained in:
Aevann1 2021-12-13 23:27:25 +02:00
parent adb855fd44
commit 68b4c603ab
8 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
files/classes/submission.py
View file

@ -32,7 +32,6 @@ class Submission(Base):
views = Column(Integer, default=0) views = Column(Integer, default=0)
deleted_utc = Column(Integer, default=0) deleted_utc = Column(Integer, default=0)
distinguish_level = Column(Integer, default=0) distinguish_level = Column(Integer, default=0)
created_str = Column(String)
stickied = Column(String) stickied = Column(String)
is_pinned = Column(Boolean, default=False) is_pinned = Column(Boolean, default=False)
private = Column(Boolean, default=False) private = Column(Boolean, default=False)
@ -60,14 +59,6 @@ class Submission(Base):
awards = relationship("AwardRelationship", viewonly=True) awards = relationship("AwardRelationship", viewonly=True)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if "created_utc" not in kwargs:
kwargs["created_utc"] = int(time.time())
kwargs["created_str"] = time.strftime(
"%I:%M %p on %d %b %Y", time.gmtime(
kwargs["created_utc"]))
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
def __repr__(self): def __repr__(self):

4
files/helpers/const.py
View file

File diff suppressed because one or more lines are too long

6
files/routes/posts.py
View file

@ -53,6 +53,7 @@ def publish(pid, v):
post = get_post(pid) post = get_post(pid)
if not post.author_id == v.id: abort(403) if not post.author_id == v.id: abort(403)
post.private = False post.private = False
post.created_utc = int(time.time())
g.db.add(post) g.db.add(post)
notify_users = NOTIFY_USERS(f'{post.body_html}{post.title}', v.id) notify_users = NOTIFY_USERS(f'{post.body_html}{post.title}', v.id)
@ -97,7 +98,7 @@ def post_id(pid, anything=None, v=None):
try: pid = int(pid) try: pid = int(pid)
except Exception as e: pass except Exception as e: pass
if request.host == 'rdrama.net' and pid in [BUG_THREAD, EMOJI_THREAD]: defaultsortingcomments = 'new' if 'rdrama.net' in request.host and pid in [BUG_THREAD, EMOJI_THREAD]: defaultsortingcomments = 'new'
elif v: defaultsortingcomments = v.defaultsortingcomments elif v: defaultsortingcomments = v.defaultsortingcomments
else: defaultsortingcomments = "top" else: defaultsortingcomments = "top"
@ -958,7 +959,8 @@ def submit_post(v):
body_html=body_html, body_html=body_html,
embed_url=embed, embed_url=embed,
title=title[:500], title=title[:500],
title_html=title_html title_html=title_html,
created_utc=int(time.time())
) )
g.db.add(new_post) g.db.add(new_post)

10
files/routes/users.py
View file

@ -209,13 +209,13 @@ def transfer_coins(v, username):
if not v.patron and not receiver.patron: if not v.patron and not receiver.patron:
tax = math.ceil(amount*0.03) tax = math.ceil(amount*0.03)
tax_receiver = g.db.query(User).filter_by(id=TAX_RECEIVER_ID).first() tax_receiver = g.db.query(User).filter_by(id=TAX_RECEIVER_ID).first()
if request.host == 'rdrama.net': tax_receiver.coins += tax/3 if 'rdrama.net' in request.host: tax_receiver.coins += tax/3
else: tax_receiver.coins += tax else: tax_receiver.coins += tax
log_message = f"[@{v.username}]({v.url}) has transferred {amount} {app.config['COINS_NAME']} to [@{receiver.username}]({receiver.url})" log_message = f"[@{v.username}]({v.url}) has transferred {amount} {app.config['COINS_NAME']} to [@{receiver.username}]({receiver.url})"
send_notification(TAX_RECEIVER_ID, log_message) send_notification(TAX_RECEIVER_ID, log_message)
g.db.add(tax_receiver) g.db.add(tax_receiver)
if request.host == 'rdrama.net': if 'rdrama.net' in request.host:
carp = g.db.query(User).filter_by(id=CARP_ID).first() carp = g.db.query(User).filter_by(id=CARP_ID).first()
carp.coins += tax/3 carp.coins += tax/3
log_message = f"[@{v.username}]({v.url}) has transferred {amount} {app.config['COINS_NAME']} to [@{receiver.username}]({receiver.url})" log_message = f"[@{v.username}]({v.url}) has transferred {amount} {app.config['COINS_NAME']} to [@{receiver.username}]({receiver.url})"
@ -493,7 +493,7 @@ def redditor_moment_redirect(username):
@auth_required @auth_required
def followers(username, v): def followers(username, v):
u = get_user(username, v=v) u = get_user(username, v=v)
# if request.host == 'rdrama.net' and u.id == 147: abort(404) # if 'rdrama.net' in request.host and u.id == 147: abort(404)
ids = [x[0] for x in g.db.query(Follow.user_id).filter_by(target_id=u.id).all()] ids = [x[0] for x in g.db.query(Follow.user_id).filter_by(target_id=u.id).all()]
users = g.db.query(User).filter(User.id.in_(ids)).all() users = g.db.query(User).filter(User.id.in_(ids)).all()
return render_template("followers.html", v=v, u=u, users=users) return render_template("followers.html", v=v, u=u, users=users)
@ -502,7 +502,7 @@ def followers(username, v):
@auth_required @auth_required
def following(username, v): def following(username, v):
u = get_user(username, v=v) u = get_user(username, v=v)
# if request.host == 'rdrama.net' and u.id == 147: abort(404) # if 'rdrama.net' in request.host and u.id == 147: abort(404)
ids = [x[0] for x in g.db.query(Follow.target_id).filter_by(user_id=u.id).all()] ids = [x[0] for x in g.db.query(Follow.target_id).filter_by(user_id=u.id).all()]
users = g.db.query(User).filter(User.id.in_(ids)).all() users = g.db.query(User).filter(User.id.in_(ids)).all()
return render_template("following.html", v=v, u=u, users=users) return render_template("following.html", v=v, u=u, users=users)
@ -510,7 +510,7 @@ def following(username, v):
@app.get("/views") @app.get("/views")
@auth_required @auth_required
def visitors(v): def visitors(v):
if request.host == 'rdrama.net' and v.admin_level < 1 and not v.patron: return render_template("errors/patron.html", v=v) if 'rdrama.net' in request.host and v.admin_level < 1 and not v.patron: return render_template("errors/patron.html", v=v)
viewers=sorted(v.viewers, key = lambda x: x.last_view_utc, reverse=True) viewers=sorted(v.viewers, key = lambda x: x.last_view_utc, reverse=True)
return render_template("viewers.html", v=v, viewers=viewers) return render_template("viewers.html", v=v, viewers=viewers)

4
files/templates/settings_profile.html
View file

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

4
files/templates/userpage.html
View file

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

1
schema.sql
View file

@ -560,7 +560,6 @@ CREATE TABLE public.submissions (
is_banned boolean, is_banned boolean,
over_18 boolean, over_18 boolean,
distinguish_level integer, distinguish_level integer,
created_str character varying(255),
deleted_utc integer NOT NULL, deleted_utc integer NOT NULL,
domain_ref integer, domain_ref integer,
is_approved integer NOT NULL, is_approved integer NOT NULL,

4
setup
View file

@ -11,8 +11,8 @@ sudo apt -y install python3-pip
sudo pip3 install -r requirements.txt sudo pip3 install -r requirements.txt
sudo apt -y install gunicorn sudo apt -y install gunicorn
sudo apt -y install ffmpeg sudo apt -y install ffmpeg
mkdir /drama/songs mkdir /songs
mkdir /drama/images mkdir /images
cp ./env /env cp ./env /env
. /env . /env
gunicorn files.__main__:app -k gevent -w 2 --reload -b localhost:80 --max-requests 1000 --max-requests-jitter 500 gunicorn files.__main__:app -k gevent -w 2 --reload -b localhost:80 --max-requests 1000 --max-requests-jitter 500