annoying

files/classes/user.py

@@ -6,8 +6,9 @@ from files.helpers.images import *
 from files.helpers.const import *
 from .alts import Alt
 from .saves import *
-from .comment import Notification
+from .notifications import Notification
 from .award import AwardRelationship
+from .follows import *
 from .subscriptions import *
 from .userblock import *
 from .badges import *
@@ -641,59 +642,4 @@ class User(Base):
 	def filter_words(self):
 		l = [i.strip() for i in self.custom_filter_list.split('\n')] if self.custom_filter_list else []
 		l = [i for i in l if i]
-		return l
-
-
-class ViewerRelationship(Base):
-
-	__tablename__ = "viewers"
-
-	user_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
-	viewer_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
-	last_view_utc = Column(Integer)
-
-	viewer = relationship("User", primaryjoin="ViewerRelationship.viewer_id == User.id", viewonly=True)
-
-	def __init__(self, **kwargs):
-
-		if 'last_view_utc' not in kwargs:
-			kwargs['last_view_utc'] = int(time.time())
-
-		super().__init__(**kwargs)
-
-	@property
-	@lazy
-	def last_view_since(self):
-
-		return int(time.time()) - self.last_view_utc
-
-	@property
-	@lazy
-	def last_view_string(self):
-
-		age = self.last_view_since
-
-		if age < 60:
-			return "just now"
-		elif age < 3600:
-			minutes = int(age / 60)
-			return f"{minutes}m ago"
-		elif age < 86400:
-			hours = int(age / 3600)
-			return f"{hours}hr ago"
-		elif age < 2678400:
-			days = int(age / 86400)
-			return f"{days}d ago"
-
-		now = time.gmtime()
-		ctd = time.gmtime(self.created_utc)
-
-		months = now.tm_mon - ctd.tm_mon + 12 * (now.tm_year - ctd.tm_year)
-		if now.tm_mday < ctd.tm_mday:
-			months -= 1
-
-		if months < 12:
-			return f"{months}mo ago"
-		else:
-			years = int(months / 12)
-			return f"{years}yr ago"
+		return l