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

gf

Browse source
This commit is contained in:
Aevann1 2022-02-16 02:23:46 +02:00
parent 817d63b033
commit 6721538b81
7 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/classes/comment.py
View file

@ -450,10 +450,14 @@ class Notification(Base):
user_id = Column(Integer, ForeignKey("users.id")) user_id = Column(Integer, ForeignKey("users.id"))
comment_id = Column(Integer, ForeignKey("comments.id")) comment_id = Column(Integer, ForeignKey("comments.id"))
read = Column(Boolean, default=False) read = Column(Boolean, default=False)
created_utc = Column(Integer)
comment = relationship("Comment", viewonly=True) comment = relationship("Comment", viewonly=True)
user = relationship("User", viewonly=True) user = relationship("User", viewonly=True)
def __repr__(self): def __init__(self, *args, **kwargs):
if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
super().__init__(*args, **kwargs)
def __repr__(self):
return f"<Notification(id={self.id})>" return f"<Notification(id={self.id})>"

12
files/classes/flags.py
View file

@ -13,11 +13,15 @@ class Flag(Base):
post_id = Column(Integer, ForeignKey("submissions.id")) post_id = Column(Integer, ForeignKey("submissions.id"))
user_id = Column(Integer, ForeignKey("users.id")) user_id = Column(Integer, ForeignKey("users.id"))
reason = Column(String) reason = Column(String)
created_utc = Column(Integer)
user = relationship("User", primaryjoin = "Flag.user_id == User.id", uselist = False, viewonly=True) user = relationship("User", primaryjoin = "Flag.user_id == User.id", uselist = False, viewonly=True)
def __repr__(self): def __init__(self, *args, **kwargs):
if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
super().__init__(*args, **kwargs)
def __repr__(self):
return f"<Flag(id={self.id})>" return f"<Flag(id={self.id})>"
@property @property
@ -43,11 +47,15 @@ class CommentFlag(Base):
user_id = Column(Integer, ForeignKey("users.id")) user_id = Column(Integer, ForeignKey("users.id"))
comment_id = Column(Integer, ForeignKey("comments.id")) comment_id = Column(Integer, ForeignKey("comments.id"))
reason = Column(String) reason = Column(String)
created_utc = Column(Integer)
user = relationship("User", primaryjoin = "CommentFlag.user_id == User.id", uselist = False, viewonly=True) user = relationship("User", primaryjoin = "CommentFlag.user_id == User.id", uselist = False, viewonly=True)
def __repr__(self): def __init__(self, *args, **kwargs):
if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
super().__init__(*args, **kwargs)
def __repr__(self):
return f"<CommentFlag(id={self.id})>" return f"<CommentFlag(id={self.id})>"
@property @property

2
files/classes/subscriptions.py
View file

@ -22,11 +22,13 @@ class Follow(Base):
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) user_id = Column(Integer, ForeignKey("users.id"))
target_id = Column(Integer, ForeignKey("users.id")) target_id = Column(Integer, ForeignKey("users.id"))
created_utc = Column(Integer)
user = relationship("User", uselist=False, primaryjoin="User.id==Follow.user_id", viewonly=True) user = relationship("User", uselist=False, primaryjoin="User.id==Follow.user_id", viewonly=True)
target = relationship("User", primaryjoin="User.id==Follow.target_id", viewonly=True) target = relationship("User", primaryjoin="User.id==Follow.target_id", viewonly=True)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time())
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
def __repr__(self): def __repr__(self):

2
files/helpers/sanitize.py
View file

@ -95,7 +95,7 @@ def sanitize_marquee(tag, name, value):
return False return False
allowed_attributes = { allowed_attributes = {
'*': ['href', 'style', 'src', 'class', 'title'], '*': ['href', 'style', 'src', 'class', 'title', 'alt', 'loading'],
'marquee': sanitize_marquee} 'marquee': sanitize_marquee}
allowed_protocols = ['http', 'https'] allowed_protocols = ['http', 'https']

