Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix relationship migration

Browse source
This commit is contained in:
Her Email 2023-11-08 22:11:43 -05:00 • committed by Henri Dickson
parent 2dd26b1548
commit 321c5e7094
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
users/migrations/0014_preference_mastodon_skip_relationship_and_more.py
View file

@ -10,16 +10,15 @@ def migrate_relationships(apps, schema_editor):
APIdentity = apps.get_model("users", "APIdentity")
logger.info(f"Migrate user relationship")
for user in tqdm(User.objects.all()):
for target in user.local_following:
for target in user.local_following.all():
user.identity.follow(User.objects.get(pk=target).identity)
for target in user.local_blocking:
for target in user.local_blocking.all():
user.identity.block(User.objects.get(pk=target).identity)
for target in user.local_muting:
for target in user.local_muting.all():
user.identity.block(User.objects.get(pk=target).identity)
user.sync_relationship()
for user in tqdm(User.objects.all()):
for req in user.identity.following_request:
target_identity = APIdentity.objects.get(pk=req)
for target_identity in user.identity.follow_requesting_identities:
target_identity.accept_follow_request(user.identity)

6
users/models/apidentity.py
View file

@ -144,7 +144,7 @@ class APIdentity(models.Model):
@property
def follow_requesting_identities(self):
return APIdentity.objects.filter(pk__in=self.following_request)
return APIdentity.objects.filter(pk__in=self.following_requests)
@property
def rejecting(self):
@ -165,7 +165,7 @@ class APIdentity(models.Model):
return Takahe.get_requested_follower_ids(self.pk)
@property
def following_request(self):
def following_requests(self):
return Takahe.get_following_request_ids(self.pk)
def accept_follow_request(self, target: "APIdentity"):
@ -204,7 +204,7 @@ class APIdentity(models.Model):
return target.pk in self.following
def is_requesting(self, target: "APIdentity"):
return target.pk in self.following_request
return target.pk in self.following_requests
def is_requested(self, target: "APIdentity"):
return target.pk in self.requested_followers