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

fds

master
Aevann1 2022-01-06 21:09:37 +02:00
parent 4f314382ac
commit ea8ed285de
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/classes/comment.py
View File

@ -10,6 +10,7 @@ from files.classes.votes import CommentVote
from files.helpers.const import AUTOPOLLER_ID, AUTOBETTER_ID, censor_slurs from files.helpers.const import AUTOPOLLER_ID, AUTOBETTER_ID, censor_slurs
from files.helpers.lazy import lazy from files.helpers.lazy import lazy
from .flags import CommentFlag from .flags import CommentFlag
from .award import AwardRelationship
from random import randint from random import randint
site = environ.get("DOMAIN").strip() site = environ.get("DOMAIN").strip()
@ -52,7 +53,7 @@ class Comment(Base):
senttouser = relationship("User", primaryjoin="User.id==Comment.sentto", viewonly=True) senttouser = relationship("User", primaryjoin="User.id==Comment.sentto", viewonly=True)
parent_comment = relationship("Comment", remote_side=[id], viewonly=True) parent_comment = relationship("Comment", remote_side=[id], viewonly=True)
child_comments = relationship("Comment", remote_side=[parent_comment_id], viewonly=True) child_comments = relationship("Comment", remote_side=[parent_comment_id], viewonly=True)
awards = relationship("AwardRelationship", viewonly=True) awards = relationship("AwardRelationship", viewonly=True, order_by=AwardRelationship.id)
reports = relationship("CommentFlag", viewonly=True) reports = relationship("CommentFlag", viewonly=True)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

2
files/classes/submission.py
View File

@ -57,7 +57,7 @@ class Submission(Base):
author = relationship("User", primaryjoin="Submission.author_id==User.id") author = relationship("User", primaryjoin="Submission.author_id==User.id")
oauth_app = relationship("OauthApp", viewonly=True) oauth_app = relationship("OauthApp", viewonly=True)
approved_by = relationship("User", uselist=False, primaryjoin="Submission.is_approved==User.id", viewonly=True) approved_by = relationship("User", uselist=False, primaryjoin="Submission.is_approved==User.id", viewonly=True)
awards = relationship("AwardRelationship", viewonly=True, order_by=AwardRelationship.id.desc()) awards = relationship("AwardRelationship", viewonly=True, order_by=AwardRelationship.id)
reports = relationship("Flag", viewonly=True) reports = relationship("Flag", viewonly=True)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

2
files/templates/sidebar_Drama.html
View File

@ -1,5 +1,5 @@
<div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px"> <div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
<img alt="banner" src="/static/assets/images/{{'SITE_NAME' | app_config}}/banners/{{range(1,num_banners)|random()}}.webp?a=4" width=100%> <img alt="banner" src="/static/assets/images/{{'SITE_NAME' | app_config}}/banners/{{range(1,num_banners)|random()}}.webp?a=5" width=100%>
<a class="btn btn-primary btn-block mt-4" href="/submit">SUBMIT DRAMA!</a> <a class="btn btn-primary btn-block mt-4" href="/submit">SUBMIT DRAMA!</a>
<a class="btn btn-primary btn-block" href="/post/16583">EMOJI MEGATHREAD</a> <a class="btn btn-primary btn-block" href="/post/16583">EMOJI MEGATHREAD</a>
<a class="btn btn-primary btn-block" href="/post/18459">BUGS/SUGGESTIONS MEGATHREAD</a> <a class="btn btn-primary btn-block" href="/post/18459">BUGS/SUGGESTIONS MEGATHREAD</a>