simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-18 06:31:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

take into account AppleSubscription in premium formula

Browse source
This commit is contained in:
Son NK 2020-04-19 10:58:32 +02:00
parent 2a837f9213
commit 85fd4412ba
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models.py
View file

@ -217,6 +217,10 @@ class User(db.Model, ModelMixin, UserMixin):
if sub: if sub:
return True return True
apple_sub: AppleSubscription = AppleSubscription.get_by(user_id=self.id)
if apple_sub and apple_sub.is_valid():
return True
manual_sub: ManualSubscription = ManualSubscription.get_by(user_id=self.id) manual_sub: ManualSubscription = ManualSubscription.get_by(user_id=self.id)
if manual_sub and manual_sub.end_at > arrow.now(): if manual_sub and manual_sub.end_at > arrow.now():
return True return True
@ -251,6 +255,10 @@ class User(db.Model, ModelMixin, UserMixin):
if sub and not sub.cancelled: if sub and not sub.cancelled:
return False return False
apple_sub: AppleSubscription = AppleSubscription.get_by(user_id=self.id)
if apple_sub and apple_sub.is_valid():
return False
manual_sub: ManualSubscription = ManualSubscription.get_by(user_id=self.id) manual_sub: ManualSubscription = ManualSubscription.get_by(user_id=self.id)
# user who has giveaway premium can decide to upgrade # user who has giveaway premium can decide to upgrade
if ( if (
@ -939,6 +947,10 @@ class AppleSubscription(db.Model, ModelMixin):
user = db.relationship(User) user = db.relationship(User)
def is_valid(self):
# Todo: take into account grace period?
return self.expires_date > arrow.now()
class DeletedAlias(db.Model, ModelMixin): class DeletedAlias(db.Model, ModelMixin):
"""Store all deleted alias to make sure they are NOT reused""" """Store all deleted alias to make sure they are NOT reused"""