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

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	drama/classes/__init__.py
#	drama/classes/user.py
#	drama/helpers/get.py
#	drama/templates/errors/402.html
#	drama/templates/errors/451.html
This commit is contained in:
fireworks88 2021-07-25 13:13:09 +02:00
commit 7cb3f0f01c
30 changed files with 89 additions and 483 deletions
Download patch file Download diff file Expand all files Collapse all files

31
drama/classes/submission.py
View file

@ -117,7 +117,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
comment_count = Column(Integer, server_default=FetchedValue())
score = deferred(Column(Float, server_default=FetchedValue()))
awards = relationship("AwardRelationship", lazy="joined")
#awards = relationship("AwardRelationship", lazy="joined")
rank_hot = deferred(Column(Float, server_default=FetchedValue()))
rank_fiery = deferred(Column(Float, server_default=FetchedValue()))
@ -330,7 +330,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
'score': self.score_fuzzed,
'upvotes': self.upvotes_fuzzed,
'downvotes': self.downvotes_fuzzed,
'award_count': self.award_count,
#'award_count': self.award_count,
'is_offensive': self.is_offensive,
'meta_title': self.meta_title,
'meta_description': self.meta_description,
@ -498,23 +498,6 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
self.submission_aux.meta_description=x
g.db.add(self.submission_aux)
def is_guildmaster(self, perm=None):
mod=self.__dict__.get('_is_guildmaster', False)
if not mod:
return False
elif not perm:
return True
else:
return mod.perm_full or mod.__dict__[f"perm_{perm}"]
return output
@property
def is_blocking_guild(self):
return self.__dict__.get('_is_blocking_guild', False)
@property
def is_blocked(self):
return self.__dict__.get('_is_blocked', False)
@ -523,10 +506,6 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
def is_blocking(self):
return self.__dict__.get('_is_blocking', False)
@property
def is_subscribed(self):
return self.__dict__.get('_is_subscribed', False)
@property
def is_public(self):
return self.post_public or not self.board.is_private
@ -539,9 +518,9 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
def report_count(self):
return len(self.reports)
@property
def award_count(self):
return len(self.awards)
#@property
#def award_count(self):
#return len(self.awards)
@property
def embed_template(self):