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

fsd

Browse source
This commit is contained in:
Aevann1 2022-04-29 17:19:50 +02:00
parent 70a31aa9cb
commit ef95ab85dd
3 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
files/classes/__init__.py
View file

@ -15,7 +15,6 @@ from .mod_logs import *
from .award import * from .award import *
from .marsey import * from .marsey import *
from .sub_block import * from .sub_block import *
from .sub_subscription import *
from .saves import * from .saves import *
from .views import * from .views import *
from .notifications import * from .notifications import *

2
files/classes/sub.py
View file

@ -3,7 +3,6 @@ from sqlalchemy.orm import relationship
from files.__main__ import Base from files.__main__ import Base
from files.helpers.lazy import lazy from files.helpers.lazy import lazy
from os import environ from os import environ
from .sub_subscription import *
from .sub_block import * from .sub_block import *
SITE_NAME = environ.get("SITE_NAME", '').strip() SITE_NAME = environ.get("SITE_NAME", '').strip()
@ -21,7 +20,6 @@ class Sub(Base):
bannerurl = Column(String) bannerurl = Column(String)
css = Column(String) css = Column(String)
subscriptions = relationship("SubSubscription", lazy="dynamic", primaryjoin="SubSubscription.sub==Sub.name", viewonly=True)
blocks = relationship("SubBlock", lazy="dynamic", primaryjoin="SubBlock.sub==Sub.name", viewonly=True) blocks = relationship("SubBlock", lazy="dynamic", primaryjoin="SubBlock.sub==Sub.name", viewonly=True)

11
files/classes/user.py
View file

@ -17,7 +17,6 @@ from .mod_logs import *
from .mod import * from .mod import *
from .exiles import * from .exiles import *
from .sub_block import * from .sub_block import *
from .sub_subscription import *
from files.__main__ import Base, cache from files.__main__ import Base, cache
from files.helpers.security import * from files.helpers.security import *
import random import random
@ -124,7 +123,6 @@ class User(Base):
original_username = deferred(Column(String)) original_username = deferred(Column(String))
referred_by = Column(Integer, ForeignKey("users.id")) referred_by = Column(Integer, ForeignKey("users.id"))
subs_created = Column(Integer, default=0) subs_created = Column(Integer, default=0)
subs = Column(Integer, default=2)
badges = relationship("Badge", viewonly=True) badges = relationship("Badge", viewonly=True)
subscriptions = relationship("Subscription", viewonly=True) subscriptions = relationship("Subscription", viewonly=True)
@ -161,19 +159,10 @@ class User(Base):
def all_blocks(self): def all_blocks(self):
return [x[0] for x in g.db.query(SubBlock.sub).filter_by(user_id=self.id).all()] return [x[0] for x in g.db.query(SubBlock.sub).filter_by(user_id=self.id).all()]
@property
@lazy
def subbed_subs(self):
return [x[0] for x in g.db.query(SubSubscription.sub).filter_by(user_id=self.id).all()]
@lazy @lazy
def blocks(self, sub): def blocks(self, sub):
return g.db.query(SubBlock).filter_by(user_id=self.id, sub=sub).one_or_none() return g.db.query(SubBlock).filter_by(user_id=self.id, sub=sub).one_or_none()
@lazy
def subscribed_to(self, sub):
return g.db.query(SubSubscription).filter_by(user_id=self.id, sub=sub).one_or_none()
@lazy @lazy
def mod_date(self, sub): def mod_date(self, sub):
if self.id == AEVANN_ID: return 1 if self.id == AEVANN_ID: return 1