3
files/routes/users.py
View file

@ -397,8 +397,7 @@ def get_css(username):
return resp return resp
@app.get("/@<username>/profilecss") @app.get("/@<username>/profilecss")
@auth_required def get_profilecss(username):
def get_profilecss(v, username):
user = get_user(username) user = get_user(username)
if user.profilecss: profilecss = user.profilecss if user.profilecss: profilecss = user.profilecss
else: profilecss = "" else: profilecss = ""

4
files/templates/header.html
View file

@ -132,8 +132,8 @@
<div><img alt="your profile picture" loading="lazy" src="{{v.profile_url}}" class="profile-pic-35"></div> <div><img alt="your profile picture" loading="lazy" src="{{v.profile_url}}" class="profile-pic-35"></div>
<div class="text-left pl-2"> <div class="text-left pl-2">
<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}}"{% endif %}>{{v.username}}</span></div> <div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.patron %}patron{% endif %}"><span {% if v.patron %}class="patron" style="background-color:#{{v.namecolor}}"{% endif %}>{{v.username}}</span></div>
<div class="text-small-extra"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/static/assets/images/marseycoin.webp?a=1008" data-bs-original-title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span> Coins</div> <div class="text-small-extra"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" width="16" src="/static/assets/images/marseycoin.webp?a=1008" data-bs-original-title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span> Coins</div>
<div class="text-small-extra"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" src="/static/assets/images/marseybux.webp?a=1008" data-bs-original-title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span> Marseybux</div> <div class="text-small-extra"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" height="13" width="30" src="/static/assets/images/marseybux.webp?a=1008" data-bs-original-title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span> Marseybux</div>
</div> </div>
</div> </div>
</a> </a>

8
files/templates/userpage.html
View file

@ -107,10 +107,10 @@
<div class="font-weight-bolder"> <div class="font-weight-bolder">
<span id="profile-coins-amount">{{u.coins}}</span> <span id="profile-coins-amount">{{u.coins}}</span>
<img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="coins" height="20" src="/static/assets/images/marseycoin.webp?a=1008">&nbsp;&nbsp; <img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="coins" height="20" width="24.4" src="/static/assets/images/marseycoin.webp?a=1008">&nbsp;&nbsp;
<span id="profile-bux-amount">{{u.procoins}}</span> <span id="profile-bux-amount">{{u.procoins}}</span>
<img alt="marseybux" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Marseybux" height="20" src="/static/assets/images/marseybux.webp?a=1008">&nbsp;&nbsp; <img alt="marseybux" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Marseybux" height="20" width="46" src="/static/assets/images/marseybux.webp?a=1008">&nbsp;&nbsp;
<a href="/@{{u.username}}/followers">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; <a href="/@{{u.username}}/followers">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp;
@ -397,10 +397,10 @@
<div class="font-weight-normal"> <div class="font-weight-normal">
<span id="profile-coins-amount-mobile" class="font-weight-bold">{{u.coins}}</span> <span id="profile-coins-amount-mobile" class="font-weight-bold">{{u.coins}}</span>
<img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="coins" height="15" src="/static/assets/images/marseycoin.webp?a=1008">&nbsp;&nbsp; <img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="coins" height="15" width="18.3" src="/static/assets/images/marseycoin.webp?a=1008">&nbsp;&nbsp;
<span id="profile-bux-amount-mobile" class="font-weight-bold">{{u.procoins}}</span> <span id="profile-bux-amount-mobile" class="font-weight-bold">{{u.procoins}}</span>
<img alt="marseybux" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Marseybux" height="15" src="/static/assets/images/marseybux.webp?a=1008">&nbsp;&nbsp; <img alt="marseybux" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Marseybux" height="15" width="35" src="/static/assets/images/marseybux.webp?a=1008">&nbsp;&nbsp;
<a href="/@{{u.username}}/followers" class="font-weight-bold">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; <a href="/@{{u.username}}/followers" class="font-weight-bold">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp;