fix relationship migration

users/migrations/0014_preference_mastodon_skip_relationship_and_more.py

@@ -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)
 
 

users/models/apidentity.py

@@ -144,7 +144,7 @@ def requested_follower_identities(self):
 
     @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 @@ def requested_followers(self):
         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 @@ def is_following(self, target: "APIdentity"):
         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