From a6b26ece67ac4e8b0178706c8375c14947067487 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 29 Apr 2022 17:19:50 +0200
Subject: [PATCH] fsd

---
 files/classes/__init__.py |  1 -
 files/classes/sub.py      |  2 --
 files/classes/user.py     | 11 -----------
 3 files changed, 14 deletions(-)

diff --git a/files/classes/__init__.py b/files/classes/__init__.py
index d03ccd68b..15c93d1ea 100644
--- a/files/classes/__init__.py
+++ b/files/classes/__init__.py
@@ -15,7 +15,6 @@ from .mod_logs import *
 from .award import *
 from .marsey import *
 from .sub_block import *
-from .sub_subscription import *
 from .saves import *
 from .views import *
 from .notifications import *
diff --git a/files/classes/sub.py b/files/classes/sub.py
index 91f8324f6..a811797ce 100644
--- a/files/classes/sub.py
+++ b/files/classes/sub.py
@@ -3,7 +3,6 @@ from sqlalchemy.orm import relationship
 from files.__main__ import Base
 from files.helpers.lazy import lazy
 from os import environ
-from .sub_subscription import *
 from .sub_block import *
 
 SITE_NAME = environ.get("SITE_NAME", '').strip()
@@ -21,7 +20,6 @@ class Sub(Base):
 	bannerurl = 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)
 
 
diff --git a/files/classes/user.py b/files/classes/user.py
index bb7afd669..e8d839dcc 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -17,7 +17,6 @@ from .mod_logs import *
 from .mod import *
 from .exiles import *
 from .sub_block import *
-from .sub_subscription import *
 from files.__main__ import Base, cache
 from files.helpers.security import *
 import random
@@ -124,7 +123,6 @@ class User(Base):
 	original_username = deferred(Column(String))
 	referred_by = Column(Integer, ForeignKey("users.id"))
 	subs_created = Column(Integer, default=0)
-	subs = Column(Integer, default=2)
 
 	badges = relationship("Badge", viewonly=True)
 	subscriptions = relationship("Subscription", viewonly=True)
@@ -161,19 +159,10 @@ class User(Base):
 	def all_blocks(self):
 		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
 	def blocks(self, sub):
 		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
 	def mod_date(self, sub):
 		if self.id == AEVANN_ID: return 1