put column data in LoggedOutUser (does this work?)
parent
b808096596
commit
ce5c586356
|
@ -35,104 +35,104 @@ from .userblock import *
|
||||||
|
|
||||||
class LoggedOutUser():
|
class LoggedOutUser():
|
||||||
if SITE == "pcmemes.net":
|
if SITE == "pcmemes.net":
|
||||||
basedcount = 0
|
basedcount = Column(Integer, default=0)
|
||||||
pills = ""
|
pills = ""
|
||||||
id = NotImplemented
|
id = NotImplemented
|
||||||
username = NotImplemented
|
username = NotImplemented
|
||||||
namecolor = DEFAULT_COLOR
|
namecolor = Column(String, default=DEFAULT_COLOR)
|
||||||
background = None
|
background = Column(String)
|
||||||
customtitle = None
|
customtitle = Column(String)
|
||||||
customtitleplain = None
|
customtitleplain = deferred(Column(String))
|
||||||
titlecolor = DEFAULT_COLOR
|
titlecolor = Column(String, default=DEFAULT_COLOR)
|
||||||
theme = DEFAULT_THEME
|
theme = Column(String, default=DEFAULT_THEME)
|
||||||
themecolor = DEFAULT_COLOR
|
themecolor = Column(String, default=DEFAULT_COLOR)
|
||||||
cardview = CARD_VIEW
|
cardview = Column(Boolean, default=CARD_VIEW)
|
||||||
song = None
|
song = Column(String)
|
||||||
highres = None
|
highres = Column(String)
|
||||||
profileurl = NotImplemented
|
profileurl = Column(String)
|
||||||
bannerurl = None
|
bannerurl = Column(String)
|
||||||
house = ''
|
house = Column(String, default='')
|
||||||
old_house = ''
|
old_house = Column(String, default='')
|
||||||
patron = 0
|
patron = Column(Integer, default=0)
|
||||||
patron_utc = 0
|
patron_utc = Column(Integer, default=0)
|
||||||
verified = None
|
verified = Column(String)
|
||||||
verifiedcolor = None
|
verifiedcolor = Column(String)
|
||||||
marseyawarded = 0
|
marseyawarded = Column(Integer)
|
||||||
rehab = 0
|
rehab = Column(Integer)
|
||||||
longpost = 0
|
longpost = Column(Integer)
|
||||||
bird = 0
|
bird = Column(Integer)
|
||||||
email = None
|
email = None
|
||||||
css = None
|
css = Column(String)
|
||||||
profilecss = None
|
profilecss = None
|
||||||
passhash = ''
|
passhash = ''
|
||||||
post_count = 0
|
post_count = Column(Integer, default=0)
|
||||||
comment_count = 0
|
comment_count = Column(Integer, default=0)
|
||||||
received_award_count = 0
|
received_award_count = Column(Integer, default=0)
|
||||||
created_utc = 0
|
created_utc = Column(Integer)
|
||||||
admin_level = -1
|
admin_level = -1
|
||||||
last_active = 0
|
last_active = Column(Integer, default=0, nullable=False)
|
||||||
coins_spent = 0
|
coins_spent = Column(Integer, default=0)
|
||||||
coins_spent_on_hats = 0
|
coins_spent_on_hats = Column(Integer, default=0)
|
||||||
lootboxes_bought = 0
|
lootboxes_bought = Column(Integer, default=0)
|
||||||
agendaposter = 0
|
agendaposter = Column(Integer, default=0)
|
||||||
is_activated = False
|
is_activated = Column(Boolean, default=False)
|
||||||
shadowbanned = None
|
shadowbanned = Column(String)
|
||||||
over_18 = False
|
over_18 = Column(Boolean, default=False)
|
||||||
hidevotedon = False
|
hidevotedon = Column(Boolean, default=False)
|
||||||
highlightedcomments = True
|
highlightcomments = Column(Boolean, default=True)
|
||||||
slurreplacer = 1
|
slurreplacer = Column(Integer, default=1)
|
||||||
profanityreplacer = 1
|
profanityreplacer = Column(Integer, default=1)
|
||||||
flairchanged = None
|
flairchanged = Column(Integer)
|
||||||
newtab = False
|
newtab = Column(Boolean, default=False)
|
||||||
newtabexternal = True
|
newtabexternal = Column(Boolean, default=True)
|
||||||
reddit = 'old.reddit.com'
|
reddit = Column(String, default='old.reddit.com')
|
||||||
nitter = False
|
nitter = Column(Boolean)
|
||||||
imginn = False
|
imginn = Column(Boolean)
|
||||||
frontsize = 25
|
frontsize = Column(Integer, default=25)
|
||||||
controversial = True
|
controversial = Column(Boolean, default=True)
|
||||||
bio = None
|
bio = None
|
||||||
bio_html = None
|
bio_html = Column(String)
|
||||||
sig = None
|
sig = None
|
||||||
sig_html = None
|
sig_html = Column(String)
|
||||||
fp = None
|
fp = Column(String)
|
||||||
sigs_disabled = False
|
sigs_disabled = Column(Boolean)
|
||||||
progressivestack = 0
|
progressivestack = Column(Integer)
|
||||||
deflector = 0
|
deflector = Column(Integer)
|
||||||
friends = None
|
friends = None
|
||||||
friends_html = None
|
friends_html = None
|
||||||
enemies = None
|
enemies = None
|
||||||
enemies_html = None
|
enemies_html = None
|
||||||
is_banned = 0
|
is_banned = Column(Integer, default=0)
|
||||||
unban_utc = 0
|
unban_utc = Column(Integer, default=0)
|
||||||
ban_reason = None
|
ban_reason = None
|
||||||
is_muted = False
|
is_muted = Column(Boolean, default=False, nullable=False)
|
||||||
club_allowed = None
|
club_allowed = Column(Boolean)
|
||||||
login_nonce = 0
|
login_nonce = Column(Integer, default=0)
|
||||||
coins = 0
|
coins = Column(Integer, default=0)
|
||||||
truescore = 0
|
truescore = Column(Integer, default=0)
|
||||||
procoins = 0
|
procoins = Column(Integer, default=0)
|
||||||
mfa_secret = None
|
mfa_secret = None
|
||||||
is_private = False
|
is_private = Column(Boolean, default=False)
|
||||||
stored_subscriber_count = 0
|
stored_subscriber_count = Column(Integer, default=0)
|
||||||
defaultsortingcomments = "hot"
|
defaultsortingcomments = Column(String, default="hot")
|
||||||
defaultsorting = "hot"
|
defaultsorting = Column(String, default="hot")
|
||||||
defaulttime = DEFAULT_TIME_FILTER
|
defaulttime = Column(String, default=DEFAULT_TIME_FILTER)
|
||||||
custom_filter_list = None
|
custom_filter_list = Column(String)
|
||||||
discord_id = None
|
discord_id = Column(String)
|
||||||
original_username = NotImplemented
|
original_username = NotImplemented
|
||||||
referred_by = None
|
referred_by = None
|
||||||
currently_held_lottery_tickets = 0
|
currently_held_lottery_tickets = Column(Integer, default=0)
|
||||||
total_held_lottery_tickets = 0
|
total_held_lottery_tickets = Column(Integer, default=0)
|
||||||
total_lottery_winnings = 0
|
total_lottery_winnings = Column(Integer, default=0)
|
||||||
last_viewed_post_notifs = 0
|
last_viewed_post_notifs = Column(Integer, default=0)
|
||||||
last_viewed_log_notifs = 0
|
last_viewed_log_notifs = Column(Integer, default=0)
|
||||||
pronouns = 'they/them'
|
pronouns = Column(String, default='they/them')
|
||||||
bite = 0
|
bite = Column(Integer)
|
||||||
earlylife = 0
|
earlylife = Column(Integer)
|
||||||
owoify = 0
|
owoify = Column(Integer)
|
||||||
marsify = 0
|
marsify = Column(Integer, default=0)
|
||||||
rainbow = 0
|
rainbow = Column(Integer)
|
||||||
spider = 0
|
spider = Column(Integer, default=0)
|
||||||
|
|
||||||
(badges, subscriptions, following, followers, viewers,
|
(badges, subscriptions, following, followers, viewers,
|
||||||
blocking, blocked, authorizations, apps, awards,
|
blocking, blocked, authorizations, apps, awards,
|
||||||
|
@ -664,105 +664,24 @@ class User(Base, LoggedOutUser):
|
||||||
__tablename__ = "users"
|
__tablename__ = "users"
|
||||||
|
|
||||||
if SITE == "pcmemes.net":
|
if SITE == "pcmemes.net":
|
||||||
basedcount = Column(Integer, default=0)
|
|
||||||
pills = deferred(Column(String, default=""))
|
pills = deferred(Column(String, default=""))
|
||||||
|
|
||||||
id = Column(Integer, primary_key=True)
|
id = Column(Integer, primary_key=True)
|
||||||
username = Column(String)
|
username = Column(String)
|
||||||
namecolor = Column(String, default=DEFAULT_COLOR)
|
|
||||||
background = Column(String)
|
|
||||||
customtitle = Column(String)
|
|
||||||
customtitleplain = deferred(Column(String))
|
|
||||||
titlecolor = Column(String, default=DEFAULT_COLOR)
|
|
||||||
theme = Column(String, default=DEFAULT_THEME)
|
|
||||||
themecolor = Column(String, default=DEFAULT_COLOR)
|
|
||||||
cardview = Column(Boolean, default=CARD_VIEW)
|
|
||||||
song = Column(String)
|
|
||||||
highres = Column(String)
|
|
||||||
profileurl = Column(String)
|
|
||||||
bannerurl = Column(String)
|
|
||||||
house = Column(String, default='')
|
|
||||||
old_house = Column(String, default='')
|
|
||||||
patron = Column(Integer, default=0)
|
|
||||||
patron_utc = Column(Integer, default=0)
|
|
||||||
verified = Column(String)
|
|
||||||
verifiedcolor = Column(String)
|
|
||||||
marseyawarded = Column(Integer)
|
|
||||||
rehab = Column(Integer)
|
|
||||||
longpost = Column(Integer)
|
|
||||||
bird = Column(Integer)
|
|
||||||
email = deferred(Column(String))
|
email = deferred(Column(String))
|
||||||
css = Column(String)
|
|
||||||
profilecss = deferred(Column(String))
|
profilecss = deferred(Column(String))
|
||||||
passhash = deferred(Column(String))
|
passhash = deferred(Column(String))
|
||||||
post_count = Column(Integer, default=0)
|
|
||||||
comment_count = Column(Integer, default=0)
|
|
||||||
received_award_count = Column(Integer, default=0)
|
|
||||||
created_utc = Column(Integer)
|
|
||||||
admin_level = Column(Integer, default=0)
|
admin_level = Column(Integer, default=0)
|
||||||
last_active = Column(Integer, default=0, nullable=False)
|
|
||||||
coins_spent = Column(Integer, default=0)
|
|
||||||
coins_spent_on_hats = Column(Integer, default=0)
|
|
||||||
lootboxes_bought = Column(Integer, default=0)
|
|
||||||
agendaposter = Column(Integer, default=0)
|
|
||||||
is_activated = Column(Boolean, default=False)
|
|
||||||
shadowbanned = Column(String)
|
|
||||||
over_18 = Column(Boolean, default=False)
|
|
||||||
hidevotedon = Column(Boolean, default=False)
|
|
||||||
highlightcomments = Column(Boolean, default=True)
|
|
||||||
slurreplacer = Column(Integer, default=1)
|
|
||||||
profanityreplacer = Column(Integer, default=1)
|
|
||||||
flairchanged = Column(Integer)
|
|
||||||
newtab = Column(Boolean, default=False)
|
|
||||||
newtabexternal = Column(Boolean, default=True)
|
|
||||||
reddit = Column(String, default='old.reddit.com')
|
|
||||||
nitter = Column(Boolean)
|
|
||||||
imginn = Column(Boolean)
|
|
||||||
frontsize = Column(Integer, default=25)
|
|
||||||
controversial = Column(Boolean, default=True)
|
|
||||||
bio = deferred(Column(String))
|
bio = deferred(Column(String))
|
||||||
bio_html = Column(String)
|
|
||||||
sig = deferred(Column(String))
|
sig = deferred(Column(String))
|
||||||
sig_html = Column(String)
|
|
||||||
fp = Column(String)
|
|
||||||
sigs_disabled = Column(Boolean)
|
|
||||||
progressivestack = Column(Integer)
|
|
||||||
deflector = Column(Integer)
|
|
||||||
friends = deferred(Column(String))
|
friends = deferred(Column(String))
|
||||||
friends_html = deferred(Column(String))
|
friends_html = deferred(Column(String))
|
||||||
enemies = deferred(Column(String))
|
enemies = deferred(Column(String))
|
||||||
enemies_html = deferred(Column(String))
|
enemies_html = deferred(Column(String))
|
||||||
is_banned = Column(Integer, default=0)
|
|
||||||
unban_utc = Column(Integer, default=0)
|
|
||||||
ban_reason = deferred(Column(String))
|
ban_reason = deferred(Column(String))
|
||||||
is_muted = Column(Boolean, default=False, nullable=False)
|
|
||||||
club_allowed = Column(Boolean)
|
|
||||||
login_nonce = Column(Integer, default=0)
|
|
||||||
coins = Column(Integer, default=0)
|
|
||||||
truescore = Column(Integer, default=0)
|
|
||||||
procoins = Column(Integer, default=0)
|
|
||||||
mfa_secret = deferred(Column(String))
|
mfa_secret = deferred(Column(String))
|
||||||
is_private = Column(Boolean, default=False)
|
|
||||||
stored_subscriber_count = Column(Integer, default=0)
|
|
||||||
defaultsortingcomments = Column(String, default="hot")
|
|
||||||
defaultsorting = Column(String, default="hot")
|
|
||||||
defaulttime = Column(String, default=DEFAULT_TIME_FILTER)
|
|
||||||
custom_filter_list = Column(String)
|
|
||||||
discord_id = Column(String)
|
|
||||||
original_username = Column(String)
|
original_username = Column(String)
|
||||||
referred_by = Column(Integer, ForeignKey("users.id"))
|
referred_by = Column(Integer, ForeignKey("users.id"))
|
||||||
currently_held_lottery_tickets = Column(Integer, default=0)
|
|
||||||
total_held_lottery_tickets = Column(Integer, default=0)
|
|
||||||
total_lottery_winnings = Column(Integer, default=0)
|
|
||||||
last_viewed_post_notifs = Column(Integer, default=0)
|
|
||||||
last_viewed_log_notifs = Column(Integer, default=0)
|
|
||||||
pronouns = Column(String, default='they/them')
|
|
||||||
bite = Column(Integer)
|
|
||||||
earlylife = Column(Integer)
|
|
||||||
owoify = Column(Integer)
|
|
||||||
marsify = Column(Integer, default=0)
|
|
||||||
rainbow = Column(Integer)
|
|
||||||
spider = Column(Integer, default=0)
|
|
||||||
|
|
||||||
badges = relationship("Badge", order_by="Badge.created_utc", back_populates="user")
|
badges = relationship("Badge", order_by="Badge.created_utc", back_populates="user")
|
||||||
subscriptions = relationship("Subscription", back_populates="user")
|
subscriptions = relationship("Subscription", back_populates="user")
|
||||||
|
|
Loading…
Reference in New Issue