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

dffd

Browse source
This commit is contained in:
Aevann1 2021-07-26 01:49:53 +02:00
parent 0c56720399
commit ee35a91d62
13 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drama/classes/award.py
View file

@ -28,8 +28,8 @@ class AwardRelationship(Base):
id = Column(Integer, primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"))
submission_id = Column(Integer, ForeignKey("submissions.id"), default=None)
comment_id = Column(Integer, ForeignKey("comments.id"), default=None)
submission_id = Column(Integer, ForeignKey("submissions.id"))
comment_id = Column(Integer, ForeignKey("comments.id"))
kind = Column(String(20))
user = relationship("User", primaryjoin="AwardRelationship.user_id==User.id", lazy="joined")

2
drama/classes/badges.py
View file

@ -15,7 +15,7 @@ class BadgeDef(Base):
icon = Column(String(64))
kind = Column(Integer, default=1)
rank = Column(Integer, default=1)
qualification_expr = Column(String(128), default=None)
qualification_expr = Column(String(128))
def __repr__(self):

2
drama/classes/clients.py
View file

@ -19,7 +19,7 @@ class OauthApp(Base, Stndrd):
redirect_uri = Column(String(4096))
author_id = Column(Integer, ForeignKey("users.id"))
is_banned = Column(Boolean, default=False)
description = Column(String(256), default=None)
description = Column(String(256))
author = relationship("User")

18
drama/classes/comment.py
View file

@ -14,7 +14,7 @@ class CommentAux(Base):
key_id = Column(Integer, primary_key=True)
id = Column(Integer, ForeignKey("comments.id"))
body = Column(String(10000), default=None)
body = Column(String(10000))
body_html = Column(String(20000))
ban_reason = Column(String(256), default='')
@ -52,12 +52,12 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
over_18 = Column(Boolean, default=False)
is_bot = Column(Boolean, default=False)
banaward = Column(String, default=None)
banaward = Column(String)
is_pinned = Column(Boolean, default=False)
creation_region=Column(String(2), default=None)
sentto=Column(Integer, default=None)
creation_region=Column(String(2))
sentto=Column(Integer)
app_id = Column(Integer, ForeignKey("oauth_apps.id"), default=None)
app_id = Column(Integer, ForeignKey("oauth_apps.id"))
oauth_app=relationship("OauthApp")
post = relationship("Submission")
@ -414,10 +414,10 @@ class Notification(Base):
user_id = Column(Integer, ForeignKey("users.id"))
comment_id = Column(Integer, ForeignKey("comments.id"))
read = Column(Boolean, default=False)
followsender = Column(Integer, default=None)
unfollowsender = Column(Integer, default=None)
blocksender = Column(Integer, default=None)
unblocksender = Column(Integer, default=None)
followsender = Column(Integer)
unfollowsender = Column(Integer)
blocksender = Column(Integer)
unblocksender = Column(Integer)
comment = relationship("Comment", lazy="joined", innerjoin=True)
user=relationship("User", innerjoin=True)

4
drama/classes/domains.py
View file

@ -20,8 +20,8 @@ class Domain(Base):
can_comment = Column(Boolean, default=True)
reason = Column(Integer, default=0)
show_thumbnail = Column(Boolean, default=False)
embed_function = Column(String(64), default=None)
embed_template = Column(String(32), default=None)
embed_function = Column(String(64))
embed_template = Column(String(32))
@property
def reason_text(self):

4
drama/classes/flags.py
View file

@ -10,7 +10,7 @@ class Flag(Base, Stndrd):
id = Column(Integer, primary_key=True)
post_id = Column(Integer, ForeignKey("submissions.id"))
user_id = Column(Integer, ForeignKey("users.id"))
reason = Column(String(100), default=None)
reason = Column(String(100))
created_utc = Column(Integer)
user = relationship("User", lazy = "joined", primaryjoin = "Flag.user_id == User.id", uselist = False)
@ -27,7 +27,7 @@ class CommentFlag(Base, Stndrd):
id = Column(Integer, primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"))
comment_id = Column(Integer, ForeignKey("comments.id"))
reason = Column(String(100), default=None)
reason = Column(String(100))
created_utc = Column(Integer)
user = relationship("User", lazy = "joined", primaryjoin = "CommentFlag.user_id == User.id", uselist = False)

2
drama/classes/images.py
View file

@ -29,7 +29,7 @@ class BadPic(Base):
__tablename__="badpics"
id = Column(BigInteger, primary_key=True)
description=Column(String(255), default=None)
description=Column(String(255))
phash=Column(String(64))
ban_reason=Column(String(64))
ban_time=Column(Integer)

2
drama/classes/mod_logs.py
View file

@ -13,7 +13,7 @@ class ModAction(Base, Stndrd, Age_times):
target_user_id = Column(Integer, ForeignKey("users.id"), default=0)
target_submission_id = Column(Integer, ForeignKey("submissions.id"), default=0)
target_comment_id = Column(Integer, ForeignKey("comments.id"), default=0)
_note=Column(String(256), default=None)
_note=Column(String(256))
created_utc = Column(Integer, default=0)

18
drama/classes/submission.py
View file

@ -15,9 +15,9 @@ class SubmissionAux(Base):
# we don't care about this ID
key_id = Column(BigInteger, primary_key=True)
id = Column(BigInteger, ForeignKey("submissions.id"))
title = Column(String(500), default=None)
title_html = Column(String(500), default=None)
url = Column(String(500), default=None)
title = Column(String(500))
title_html = Column(String(500))
url = Column(String(500))
body = Column(String(10000), default="")
body_html = Column(String(20000), default="")
ban_reason = Column(String(128), default="")
@ -42,14 +42,14 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
repost_id = Column(BigInteger, ForeignKey("submissions.id"), default=0)
edited_utc = Column(BigInteger, default=0)
created_utc = Column(BigInteger, default=0)
thumburl = Column(String, default=None)
thumburl = Column(String)
is_banned = Column(Boolean, default=False)
views = Column(Integer, default=0)
deleted_utc = Column(Integer, default=0)
banaward = Column(String, default=None)
banaward = Column(String)
purged_utc = Column(Integer, default=0)
distinguish_level = Column(Integer, default=0)
created_str = Column(String(255), default=None)
created_str = Column(String(255))
stickied = Column(Boolean, default=False)
is_pinned = Column(Boolean, default=False)
private = Column(Boolean, default=False)
@ -65,7 +65,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
approved_utc = Column(Integer, default=0)
over_18 = Column(Boolean, default=False)
creation_ip = Column(String(64), default="")
mod_approved = Column(Integer, default=None)
mod_approved = Column(Integer)
accepted_utc = Column(Integer, default=0)
has_thumb = Column(Boolean, default=False)
post_public = Column(Boolean, default=True)
@ -84,9 +84,9 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
upvotes = Column(Integer, default=1)
downvotes = Column(Integer, default=0)
creation_region=Column(String(2), default=None)
creation_region=Column(String(2))
app_id=Column(Integer, ForeignKey("oauth_apps.id"), default=None)
app_id=Column(Integer, ForeignKey("oauth_apps.id"))
oauth_app=relationship("OauthApp")
approved_by = relationship(

8
drama/classes/titles.py
View file

@ -13,11 +13,11 @@ class Title(Base):
color = Column(String(6), default="888888")
kind = Column(Integer, default=1)
background_color_1 = Column(String(6), default=None)
background_color_2 = Column(String(6), default=None)
background_color_1 = Column(String(6))
background_color_2 = Column(String(6))
gradient_angle = Column(Integer, default=0)
box_shadow_color = Column(String(32), default=None)
text_shadow_color = Column(String(32), default=None)
box_shadow_color = Column(String(32))
text_shadow_color = Column(String(32))
def check_eligibility(self, v):

40
drama/classes/user.py
View file

@ -18,22 +18,22 @@ from drama.helpers.security import *
class User(Base, Stndrd, Age_times):
__tablename__ = "users"
id = Column(Integer, primary_key=True)
username = Column(String, default=None)
username = Column(String)
namecolor = Column(String, default='ff66ac')
customtitle = Column(String, default=None)
customtitleplain = Column(String, default=None)
customtitle = Column(String)
customtitleplain = Column(String)
titlecolor = Column(String, default='ff66ac')
theme = Column(String, default='dark')
themecolor = Column(String, default='ff66ac')
song = Column(String, default=None)
profileurl = Column(String, default=None)
bannerurl = Column(String, default=None)
song = Column(String)
profileurl = Column(String)
bannerurl = Column(String)
patron = Column(Boolean, default=False)
animatedname = Column(Boolean, default=False)
email = Column(String, default=None)
css = deferred(Column(String, default=None))
profilecss = deferred(Column(String, default=None))
passhash = deferred(Column(String, default=None))
email = Column(String)
css = deferred(Column(String))
profilecss = deferred(Column(String))
passhash = deferred(Column(String))
banawards = Column(Integer, default=0)
created_utc = Column(Integer, default=0)
suicide_utc = Column(Integer, default=0)
@ -50,7 +50,7 @@ class User(Base, Stndrd, Age_times):
newtab = Column(Boolean, default=False)
newtabexternal = Column(Boolean, default=True)
oldreddit = Column(Boolean, default=False)
creation_ip = Column(String, default=None)
creation_ip = Column(String)
submissions = relationship(
"Submission",
lazy="dynamic",
@ -65,7 +65,7 @@ class User(Base, Stndrd, Age_times):
bio = Column(String, default="")
bio_html = Column(String, default="")
badges = relationship("Badge", lazy="dynamic", backref="user")
real_id = Column(String, default=None)
real_id = Column(String)
notifications = relationship(
"Notification",
lazy="dynamic")
@ -74,22 +74,22 @@ class User(Base, Stndrd, Age_times):
# "Notification",
# primaryjoin="and_(Notification.user_id==User.id, Notification.read==False)")
referred_by = Column(Integer, default=None)
referred_by = Column(Integer)
is_banned = Column(Integer, default=0)
unban_utc = Column(Integer, default=0)
ban_reason = Column(String, default="")
feed_nonce = Column(Integer, default=0)
login_nonce = Column(Integer, default=0)
title_id = Column(Integer, ForeignKey("titles.id"), default=None)
title_id = Column(Integer, ForeignKey("titles.id"))
title = relationship("Title", lazy="joined")
has_banner = Column(Boolean, default=False)
reserved = Column(String(256), default=None)
reserved = Column(String(256))
is_nsfw = Column(Boolean, default=False)
profile_nonce = Column(Integer, default=0)
dramacoins = Column(Integer, default=0)
banner_nonce = Column(Integer, default=0)
last_siege_utc = Column(Integer, default=0)
mfa_secret = deferred(Column(String(16), default=None))
mfa_secret = deferred(Column(String(16)))
hide_offensive = Column(Boolean, default=False)
hide_bot = Column(Boolean, default=False)
is_private = Column(Boolean, default=False)
@ -106,12 +106,12 @@ class User(Base, Stndrd, Age_times):
is_nofollow = Column(Boolean, default=False)
custom_filter_list = Column(String(1000), default="")
discord_id = Column(String(64), default=None)
creation_region = Column(String(2), default=None)
discord_id = Column(String(64))
creation_region = Column(String(2))
ban_evade = Column(Integer, default=0)
profile_upload_ip = deferred(Column(String(255), default=None))
banner_upload_ip = deferred(Column(String(255), default=None))
profile_upload_ip = deferred(Column(String(255)))
banner_upload_ip = deferred(Column(String(255)))
profile_upload_region = deferred(Column(String(2)))
banner_upload_region = deferred(Column(String(2)))

8
drama/classes/votes.py
View file

@ -14,8 +14,8 @@ class Vote(Base):
vote_type = Column(Integer)
submission_id = Column(Integer, ForeignKey("submissions.id"))
created_utc = Column(Integer, default=0)
creation_ip = Column(String, default=None)
app_id = Column(Integer, ForeignKey("oauth_apps.id"), default=None)
creation_ip = Column(String)
app_id = Column(Integer, ForeignKey("oauth_apps.id"))
user = relationship("User", lazy="subquery")
post = relationship("Submission", lazy="subquery")
@ -76,8 +76,8 @@ class CommentVote(Base):
vote_type = Column(Integer)
comment_id = Column(Integer, ForeignKey("comments.id"))
created_utc = Column(Integer, default=0)
creation_ip = Column(String, default=None)
app_id = Column(Integer, ForeignKey("oauth_apps.id"), default=None)
creation_ip = Column(String)
app_id = Column(Integer, ForeignKey("oauth_apps.id"))
user = relationship("User", lazy="subquery")
comment = relationship("Comment", lazy="subquery")

4
drama/routes/admin.py
View file

@ -38,9 +38,9 @@ def dp(v):
@app.route("/dramacoins/comments", methods=["GET"])
@admin_level_required(6)
def dc(v):
count = g.db.query(Comment).options(lazyload('*')).count()
count = g.db.query(Comment).count()
print(count)
count = g.db.query(Comment).options(lazyload('*')).filter(Comment.parent_submission is not None).count()
count = g.db.query(Comment).filter(Comment.parent_submission != None).count()
print(count)
#for p in g.db.query(Comment).options(lazyload('*')).filter_by().all():
#print(p.id)