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

fdsfs

Browse source
This commit is contained in:
Aevann1 2021-09-20 23:19:33 +02:00
parent f5fc328480
commit 5d25491c65
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
files/classes/submission.py
View file

@ -512,14 +512,4 @@ class SaveRelationship(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"))
submission_id=Column(Integer, ForeignKey("submissions.id")) submission_id=Column(Integer, ForeignKey("submissions.id"))
type=Column(Integer) type=Column(Integer)
@property
@lazy
def created_date(self):
return time.strftime("%d %B %Y", time.gmtime(self.created_utc))
@property
@lazy
def created_datetime(self):
return str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(self.created_utc)))

5
files/classes/user.py
View file

@ -559,9 +559,7 @@ class User(Base):
@lazy @lazy
def saved_idlist(self, page=1): def saved_idlist(self, page=1):
posts = g.db.query(Submission.id).options(lazyload('*')).options(lazyload('*')).filter_by(is_banned=False, posts = g.db.query(Submission.id).options(lazyload('*')).options(lazyload('*')).filter_by(is_banned=False, deleted_utc=0)
deleted_utc=0
)
saved = [x[0] for x in g.db.query(SaveRelationship.submission_id).options(lazyload('*')).filter(SaveRelationship.user_id == self.id).all()] saved = [x[0] for x in g.db.query(SaveRelationship.submission_id).options(lazyload('*')).filter(SaveRelationship.user_id == self.id).all()]
posts = posts.filter(Submission.id.in_(saved)) posts = posts.filter(Submission.id.in_(saved))
@ -583,6 +581,7 @@ class User(Base):
return [x[0] for x in posts.offset(25 * (page - 1)).limit(26).all()] return [x[0] for x in posts.offset(25 * (page - 1)).limit(26).all()]
@lazy
def saved_comment_idlist(self, page=1): def saved_comment_idlist(self, page=1):
comments = g.db.query(Comment.id).options(lazyload('*')).options(lazyload('*')).filter_by(is_banned=False, deleted_utc=0) comments = g.db.query(Comment.id).options(lazyload('*')).options(lazyload('*')).filter_by(is_banned=False, deleted_utc=0)